diff -Nru blcr-0.8.2/acinclude.m4 blcr-0.8.4/acinclude.m4
--- blcr-0.8.2/acinclude.m4	2009-06-12 20:37:01.000000000 +0000
+++ blcr-0.8.4/acinclude.m4	2011-09-29 22:46:50.000000000 +0000
@@ -22,8 +22,8 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: acinclude.m4,v 1.177.14.2 2009/06/12 20:37:01 phargrov Exp $
-AC_REVISION($Revision: 1.177.14.2 $)
+# $Id: acinclude.m4,v 1.177.14.12 2011/09/29 22:46:50 phargrov Exp $
+AC_REVISION($Revision: 1.177.14.12 $)
 
 # Match all kernels major/minor we might accept
 m4_define([cr_kern_maj_min_patt],[[2\.[46]\.]])[]dnl  No SUBLEVEL or following
@@ -144,6 +144,8 @@
 # ------------------------------------------------------
 # Find a C++ compiler and verify that it is word-size compatible with $CC
 # Returns with CXX set to the compiler, or "no"
+# Note bug 2619 reports that CR_PROG_CXX must not be called conditionally
+# because of some internal use of AM_CONDITIONAL()
 AC_DEFUN([CR_PROG_CXX],[
   # Totally gross way to perform a non-fatal probe for CXX
   pushdef([AC_MSG_ERROR], [CXX=no])
@@ -246,8 +248,8 @@
     my ($srcdir, $cpp_cmd) = @ARGV;
     my $stamp = time;
     $cpp_cmd =~ s/([#()])/\\$1/g; # quote problematic shell metachars
-    FILE: foreach my $file qw/version.h utsrelease.h/ {
-      my $path = "$srcdir/include/linux/$file";
+    FILE: foreach my $file qw(linux/version.h linux/utsrelease.h generated/utsrelease.h) {
+      my $path = "$srcdir/include/$file";
       next FILE unless (-f $path);
       open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
       LINE: while (<F>) {
@@ -497,7 +499,7 @@
       cr_cvname="${cr_cvname} V=1"
     fi
     if test x$cross_compiling = xyes; then
-      cr_cvname="$cr_cvname ARCH=$CR_ARCH CROSS_COMPILE=$host_alias-"
+      cr_cvname="$cr_cvname ARCH=$CR_KARCH CROSS_COMPILE=$host_alias-"
     fi
   ])
   KBUILD_MAKE_ARGS="$cr_cvname"
@@ -577,6 +579,14 @@
   done])
   KCFLAGS="$cr_cvname"
   popdef([cr_cvname])[]dnl
+  AC_MSG_CHECKING([if autoconf.h is included implicitly])
+  if echo "$KCFLAGS" | grep 'include [[^ ]]*/autoconf\.h' >/dev/null 2>&1; then
+    AC_MSG_RESULT([yes]);
+  else
+    AC_MSG_RESULT([no]);
+    AC_DEFINE([CR_NEED_AUTOCONF_H], [1])
+    AH_TEMPLATE([CR_NEED_AUTOCONF_H], [Define to 1 if linux/autoconf.h must be included explicitly])
+  fi
   # Do these init steps early, in case first CR_FIND_KSYM is a conditional call
   AC_REQUIRE([_CR_KSYM_INIT_PATTS])
   AC_REQUIRE([_CR_KSYM_INIT_FILES])
@@ -953,8 +963,9 @@
 # When complete sets LINUX_SYMTAB_CMD such that
 # "eval $LINUX_SYMTAB_CMD" will produce a System.map on stdout.
 cr_stripped_maps=''
+m4_define([cr_ksymtab_patt],[[-e '[TD] sys_open' -e '[AB] _end']])
 AC_DEFUN([_CR_CHECK_SYSTEM_MAP],[
-  if test -n "$1" -a -r "$1" && grep ' [[AB]] _end' <"$1" >/dev/null 2>/dev/null; then
+  if test -n "$1" -a -r "$1" && grep cr_ksymtab_patt <"$1" >/dev/null 2>/dev/null; then
     if grep -B1 '[[AB]] _end' <"$1" | grep _stext >/dev/null 2>/dev/null; then
       # Reject "stripped" files (such as in FC2)
       # Recognized (poorly) by _stext and _end as last two entries.
@@ -968,7 +979,7 @@
 ])
 AC_DEFUN([_CR_CHECK_VMLINUX],[
   AC_REQUIRE([AC_PROG_NM])
-  if test -n "$1" -a -r "$1" && ($NM "$1" | grep ' [[AB]] _end') >/dev/null 2>/dev/null; then
+  if test -n "$1" -a -r "$1" && ($NM "$1" | grep cr_ksymtab_patt) >/dev/null 2>/dev/null; then
     LINUX_VMLINUX="$1"
     LINUX_SYMTAB_FILE="$1"
     LINUX_SYMTAB_CMD="$NM $1 2>/dev/null"
@@ -1041,11 +1052,16 @@
     CR_SET_CACHE_VAR([LINUX_VMLINUX])
     CR_CACHE_REVALIDATE([${LINUX_SYMTAB_FILE}],[ksymtab],[kernel symbol table])
   fi
-  # Now check for consistency w/ the kernel source
-  # XXX: Currently just check SMPness. Can this be more aggressive?
+])
+
+# Now check for SYMTAB consistency w/ the kernel source
+# XXX: Currently just check SMPness. Can this be more aggressive?
+AC_DEFUN([CR_LINUX_SYMTAB_VALIDATE],[
   AC_MSG_CHECKING([for SMP kernel source])
   CR_CACHED_KERNEL_COMPILE([smp_source],[
-	#include <linux/autoconf.h>
+	#ifdef CR_NEED_AUTOCONF_H
+	  #include <linux/autoconf.h>
+	#endif
 	#ifndef CONFIG_SMP
 	    choke me
 	#endif
@@ -1054,7 +1070,7 @@
   cr_kernel_smp=$cr_result
   AC_MSG_CHECKING([for SMP kernel symbol table])
   cr_symtab_smp=no
-  if test -n "`eval $LINUX_SYMTAB_CMD | grep del_timer_sync 2>/dev/null`"; then
+  if test -n "`eval $LINUX_SYMTAB_CMD | grep del_timer_sync 2>/dev/null | grep -v try_to_del_`"; then
     cr_symtab_smp=yes
   fi
   AC_MSG_RESULT([$cr_symtab_smp]);
@@ -1071,13 +1087,13 @@
 # ------------------------------------------------------
 # Helpers for CR_FIND_KSYM() and CR_FIND_EXPORTED_KSYM()
 AC_DEFUN([_CR_KSYM_INIT_PATTS],[
-  case "$CR_ARCH" in
+  case "$CR_KARCH" in
     ppc64)
-      CR_KSYM_PATTERN_DATA=['[bBdDrRtT] ']
+      CR_KSYM_PATTERN_DATA=['[bBdDgGrRsStTvV] ']
       CR_KSYM_PATTERN_CODE=['[dD] ']   dnl Function descriptor is data
       ;;
     *)
-      CR_KSYM_PATTERN_DATA=['[bBdDrRtT] ']
+      CR_KSYM_PATTERN_DATA=['[bBdDgGrRsStTvV] ']
       CR_KSYM_PATTERN_CODE=['[tT] ']
       ;;
   esac
@@ -1248,8 +1264,10 @@
   pushdef([cr_cvname],cr_cv_kconfig_kmalloc_max)[]dnl
   AC_CACHE_CHECK([[kernel for maximum kmalloc() allocation]],cr_cvname,[
     cr_kmalloc_default="131072 (default)"
+    cr_header="${LINUX_OBJ}/include/generated/autoconf.h"
+    test -e "$cr_header" || cr_header="${LINUX_OBJ}/include/linux/autoconf.h"
     cr_cvname=`eval "$CPP $CPPFLAGS -I${LINUX_OBJ}/include \
-			-include ${LINUX_OBJ}/include/linux/autoconf.h\
+			-include ${cr_header} \
 			${LINUX_OBJ}/include/linux/kmalloc_sizes.h" 2>/dev/null | \
 		$PERL -n -e 'BEGIN {$max=0;}' \
 			 -e ['if (/CACHE\s*\(\s*([0-9]+)\s*\)/ && ($][1 > $max)) { $max = $][1; }'] \
@@ -1279,13 +1297,13 @@
 # Compute a constant (ulong) C expression, even when cross compiling
 AC_DEFUN([CR_COMPUTE_INT],[
   pushdef([cr_cvname],cr_cv_compute_int_[$1])[]dnl
-  AC_CACHE_CHECK([[for value of $1]],cr_cvname,[
-    cr_cvname=""
+  AC_CACHE_CHECK([[for value for $1]],cr_cvname,[
+    cr_cvname="not found"
     m4_ifdef([AC_COMPUTE_INT],
 	[AC_COMPUTE_INT([cr_cvname], [$2], [$3])],
 	[_AC_COMPUTE_INT([$2], [cr_cvname], [$3])])
   ])
-  if test -n "$cr_cvname"; then
+  if test "$cr_cvname" != "not found"; then
     [$1]="$cr_cvname"
   fi
   popdef([cr_cvname])[]dnl
@@ -1304,3 +1322,50 @@
   fi
   popdef([cr_varname])[]dnl
 ])
+
+# CR_COMPUTE_KERNEL_INT(VAR,EXPRESSION,[INCLUDES])
+# ------------------------------------------------------
+# Compute a constant (ulong) C expression, even when cross compiling, using 
+# the kernel compilation environment.  I had to kludge this to get it to work
+# by setting the cross_compiling flag to yes.  Otherwise, the program that
+# autoconf builds tries to use stdio calls, and the test fails.
+#
+# By setting this flag, autoconf uses _AC_COMPUTE_INT_RUN to evaluate the
+# expression, rather than _AC_COMPUTE_INT_COMPILE, which uses stdio by default.
+AC_DEFUN([CR_COMPUTE_KERNEL_INT],[
+  AC_REQUIRE([CR_SET_KCFLAGS])
+  pushdef([cr_cvname],cr_cv_compute_kernel_int_[$1])[]dnl
+  SAVE_CPP=$CPP
+  SAVE_CPPFLAGS=$CPPFLAGS
+  SAVE_cross_compiling="$cross_compiling"
+  CPP="$KCC -E"
+  CPPFLAGS="$KCFLAGS"
+  cross_compiling="yes"
+  AC_CACHE_CHECK([[kernel for value for $1]],cr_cvname,[
+    cr_cvname="not found"
+    m4_ifdef([AC_COMPUTE_INT],
+	[AC_COMPUTE_INT([cr_cvname], [$2], [$3])],
+	[_AC_COMPUTE_INT([$2], [cr_cvname], [$3])])
+  ])
+  CPP=$SAVE_CPP
+  CPPFLAGS=$SAVE_CPPFLAGS
+  cross_compiling="$SAVE_cross_compiling"
+  if test "$cr_cvname" != "not found"; then
+    [$1]="$cr_cvname"
+  fi
+  popdef([cr_cvname])[]dnl
+])
+
+# CR_DEFINE_KERNEL_INT(VAR,EXPRESSION,[INCLUDES],[TEMPLATE_TEXT])
+# ------------------------------------------------------
+# Like CR_COMPUTE_KERNEL_INT, but also doing AC_DEFINE
+AC_DEFUN([CR_DEFINE_KERNEL_INT],[
+  pushdef([cr_varname],[$1])[]dnl
+  cr_varname=""
+  CR_COMPUTE_KERNEL_INT(cr_varname,[$2],[$3])
+  if test -n "$cr_varname"; then
+    AC_DEFINE_UNQUOTED(cr_varname, $cr_varname)
+    AH_TEMPLATE(cr_varname,m4_default([$4], [[Computed value of '$2']]))
+  fi
+  popdef([cr_varname])[]dnl
+])
diff -Nru blcr-0.8.2/aclocal.m4 blcr-0.8.4/aclocal.m4
--- blcr-0.8.2/aclocal.m4	2009-06-17 03:56:29.000000000 +0000
+++ blcr-0.8.4/aclocal.m4	2011-10-11 22:58:41.000000000 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +123,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -143,7 +143,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -163,6 +163,7 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -182,15 +183,17 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+_LT_CC_BASENAME([$compiler])
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -231,11 +234,56 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
+
+
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -308,15 +356,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -485,7 +533,7 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -536,6 +584,22 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -567,7 +631,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -577,8 +641,10 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
      fi
    fi
@@ -604,11 +670,16 @@
    LDFLAGS="$LDFLAGS $3"
    printf "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
+     # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
      else
        $2=yes
      fi
@@ -632,7 +703,7 @@
 AC_MSG_CHECKING([the maximum length of command line arguments])
 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   i=0
-  testring="ABCD"
+  teststring="ABCD"
 
   case $build_os in
   msdosdjgpp*)
@@ -667,20 +738,64 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
- *)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 	    lt_cv_sys_max_cmd_len=$new_result &&
 	    test $i != 17 # 1/2 MB should be enough
     do
       i=`expr $i + 1`
-      testring=$testring$testring
+      teststring=$teststring$teststring
     done
-    testring=
+    teststring=
     # 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.
@@ -697,7 +812,7 @@
 
 
 # _LT_AC_CHECK_DLFCN
-# --------------------
+# ------------------
 AC_DEFUN([_LT_AC_CHECK_DLFCN],
 [AC_CHECK_HEADERS(dlfcn.h)dnl
 ])# _LT_AC_CHECK_DLFCN
@@ -705,7 +820,7 @@
 
 # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
+# ---------------------------------------------------------------------
 AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "$cross_compiling" = yes; then :
@@ -771,17 +886,19 @@
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }]
 EOF
   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) $1 ;;
       x$lt_dlneed_uscore) $2 ;;
-      x$lt_unknown|x*) $3 ;;
+      x$lt_dlunknown|x*) $3 ;;
     esac
   else :
     # compilation failed
@@ -793,7 +910,7 @@
 
 
 # AC_LIBTOOL_DLOPEN_SELF
-# -------------------
+# ----------------------
 AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "x$enable_dlopen" != xyes; then
@@ -864,7 +981,7 @@
     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -877,7 +994,7 @@
     ])
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
     	  lt_cv_dlopen_self_static, [dnl
 	  _LT_AC_TRY_DLOPEN_SELF(
@@ -925,7 +1042,7 @@
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -937,11 +1054,13 @@
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -1005,8 +1124,8 @@
 [AC_MSG_CHECKING([how to hardcode library paths into programs])
 _LT_AC_TAGVAR(hardcode_action, $1)=
 if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -1076,7 +1195,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -1173,7 +1292,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[[45]]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1189,7 +1308,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -1201,7 +1320,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -1231,7 +1351,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -1254,7 +1374,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # 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"`
@@ -1289,8 +1409,17 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -1308,14 +1437,19 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -1335,9 +1469,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -1352,7 +1486,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -1363,7 +1497,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -1375,6 +1509,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -1432,10 +1578,27 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390x*|powerpc64*)
+    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+    if AC_TRY_EVAL(ac_compile); then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -1496,8 +1659,13 @@
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=yes
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -1517,7 +1685,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -1535,13 +1703,6 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -1567,7 +1728,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -1600,6 +1761,29 @@
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1613,6 +1797,11 @@
 esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
 ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 
 
@@ -1637,6 +1826,9 @@
       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
     fi
   fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
 
   # Extract list of available tagged configurations in $ofile.
   # Note that this assumes the entire list is on one line.
@@ -1663,7 +1855,9 @@
 
       case $tagname in
       CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
 	  AC_LIBTOOL_LANG_CXX_CONFIG
 	else
 	  tagname=""
@@ -1725,7 +1919,7 @@
 
 # AC_LIBTOOL_WIN32_DLL
 # --------------------
-# declare package support for building win32 dll's
+# declare package support for building win32 DLLs
 AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
 [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
 ])# AC_LIBTOOL_WIN32_DLL
@@ -1763,7 +1957,7 @@
 
 # AC_DISABLE_SHARED
 # -----------------
-#- set the default shared flag to --disable-shared
+# set the default shared flag to --disable-shared
 AC_DEFUN([AC_DISABLE_SHARED],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)
@@ -1899,7 +2093,7 @@
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -2009,7 +2203,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -2041,7 +2235,7 @@
 AC_DEFUN([AC_PROG_LD_GNU],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -2068,6 +2262,15 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 ])# AC_PROG_LD_RELOAD_FLAG
 
 
@@ -2101,21 +2304,21 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[[45]]*)
   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
 cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
+  # func_win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
@@ -2124,13 +2327,13 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -2146,7 +2349,7 @@
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -2162,6 +2365,11 @@
   esac
   ;;
 
+interix3*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $LD in
   *-32|*"-32 ") libmagic=32-bit;;
@@ -2174,15 +2382,6 @@
 
 # This must be Linux ELF.
 linux*)
-  case $host_cpu in
-  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64)
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2205,12 +2404,10 @@
   ;;
 
 openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   fi
   ;;
 
@@ -2218,15 +2415,11 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
@@ -2247,10 +2440,13 @@
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
 
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -2270,36 +2466,43 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
 	  break
 	  ;;
 	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
 NM="$lt_cv_path_NM"
@@ -2331,13 +2534,13 @@
 # -----------------------------------
 # sets LIBLTDL to the link flags for the libltdl convenience library and
 # LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
 AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   case $enable_ltdl_convenience in
@@ -2356,13 +2559,13 @@
 # -----------------------------------
 # sets LIBLTDL to the link flags for the libltdl installable library and
 # LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!).  If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
 AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
@@ -2400,10 +2603,21 @@
 # ---------------
 AC_DEFUN([_LT_AC_LANG_CXX],
 [AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
 ])# _LT_AC_LANG_CXX
 
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
 
 # AC_LIBTOOL_F77
 # --------------
@@ -2443,7 +2657,7 @@
 
 
 # AC_LIBTOOL_RC
-# --------------
+# -------------
 # enable support for Windows resource files
 AC_DEFUN([AC_LIBTOOL_RC],
 [AC_REQUIRE([LT_AC_PROG_RC])
@@ -2476,36 +2690,9 @@
 
 _LT_AC_SYS_COMPILER
 
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
-    ;;
-  esac
-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])
-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
-  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
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
 
 AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
 AC_LIBTOOL_PROG_COMPILER_PIC($1)
@@ -2515,9 +2702,9 @@
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
+AC_LIBTOOL_DLOPEN_SELF
 
-# Report which librarie types wil actually be built
+# Report which library types will actually be built
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
 
@@ -2526,7 +2713,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -2535,47 +2722,10 @@
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
     ;;
 esac
 AC_MSG_RESULT([$enable_shared])
@@ -2601,7 +2751,7 @@
 AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
 [AC_LANG_PUSH(C++)
 AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 
 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -2613,6 +2763,7 @@
 _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 _LT_AC_TAGVAR(hardcode_automatic, $1)=no
 _LT_AC_TAGVAR(module_cmds, $1)=
 _LT_AC_TAGVAR(module_expsym_cmds, $1)=
@@ -2630,7 +2781,7 @@
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 
 # Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
 
 # Object file extension for compiled C++ test sources.
 objext=o
@@ -2640,11 +2791,15 @@
 lt_simple_compile_test_code="int some_variable = 0;\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
 lt_save_LD=$LD
@@ -2655,18 +2810,18 @@
 if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 else
-  unset lt_cv_prog_gnu_ld
+  $as_unset lt_cv_prog_gnu_ld
 fi
 if test -n "${lt_cv_path_LDCXX+set}"; then
   lt_cv_path_LD=$lt_cv_path_LDCXX
 else
-  unset lt_cv_path_LD
+  $as_unset lt_cv_path_LD
 fi
 test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+_LT_CC_BASENAME([$compiler])
 
 # We don't want -fno-exception wen compiling C++ code, so set the
 # no_builtin_flag separately
@@ -2755,6 +2910,7 @@
 	    ;;
 	  esac
 	done
+	;;
       esac
 
       exp_sym_flag='-bexport'
@@ -2773,7 +2929,7 @@
     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
     if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
       # We only want to do this on AIX 4.2 and lower, the check
       # below for broken collect2 doesn't work under 4.3+
 	collect2name=`${CC} -print-prog-name=collect2`
@@ -2792,8 +2948,12 @@
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 	fi
+	;;
       esac
       shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
     else
       # not using gcc
       if test "$host_cpu" = ia64; then
@@ -2820,12 +2980,12 @@
       _LT_AC_SYS_LIBPATH_AIX
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
       if test "$host_cpu" = ia64; then
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
       else
 	# Determine the default libpath from the value encoded in an empty executable.
 	_LT_AC_SYS_LIBPATH_AIX
@@ -2834,16 +2994,26 @@
 	# -berok will link without error, but may produce a broken library.
 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
 	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	# This is similar to how AIX traditionally builds its shared libraries.
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
     ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
   chorus*)
     case $cc_basename in
       *)
@@ -2862,7 +3032,7 @@
     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 
     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       # 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
@@ -2871,70 +3041,81 @@
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
     else
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
   ;;
+      darwin* | rhapsody*)
+        case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+        esac
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
+      output_verbose_link_cmd='echo'
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
+      fi
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
       else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+        fi
+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          else
+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          fi
+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
       fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    else
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    fi
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
-    ;;
+        ;;
 
   dgux*)
     case $cc_basename in
-      ec++)
+      ec++*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      ghcx)
+      ghcx*)
 	# Green Hills C++ Compiler
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -2945,14 +3126,14 @@
 	;;
     esac
     ;;
-  freebsd[12]*)
+  freebsd[[12]]*)
     # C++ shared libraries reported to be fairly broken before switch to ELF
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -2969,11 +3150,11 @@
 				# location of the library.
 
     case $cc_basename in
-    CC)
+    CC*)
       # FIXME: insert proper C++ library support
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
-    aCC)
+    aCC*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
@@ -2983,7 +3164,7 @@
       # explicitly linking system object files so we need to strip them
       # from the output so that they don't get included in the library
       # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
       ;;
     *)
       if test "$GXX" = yes; then
@@ -2997,33 +3178,22 @@
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-      hppa*64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+      case $host_cpu in
+      hppa*64*|ia64*)
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-        ;;
-      ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
         ;;
       *)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
       esac
     fi
-    case "$host_cpu" in
-    hppa*64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    ia64*)
+    case $host_cpu in
+    hppa*64*|ia64*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
       ;;
     *)
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -3034,14 +3204,17 @@
     esac
 
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      aCC)
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -3060,9 +3233,12 @@
       *)
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
-	    ia64*|hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	    case $host_cpu in
+	    hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    *)
 	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -3076,11 +3252,25 @@
 	;;
     esac
     ;;
+  interix3*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
   irix5* | irix6*)
     case $cc_basename in
-      CC)
+      CC*)
 	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	# Archives containing C++ object files must be created using
 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -3091,7 +3281,7 @@
       *)
 	if test "$GXX" = yes; then
 	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	  else
 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 	  fi
@@ -3104,7 +3294,7 @@
     ;;
   linux*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -3129,17 +3319,41 @@
 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 	;;
-      icpc)
+      icpc*)
 	# Intel C++
 	with_gnu_ld=yes
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      cxx)
+      pgCC*)
+        # Portland Group C++ compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
 	# Compaq C++
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -3170,7 +3384,7 @@
     ;;
   mvs*)
     case $cc_basename in
-      cxx)
+      cxx*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
@@ -3191,9 +3405,25 @@
     # Workaround some broken pre-1.5 toolchains
     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
     ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  openbsd*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    fi
+    output_verbose_link_cmd='echo'
+    ;;
   osf3*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -3209,14 +3439,14 @@
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      cxx)
+      cxx*)
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3234,7 +3464,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3253,7 +3483,7 @@
     ;;
   osf4* | osf5*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -3268,17 +3498,17 @@
 	# the KAI C++ compiler.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      cxx)
+      cxx*)
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 	  $rm $lib.exp'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -3297,7 +3527,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3318,27 +3548,14 @@
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  sco*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
   sunos4*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.x
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      lcc)
+      lcc*)
 	# Lucid
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3351,36 +3568,33 @@
     ;;
   solaris*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
 	    # The C++ compiler is used as linker so we must use $wl
 	    # flag to pass the commands to the underlying system
-	    # linker.
+	    # linker. We must also pass each convience library through
+	    # to the system linker between allextract/defaultextract.
+	    # The C++ compiler will combine linker options so we
+	    # cannot just pass the convience library names through
+	    # without $wl.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	output_verbose_link_cmd='echo'
 
 	# Archives containing C++ object files must be created using
 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -3388,7 +3602,7 @@
 	# in the archive.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 	;;
-      gcx)
+      gcx*)
 	# Green Hills C++ Compiler
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
@@ -3426,12 +3640,63 @@
 	;;
     esac
     ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
     ;;
   tandem*)
     case $cc_basename in
-      NCC)
+      NCC*)
 	# NonStop-UX NCC 3.20
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3464,8 +3729,6 @@
 AC_LIBTOOL_PROG_LD_SHLIBS($1)
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
 
 AC_LIBTOOL_CONFIG($1)
 
@@ -3483,7 +3746,7 @@
 ])# AC_LIBTOOL_LANG_CXX_CONFIG
 
 # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
+# ------------------------------------
 # Figure out "hidden" library dependencies from verbose
 # compiler output when linking a shared library.
 # Parse the compiler output and extract the necessary
@@ -3537,7 +3800,7 @@
   # The `*' in the case matches for architectures that use `case' in
   # $output_verbose_cmd can trigger glob expansion during the loop
   # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
   for p in `eval $output_verbose_link_cmd`; do
     case $p in
@@ -3613,13 +3876,37 @@
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix3*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_AC_TAGVAR(predep_objects,$1)=
+  _LT_AC_TAGVAR(postdep_objects,$1)=
+  _LT_AC_TAGVAR(postdeps,$1)=
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    ;;
+  esac
+  ;;
+esac
+])
+
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
 ])# AC_LIBTOOL_POSTDEP_PREDEP
 
 # AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
+# --------------------------
 # Ensure that the configuration vars for the C compiler are
 # suitably defined.  Those variables are subsequently used by
 # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
@@ -3663,12 +3950,16 @@
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${F77-"f77"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+_LT_CC_BASENAME([$compiler])
 
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
@@ -3678,7 +3969,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -3686,8 +3977,10 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
 AC_MSG_RESULT([$enable_shared])
@@ -3697,8 +3990,6 @@
 test "$enable_shared" = yes || enable_static=yes
 AC_MSG_RESULT([$enable_static])
 
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
 _LT_AC_TAGVAR(GCC, $1)="$G77"
 _LT_AC_TAGVAR(LD, $1)="$LD"
 
@@ -3708,8 +3999,6 @@
 AC_LIBTOOL_PROG_LD_SHLIBS($1)
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
 
 AC_LIBTOOL_CONFIG($1)
 
@@ -3738,20 +4027,27 @@
 lt_simple_compile_test_code="class foo {}\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${GCJ-"gcj"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
 AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
 AC_LIBTOOL_PROG_COMPILER_PIC($1)
 AC_LIBTOOL_PROG_CC_C_O($1)
@@ -3759,8 +4055,6 @@
 AC_LIBTOOL_PROG_LD_SHLIBS($1)
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
 
 AC_LIBTOOL_CONFIG($1)
 
@@ -3770,7 +4064,7 @@
 
 
 # AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
+# -------------------------
 # Ensure that the configuration vars for the Windows resource compiler are
 # suitably defined.  Those variables are subsequently used by
 # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
@@ -3794,11 +4088,16 @@
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 
 AC_LIBTOOL_CONFIG($1)
@@ -3828,7 +4127,7 @@
   # 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.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -3934,7 +4233,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -3945,11 +4244,11 @@
 SED=$lt_SED
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # The names of the tagged configurations supported by this script.
 available_tags=
@@ -3980,6 +4279,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -3991,12 +4296,18 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 
 # Is the compiler the GNU C compiler?
 with_gcc=$_LT_AC_TAGVAR(GCC, $1)
 
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -4022,7 +4333,7 @@
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS=$lt_AS
+AS="$AS"
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -4041,7 +4352,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -4056,7 +4367,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -4130,11 +4441,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -4146,7 +4457,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -4226,7 +4537,7 @@
 link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -4330,9 +4641,6 @@
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
 # Transform an extracted symbol line into a proper C declaration
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
@@ -4354,15 +4662,31 @@
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
+linux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDGIRSTW]]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
 irix* | nonstopux*)
   symcode='[[BCDEGRST]]'
   ;;
 osf*)
   symcode='[[BCDEGQRST]]'
   ;;
-solaris* | sysv5*)
+solaris*)
   symcode='[[BDRT]]'
   ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
 sysv4)
   symcode='[[DFNSTU]]'
   ;;
@@ -4385,8 +4709,11 @@
 # Try without a prefix undercore, then with it.
 for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
   # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -4542,6 +4869,10 @@
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
     sysv4*MP*)
       if test -d /usr/nec; then
 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
@@ -4550,7 +4881,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	;;
       *)
@@ -4575,18 +4906,28 @@
 	;;
       chorus*)
 	case $cc_basename in
-	cxch68)
+	cxch68*)
 	  # Green Hills C++ Compiler
 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 	  ;;
 	esac
 	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           ;;
+         esac
+       ;;
       dgux*)
 	case $cc_basename in
-	  ec++)
+	  ec++*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
-	  ghcx)
+	  ghcx*)
 	    # Green Hills C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
@@ -4594,22 +4935,22 @@
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 	    if test "$host_cpu" != ia64; then
 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	    fi
 	    ;;
-	  aCC)
+	  aCC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
@@ -4622,9 +4963,13 @@
 	    ;;
 	esac
 	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    # CC pic flag -KPIC is the default.
@@ -4635,18 +4980,24 @@
 	;;
       linux*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    # KAI C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
-	  icpc)
+	  icpc* | ecpc*)
 	    # Intel C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  cxx)
+	  pgCC*)
+	    # Portland Group C++ compiler.
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
 	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -4663,7 +5014,7 @@
 	;;
       mvs*)
 	case $cc_basename in
-	  cxx)
+	  cxx*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
 	    ;;
 	  *)
@@ -4674,14 +5025,14 @@
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    ;;
-	  RCC)
+	  RCC*)
 	    # Rational C++ 2.4.1
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
-	  cxx)
+	  cxx*)
 	    # Digital/Compaq C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -4695,24 +5046,15 @@
 	;;
       psos*)
 	;;
-      sco*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
       solaris*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 	    ;;
-	  gcx)
+	  gcx*)
 	    # Green Hills C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 	    ;;
@@ -4722,12 +5064,12 @@
 	;;
       sunos4*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.x
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    ;;
-	  lcc)
+	  lcc*)
 	    # Lucid
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
@@ -4737,7 +5079,7 @@
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC)
+	  NCC*)
 	    # NonStop-UX NCC 3.20
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
@@ -4745,7 +5087,14 @@
 	    ;;
 	esac
 	;;
-      unixware*)
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
 	;;
       vxworks*)
 	;;
@@ -4792,6 +5141,11 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -4808,7 +5162,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -4834,6 +5188,16 @@
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -4845,7 +5209,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -4869,12 +5233,19 @@
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
       ccc*)
         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
         # All Alpha code is PIC.
@@ -4889,15 +5260,15 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    sco3.2v5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-      ;;
-
     solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -4906,7 +5277,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4919,6 +5290,17 @@
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
     uts4*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4946,7 +5328,7 @@
     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
@@ -4955,6 +5337,16 @@
     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
 ])
 
 
@@ -4979,7 +5371,7 @@
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -5022,7 +5414,8 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
-
+  # Just being paranoid about ensuring that cc_basename is set.
+  _LT_CC_BASENAME([$compiler])
   case $host_os in
   cygwin* | mingw* | pw32*)
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -5032,6 +5425,10 @@
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -5042,6 +5439,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -5092,10 +5510,10 @@
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# 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
@@ -5104,9 +5522,55 @@
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix3*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
       else
-	ld_shlibs=no
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
@@ -5120,7 +5584,7 @@
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	cat <<EOF 1>&2
@@ -5141,6 +5605,33 @@
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -5148,31 +5639,6 @@
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-      fi
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -5183,16 +5649,11 @@
       ;;
     esac
 
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-      runpath_var=LD_RUN_PATH
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-      fi
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -5204,7 +5665,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -5238,6 +5699,7 @@
   	    break
   	  fi
 	  done
+	  ;;
 	esac
 
 	exp_sym_flag='-bexport'
@@ -5256,7 +5718,7 @@
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -5275,8 +5737,12 @@
   	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
   	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -5284,11 +5750,11 @@
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
+	  if test "$aix_use_runtimelinking" = yes; then
 	    shared_flag='${wl}-G'
 	  else
 	    shared_flag='${wl}-bM:SRE'
-  	fi
+	  fi
 	fi
       fi
 
@@ -5302,12 +5768,12 @@
        # Determine the default libpath from the value encoded in an empty executable.
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 _LT_AC_SYS_LIBPATH_AIX
@@ -5316,13 +5782,11 @@
 	  # -berok will link without error, but may produce a broken library.
 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -5335,7 +5799,7 @@
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
 
-    bsdi4*)
+    bsdi[[45]]*)
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
 
@@ -5349,64 +5813,64 @@
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
       _LT_AC_TAGVAR(archive_cmds, $1)='$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.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
     fi
       ;;
 
@@ -5440,7 +5904,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -5463,47 +5927,62 @@
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
 	*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
 	*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 
@@ -5551,6 +6030,7 @@
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       else
@@ -5596,7 +6076,7 @@
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5604,21 +6084,15 @@
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
       ;;
 
-    sco3.2v5*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
       if test "$GCC" = yes; then
+	wlarc='${wl}'
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -5627,8 +6101,18 @@
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -5685,36 +6169,45 @@
       fi
       ;;
 
-    sysv4.2uw2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    sysv5*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      _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'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -5732,11 +6225,6 @@
 AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
 test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -5764,6 +6252,7 @@
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -5884,12 +6373,13 @@
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -5914,60 +6404,38 @@
     fi
   done
 done
-SED=$lt_cv_path_SED
 ])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
-#                                                        -*- Autoconf -*-
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.3])])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
@@ -6014,26 +6482,16 @@
 am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
 
-# AM_CONDITIONAL                                              -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 6
+# serial 7
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -6053,30 +6511,19 @@
 fi
 AC_CONFIG_COMMANDS_PRE(
 [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# serial 7						-*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+# serial 8
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -6085,7 +6532,6 @@
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
 
-
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
@@ -6174,9 +6620,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_$1_dependencies_compiler_type=$depmode
         break
       fi
@@ -6220,26 +6671,16 @@
 AC_SUBST([AMDEPBACKSLASH])
 ])
 
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-#serial 2
+#serial 3
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@@ -6258,27 +6699,21 @@
   else
     continue
   fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
   U=`sed -n 's/^U = //p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
@@ -6304,30 +6739,19 @@
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Do all the work for Automake.                            -*- Autoconf -*-
+# Do all the work for Automake.                             -*- Autoconf -*-
 
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# serial 12
 
-# serial 11
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
 
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
@@ -6385,7 +6809,6 @@
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
 AM_PROG_INSTALL_SH
 AM_PROG_INSTALL_STRIP
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -6394,7 +6817,9 @@
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
                   [_AM_DEPENDENCIES(CC)],
@@ -6428,51 +6853,27 @@
 done
 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
@@ -6487,26 +6888,15 @@
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
-# Check to see how 'make' treats includes.	-*- Autoconf -*-
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -6550,27 +6940,16 @@
 rm -f confinc confmf
 ])
 
-#  -*- Autoconf -*-
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
+# serial 4
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -6596,27 +6975,16 @@
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+#
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -6637,13 +7005,21 @@
 # this.)
 AC_DEFUN([AM_PROG_MKDIR_P],
 [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
   #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
 else
   # On NextStep and OpenStep, the `mkdir' command does not
   # recognize any option.  It will interpret all options as
@@ -6662,26 +7038,15 @@
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Helper functions for option handling.                     -*- Autoconf -*-
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -6706,28 +7071,16 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_SANITY_CHECK
 # ---------------
@@ -6770,25 +7123,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# AM_PROG_INSTALL_STRIP
+# ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -6809,4 +7151,100 @@
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
 m4_include([acinclude.m4])
diff -Nru blcr-0.8.2/autogen.sh blcr-0.8.4/autogen.sh
--- blcr-0.8.2/autogen.sh	2008-04-29 18:53:37.000000000 +0000
+++ blcr-0.8.4/autogen.sh	2011-08-23 23:22:04.000000000 +0000
@@ -22,7 +22,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-#  $Id: autogen.sh,v 1.7 2008/04/29 18:53:37 phargrov Exp $
+#  $Id: autogen.sh,v 1.7.38.2 2011/08/23 23:22:04 phargrov Exp $
 
 set -e
 
@@ -31,6 +31,7 @@
 rm -rf autom4te.cache
 aclocal
 autoheader
+touch blcr_config.h.in
 autoconf
 libtoolize --automake --copy
 if [ -f ./ltmain.sh ]; then
diff -Nru blcr-0.8.2/blcr_config.h.in blcr-0.8.4/blcr_config.h.in
--- blcr-0.8.2/blcr_config.h.in	2009-06-17 03:56:34.000000000 +0000
+++ blcr-0.8.4/blcr_config.h.in	2011-10-11 22:58:46.000000000 +0000
@@ -51,12 +51,21 @@
 /* Computed value of 'offsetof(struct siginfo, si_pid)' */
 #undef CR_ASM_SI_PID_OFFSET
 
+/* Define to address of exported kernel symbol __register_chrdev */
+#undef CR_EXPORTED_KCODE___register_chrdev
+
 /* Define to address of exported kernel symbol register_blkdev */
 #undef CR_EXPORTED_KCODE_register_blkdev
 
 /* Define to address of exported kernel symbol register_chrdev */
 #undef CR_EXPORTED_KCODE_register_chrdev
 
+/* Computed value of 'F_GETPIPE_SZ' */
+#undef CR_F_GETPIPE_SZ
+
+/* Computed value of 'F_SETPIPE_SZ' */
+#undef CR_F_SETPIPE_SZ
+
 /* Define to 1 if work around for bug 2524 is requested. */
 #undef CR_HAVE_BUG2524
 
@@ -103,6 +112,10 @@
    exported */
 #undef CR_KCODE_attach_pid
 
+/* Define to address of non-exported kernel symbol audit_syscall_exit, or 0 if
+   exported */
+#undef CR_KCODE_audit_syscall_exit
+
 /* Define to address of non-exported kernel symbol change_pid, or 0 if
    exported */
 #undef CR_KCODE_change_pid
@@ -143,6 +156,10 @@
    */
 #undef CR_KCODE_find_pid
 
+/* Define to address of non-exported kernel symbol find_task_by_pid_ns, or 0
+   if exported */
+#undef CR_KCODE_find_task_by_pid_ns
+
 /* Define to address of non-exported kernel symbol follow_huge_addr, or 0 if
    exported */
 #undef CR_KCODE_follow_huge_addr
@@ -203,6 +220,10 @@
    exported */
 #undef CR_KCODE_map_vsyscall
 
+/* Define to address of non-exported kernel symbol pipe_fcntl, or 0 if
+   exported */
+#undef CR_KCODE_pipe_fcntl
+
 /* Define to address of non-exported kernel symbol pmd_huge, or 0 if exported
    */
 #undef CR_KCODE_pmd_huge
@@ -279,6 +300,10 @@
    exported */
 #undef CR_KCODE_timeval_to_jiffies
 
+/* Define to address of non-exported kernel symbol vectors_user_mapping, or 0
+   if exported */
+#undef CR_KCODE_vectors_user_mapping
+
 /* Define to address of non-exported kernel symbol HPAGE_SHIFT, or 0 if
    exported */
 #undef CR_KDATA_HPAGE_SHIFT
@@ -319,6 +344,10 @@
    exported */
 #undef CR_KDATA_mem_map_zero
 
+/* Define to address of non-exported kernel symbol old_rsp, or 0 if exported
+   */
+#undef CR_KDATA_old_rsp
+
 /* Define to address of non-exported kernel symbol per_cpu__cpu_gdt_descr, or
    0 if exported */
 #undef CR_KDATA_per_cpu__cpu_gdt_descr
@@ -382,6 +411,9 @@
 /* Maximum legal size to kmalloc() */
 #undef CR_KMALLOC_MAX
 
+/* Define to 1 if linux/autoconf.h must be included explicitly */
+#undef CR_NEED_AUTOCONF_H
+
 /* Define to 1 to enable restore of uid, gid and supplemental groups when
    invoked by root. (default is no) */
 #undef CR_RESTORE_IDS
@@ -408,6 +440,14 @@
    type 'int'. */
 #undef HAVE_2_6_0_TASK_IDS
 
+/* Define to 1 if the kernel has "
+   audit_syscall_exit(NULL,AUDITSC_RESULT(0),0)". */
+#undef HAVE_2_6_12_AUDIT_SYSCALL_EXIT
+
+/* Define to 1 if the kernel has " audit_syscall_exit(AUDITSC_RESULT(0),0)".
+   */
+#undef HAVE_2_6_17_AUDIT_SYSCALL_EXIT
+
 /* Define to 1 if the kernel has "int process_session(NULL)". */
 #undef HAVE_2_6_20_TASK_IDS
 
@@ -423,6 +463,9 @@
 /* Define to 1 if the kernel has 2.6.28 restore_fpu_checking. */
 #undef HAVE_2_6_28_RESTORE_FPU_CHECKING
 
+/* Define to 1 if the kernel has " audit_syscall_exit(NULL,0)". */
+#undef HAVE_2_6_6_AUDIT_SYSCALL_EXIT
+
 /* Define to 1 if the kernel type 'struct task_struct' has member
    'signal->session' of type 'int'. */
 #undef HAVE_2_6_6_TASK_IDS
@@ -487,12 +530,19 @@
 /* Define to 1 if the kernel has the <asm/vsyscall32.h> header file. */
 #undef HAVE_ASM_VSYSCALL32_H
 
+/* Define to 1 if the kernel has the macro or function audit_dummy_context().
+   */
+#undef HAVE_AUDIT_DUMMY_CONTEXT
+
 /* Define to 1 if the kernel has the macro or function change_pid(). */
 #undef HAVE_CHANGE_PID
 
 /* Define to 1 if the kernel has the macro or function child_reaper(). */
 #undef HAVE_CHILD_REAPER
 
+/* Define to 1 if the kernel defines the macro CONFIG_AUDITSYSCALL. */
+#undef HAVE_CONFIG_AUDITSYSCALL
+
 /* Define to 1 if the kernel defines the macro CONFIG_HUGETLBFS. */
 #undef HAVE_CONFIG_HUGETLBFS
 
@@ -520,6 +570,10 @@
    of type 'int'. */
 #undef HAVE_FILES_STRUCT_NEXT_FD
 
+/* Define to 1 if the kernel type 'struct file' has member 'f_lock' of type
+   'spinlock_t'. */
+#undef HAVE_FILE_F_LOCK
+
 /* Define to 1 if the kernel type 'struct file' has member 'f_mapping' of type
    'struct address_space*'. */
 #undef HAVE_FILE_F_MAPPING
@@ -528,6 +582,10 @@
    'check_flags'. */
 #undef HAVE_FILE_OPERATIONS_CHECK_FLAGS
 
+/* Define to 1 if the kernel type 'struct file_operations' has member
+   'unlocked_ioctl'. */
+#undef HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL
+
 /* Define to 1 if the kernel has the macro or function find_pid_ns(). */
 #undef HAVE_FIND_PID_NS
 
@@ -549,9 +607,26 @@
 /* Define to 1 if the kernel defines the macro for_each_task_pid. */
 #undef HAVE_FOR_EACH_TASK_PID
 
+/* Define to 1 if the kernel type 'struct fs_struct' has member 'lock' of type
+   'rwlock_t'. */
+#undef HAVE_FS_STRUCT_RWLOCK
+
+/* Define to 1 if the kernel type 'struct fs_struct' has member 'lock' of type
+   'spinlock_t'. */
+#undef HAVE_FS_STRUCT_SPINLOCK
+
 /* Define to 1 if the Fault Tolerance Backplane is available. */
 #undef HAVE_FTB
 
+/* Define to 1 if the kernel defines the macro F_GETPIPE_SZ. */
+#undef HAVE_F_GETPIPE_SZ
+
+/* Define to 1 if the kernel defines the macro F_SETPIPE_SZ. */
+#undef HAVE_F_SETPIPE_SZ
+
+/* Define to 1 if the kernel has the <generated/utsrelease.h> header file. */
+#undef HAVE_GENERATED_UTSRELEASE_H
+
 /* Define to 1 if the kernel has the type 'gfp_t'. */
 #undef HAVE_GFP_T
 
@@ -594,6 +669,9 @@
 /* Define to 1 if the kernel has the macro or function kzalloc(). */
 #undef HAVE_KZALLOC
 
+/* Define to 1 if the kernel has the <linux/audit.h> header file. */
+#undef HAVE_LINUX_AUDIT_H
+
 /* Define to 1 if the kernel has the <linux/compile.h> header file. */
 #undef HAVE_LINUX_COMPILE_H
 
@@ -603,6 +681,9 @@
 /* Define to 1 if the kernel has the <linux/lockdep.h> header file. */
 #undef HAVE_LINUX_LOCKDEP_H
 
+/* Define to 1 if the kernel has the <linux/perf_event.h> header file. */
+#undef HAVE_LINUX_PERF_EVENT_H
+
 /* Define to 1 if the kernel has the <linux/pid_namespace.h> header file. */
 #undef HAVE_LINUX_PID_NAMESPACE_H
 
@@ -615,6 +696,9 @@
 /* Define to 1 if the kernel has the <linux/utrace.h> header file. */
 #undef HAVE_LINUX_UTRACE_H
 
+/* Define to 1 if the kernel has the <linux/utsrelease.h> header file. */
+#undef HAVE_LINUX_UTSRELEASE_H
+
 /* Define to 1 if the kernel has the macro or function map_vsyscall(). */
 #undef HAVE_MAP_VSYSCALL
 
@@ -674,10 +758,17 @@
    'pin'. */
 #undef HAVE_PIPE_BUF_OPERATIONS_PIN
 
+/* Define to 1 if the kernel has the macro or function pipe_fcntl(). */
+#undef HAVE_PIPE_FCNTL
+
 /* Define to 1 if the kernel type 'struct pipe_inode_info' has member 'base'
    of type 'char*'. */
 #undef HAVE_PIPE_INODE_INFO_BASE
 
+/* Define to 1 if the kernel type 'struct pipe_inode_info' has member
+   'buffers' of type 'unsigned int'. */
+#undef HAVE_PIPE_INODE_INFO_BUFFERS
+
 /* Define to 1 if prctl() function is available. */
 #undef HAVE_PRCTL
 
@@ -852,6 +943,10 @@
    type 'unsigned long'. */
 #undef HAVE_THREAD_ESP0
 
+/* Define to 1 if the kernel type 'struct thread_struct' has member 'fpu' of
+   type 'struct fpu'. */
+#undef HAVE_THREAD_FPU
+
 /* Define to 1 if the kernel type 'struct thread_struct' has member 'i387' of
    type 'union i387_union'. */
 #undef HAVE_THREAD_I387
@@ -864,6 +959,10 @@
    of type 'unsigned long'. */
 #undef HAVE_THREAD_INFO_TP_VALUE
 
+/* Define to 1 if the kernel type 'struct thread_struct' has member
+   'ptrace_bps1' of type 'struct perf_event *'. */
+#undef HAVE_THREAD_PTRACE_BPS
+
 /* Define to 1 if the kernel type 'struct thread_struct' has member 'rsp0' of
    type 'unsigned long'. */
 #undef HAVE_THREAD_RSP0
@@ -900,6 +999,9 @@
 /* Define to 1 if the kernel has the macro or function write_pda(). */
 #undef HAVE_WRITE_PDA
 
+/* Define to 1 if you have the `__nss_disable_nscd' function. */
+#undef HAVE___NSS_DISABLE_NSCD
+
 /* Define to 1 if the kernel has the macro or function __putname(). */
 #undef HAVE___PUTNAME
 
diff -Nru blcr-0.8.2/blcr_imports/Makefile.in blcr-0.8.4/blcr_imports/Makefile.in
--- blcr-0.8.2/blcr_imports/Makefile.in	2009-06-17 03:56:45.000000000 +0000
+++ blcr-0.8.4/blcr_imports/Makefile.in	2011-10-11 22:58:52.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,8 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SOURCES = imports.c module.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -35,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = blcr_imports
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -44,7 +43,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES = imports.c
 DIST_SOURCES =
@@ -121,6 +120,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -202,6 +202,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -221,6 +222,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -311,7 +314,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -323,7 +332,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -331,7 +340,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -352,7 +367,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -377,14 +392,16 @@
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -394,9 +411,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -447,15 +466,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -487,7 +508,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -543,7 +564,7 @@
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
 	check-am clean clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive distclean distclean-generic \
+	ctags ctags-recursive dist-hook distclean distclean-generic \
 	distclean-libtool distclean-recursive distclean-tags distdir \
 	dvi dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-exec install-exec-am \
diff -Nru blcr-0.8.2/blcr_imports/module.c blcr-0.8.4/blcr_imports/module.c
--- blcr-0.8.2/blcr_imports/module.c	2008-05-13 06:06:19.000000000 +0000
+++ blcr-0.8.4/blcr_imports/module.c	2010-08-12 21:58:31.000000000 +0000
@@ -21,12 +21,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: module.c,v 1.2 2008/05/13 06:06:19 phargrov Exp $
+ * $Id: module.c,v 1.2.32.2 2010/08/12 21:58:31 phargrov Exp $
  */
 
 #include "blcr_config.h"
 
+#ifdef CR_NEED_AUTOCONF_H
 #include <linux/autoconf.h>
+#endif
 #if defined(CONFIG_SMP) && ! defined(__SMP__)
   #define __SMP__
 #endif
@@ -56,7 +58,11 @@
 #endif
 #include <linux/version.h>
 #ifndef UTS_RELEASE
+ #if HAVE_LINUX_UTSRELEASE_H
   #include <linux/utsrelease.h>
+ #elif HAVE_GENERATED_UTSRELEASE_H
+  #include <generated/utsrelease.h>
+ #endif
 #endif
 #if HAVE_LINUX_COMPILE_H
   #include <linux/compile.h>
@@ -81,7 +87,13 @@
 
 	/* Check current kernel against System.map used at configure time */
 	{
+#if defined(CR_EXPORTED_KCODE_register_chrdev)
 	    unsigned long offset1 = CR_EXPORTED_KCODE_register_chrdev - (unsigned long)&register_chrdev;
+#elif defined(CR_EXPORTED_KCODE___register_chrdev)
+	    unsigned long offset1 = CR_EXPORTED_KCODE___register_chrdev - (unsigned long)&__register_chrdev;
+#else
+	    #error "No register_chrdev symbol for validation of System.map"
+#endif
 	    unsigned long offset2 = CR_EXPORTED_KCODE_register_blkdev - (unsigned long)&register_blkdev;
 	    if (
 #if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PHYSICAL_ALIGN)
diff -Nru blcr-0.8.2/config/compile blcr-0.8.4/config/compile
--- blcr-0.8.2/config/compile	2009-06-17 03:56:43.000000000 +0000
+++ blcr-0.8.4/config/compile	2011-10-11 22:58:53.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2003-11-09.00
+scriptversion=2005-05-14.22
 
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -47,45 +47,49 @@
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
-
-prog=$1
-shift
-
 ofile=
 cfile=
-args=
-while test $# -gt 0; do
-  case "$1" in
-    -o)
-      # configure might choose to run compile as `compile cc -o foo foo.c'.
-      # So we do something ugly here.
-      ofile=$2
-      shift
-      case "$ofile" in
-	*.o | *.obj)
-	  ;;
-	*)
-	  args="$args -o $ofile"
-	  ofile=
-	  ;;
-      esac
-       ;;
-    *.c)
-      cfile=$1
-      args="$args $1"
-      ;;
-    *)
-      args="$args $1"
-      ;;
-  esac
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
   shift
 done
 
@@ -95,36 +99,38 @@
   # normal compilation that the losing compiler can handle.  If no
   # `.c' file was seen then we are probably linking.  That is also
   # ok.
-  exec "$prog" $args
+  exec "$@"
 fi
 
 # Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
 
 # Create the lock directory.
 # Note: use `[/.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
 while true; do
-  if mkdir $lockdir > /dev/null 2>&1; then
+  if mkdir "$lockdir" >/dev/null 2>&1; then
     break
   fi
   sleep 1
 done
 # FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
+trap "rmdir '$lockdir'; exit 1" 1 2 15
 
 # Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
 
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
 fi
 
-rmdir $lockdir
-exit $status
+rmdir "$lockdir"
+exit $ret
 
 # Local Variables:
 # mode: shell-script
diff -Nru blcr-0.8.2/config/config.guess blcr-0.8.4/config/config.guess
--- blcr-0.8.2/config/config.guess	2009-06-17 03:56:35.000000000 +0000
+++ blcr-0.8.4/config/config.guess	2009-12-08 17:40:22.000000000 +0000
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-03-03'
+timestamp='2003-06-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -136,15 +136,12 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_MACHINE}" in
-    i?86)
-	test -z "$VENDOR" && VENDOR=pc
-	;;
-    *)
-	test -z "$VENDOR" && VENDOR=unknown
-	;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+## for Red Hat Linux
+if test -f /etc/redhat-release ; then
+    VENDOR=redhat ;
+else
+    VENDOR= ;
+fi
 
 # Note: order is significant - the case branches are not exclusive.
 
@@ -207,18 +204,12 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -237,9 +228,6 @@
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    pegasos:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -255,24 +243,10 @@
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
     alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
+	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
+	fi
 	# According to Compaq, /usr/sbin/psrinfo has been available on
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 	# covers most systems running today.  This code pipes the CPU
@@ -310,12 +284,11 @@
 	    "EV7.9 (21364A)")
 		UNAME_MACHINE="alphaev79" ;;
 	esac
-	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha*:OpenVMS:*:*)
 	echo alpha-hp-vms
@@ -341,9 +314,6 @@
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -436,9 +406,6 @@
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -774,7 +741,7 @@
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -782,11 +749,6 @@
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -796,7 +758,7 @@
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    *:FreeBSD:*:*)
+    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
 	# Determine whether the default compiler uses glibc.
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -808,10 +770,7 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -844,27 +803,22 @@
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
-	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     cris:Linux:*:*)
-	echo cris-axis-linux
+	echo cris-axis-linux-gnu
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
 	exit 0 ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -883,7 +837,7 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -902,13 +856,13 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR}-linux
+	echo powerpc-${VENDOR:-unknown}-linux-gnu
 	exit 0 ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux
+	echo powerpc64-${VENDOR:-unknown}-linux-gnu
 	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -921,34 +875,34 @@
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
-	  *)    echo hppa-${VENDOR}-linux ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-${VENDOR}-linux
+	echo hppa64-unknown-linux-gnu
 	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
 	exit 0 ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     x86_64:Linux:*:*)
-	echo x86_64-${VENDOR}-linux
+	echo x86_64-${VENDOR:-unknown}-linux-gnu
 	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -963,18 +917,18 @@
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit 0 ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0 ;;
 	  "")
-		# Either a pre-BFD a.out linker (linuxoldld) or
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
@@ -998,12 +952,9 @@
 	LIBC=gnuaout
 	#endif
 	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
@@ -1031,9 +982,6 @@
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
-	i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1105,7 +1053,7 @@
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1220,7 +1168,7 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1264,9 +1212,6 @@
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff -Nru blcr-0.8.2/config/config.sub blcr-0.8.4/config/config.sub
--- blcr-0.8.2/config/config.sub	2009-06-17 03:56:35.000000000 +0000
+++ blcr-0.8.4/config/config.sub	2009-12-08 17:40:22.000000000 +0000
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-02-23'
+timestamp='2003-06-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,8 +118,7 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -229,14 +228,13 @@
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
+	| ip2k \
 	| m32r | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
@@ -249,7 +247,6 @@
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
@@ -260,9 +257,10 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| s390 | s390x \
 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
@@ -307,7 +305,7 @@
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
+	| ip2k-* \
 	| m32r-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
@@ -322,7 +320,6 @@
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
@@ -333,10 +330,11 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
+	| s390-* | s390x-* \
 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
@@ -363,9 +361,6 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -383,9 +378,6 @@
 	amd64)
 		basic_machine=x86_64-pc
 		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -445,20 +437,12 @@
 		basic_machine=j90-cray
 		os=-unicos
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -758,10 +742,6 @@
 		basic_machine=or32-unknown
 		os=-coff
 		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -853,12 +833,6 @@
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@@ -982,10 +956,6 @@
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1081,7 +1051,7 @@
 	sh64)
 		basic_machine=sh64-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1154,20 +1124,19 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1191,8 +1160,8 @@
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
@@ -1203,9 +1172,6 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
-		os=-os400
-		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1227,9 +1193,6 @@
 	-atheos*)
 		os=-atheos
 		;;
-	-syllable*)
-		os=-syllable
-		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1252,9 +1215,6 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
-		os=-tpf
-		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1322,9 +1282,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1503,15 +1463,9 @@
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			-os400*)
-				vendor=ibm
-				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
-				vendor=ibm
-				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
diff -Nru blcr-0.8.2/config/depcomp blcr-0.8.4/config/depcomp
--- blcr-0.8.2/config/depcomp	2009-06-17 03:56:42.000000000 +0000
+++ blcr-0.8.4/config/depcomp	2011-10-11 22:58:53.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2003-11-08.23
+scriptversion=2005-07-09.11
 
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -43,17 +43,18 @@
   depmode     Dependency tracking mode.
   source      Source file read by `PROGRAMS ARGS'.
   object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
   tmpdepfile  Temporary file to use when outputing dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -61,18 +62,10 @@
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
 fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
 
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
@@ -294,27 +287,43 @@
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.d"
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mecanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
       "$@" -Wc,-MD
    else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
       exit $stat
    fi
 
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].
@@ -458,7 +467,8 @@
   done
 
   "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
diff -Nru blcr-0.8.2/config/install-sh blcr-0.8.4/config/install-sh
--- blcr-0.8.2/config/install-sh	2009-06-17 03:56:41.000000000 +0000
+++ blcr-0.8.4/config/install-sh	2011-10-11 22:58:52.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-02-15.20
+scriptversion=2005-05-14.22
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -58,9 +58,6 @@
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-transformbasename=
-transform_arg=
-instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
 chowncmd=
 chgrpcmd=
@@ -70,23 +67,27 @@
 src=
 dst=
 dir_arg=
+dstarg=
+no_target_directory=
 
-usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 -d DIRECTORIES...
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
 
-In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
-In the second, create the directory path DIR.
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
 
 Options:
--b=TRANSFORMBASENAME
--c         copy source (using $cpprog) instead of moving (using $mvprog).
+-c         (ignored)
 -d         create directories instead of installing files.
--g GROUP   $chgrp installed files to GROUP.
--m MODE    $chmod installed files to MODE.
--o USER    $chown installed files to USER.
--s         strip installed files (using $stripprog).
--t=TRANSFORM
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
 --help     display this help and exit.
 --version  display version info and exit.
 
@@ -96,12 +97,7 @@
 
 while test -n "$1"; do
   case $1 in
-    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-        shift
-        continue;;
-
-    -c) instcmd=$cpprog
-        shift
+    -c) shift
         continue;;
 
     -d) dir_arg=true
@@ -113,7 +109,7 @@
         shift
         continue;;
 
-    --help) echo "$usage"; exit 0;;
+    --help) echo "$usage"; exit $?;;
 
     -m) chmodcmd="$chmodprog $2"
         shift
@@ -129,14 +125,20 @@
         shift
         continue;;
 
-    -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-        shift
-        continue;;
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
 
-    --version) echo "$0 $scriptversion"; exit 0;;
+    --version) echo "$0 $scriptversion"; exit $?;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
-	test -n "$dir_arg" && break
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
         # Otherwise, the last argument is the destination.  Remove it from $@.
 	for arg
 	do
@@ -174,13 +176,13 @@
     src=
 
     if test -d "$dst"; then
-      instcmd=:
+      mkdircmd=:
       chmodcmd=
     else
-      instcmd=$mkdirprog
+      mkdircmd=$mkdirprog
     fi
   else
-    # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
     if test ! -f "$src" && test ! -d "$src"; then
@@ -202,12 +204,16 @@
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
       dst=$dst/`basename "$src"`
     fi
   fi
 
   # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 
   # Make sure that the destination directory exists.
 
@@ -220,7 +226,8 @@
     oIFS=$IFS
     # Some sh's can't handle IFS=/ for some reason.
     IFS='%'
-    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
     IFS=$oIFS
 
     pathcomp=
@@ -229,83 +236,83 @@
       pathcomp=$pathcomp$1
       shift
       if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp" || lasterr=$?
+        $mkdirprog "$pathcomp"
 	# mkdir can fail with a `File exist' error in case several
 	# install-sh are creating the directory concurrently.  This
 	# is OK.
-	test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
+	test -d "$pathcomp" || exit
       fi
       pathcomp=$pathcomp/
     done
   fi
 
   if test -n "$dir_arg"; then
-    $doit $instcmd "$dst" \
+    $doit $mkdircmd "$dst" \
       && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
       && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
       && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
 
   else
-    # If we're going to rename the final executable, determine the name now.
-    if test -z "$transformarg"; then
-      dstfile=`basename "$dst"`
-    else
-      dstfile=`basename "$dst" $transformbasename \
-               | sed $transformarg`$transformbasename
-    fi
-
-    # don't allow the sed command to completely eliminate the filename.
-    test -z "$dstfile" && dstfile=`basename "$dst"`
+    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
     rmtmp=$dstdir/_rm.$$_
 
     # Trap to clean up those temp files at exit.
-    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
     trap '(exit $?); exit' 1 2 13 15
 
-    # Move or copy the file name to the temp name
-    $doit $instcmd "$src" "$dsttmp" &&
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
     # If any of these fail, we abort the whole thing.  If we want to
     # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $instcmd $src $dsttmp" command.
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
       && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
 
-    # Now remove or move aside any old file at destination location.  We
-    # try this two ways since rm can't unlink itself on some systems and
-    # the destination file might be busy for other reasons.  In this case,
-    # the final cleanup might fail but the new file should still install
-    # successfully.
-    {
-      if test -f "$dstdir/$dstfile"; then
-        $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-        || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-        || {
-	  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-	  (exit 1); exit
-        }
-      else
-        :
-      fi
-    } &&
-
     # Now rename the file to the real destination.
-    $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-  fi || { (exit 1); exit; }
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
 done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
-  (exit 0); exit
+  (exit 0); exit 0
 }
 
 # Local variables:
diff -Nru blcr-0.8.2/config/kbuild.mak.in blcr-0.8.4/config/kbuild.mak.in
--- blcr-0.8.2/config/kbuild.mak.in	2008-08-04 18:39:29.000000000 +0000
+++ blcr-0.8.4/config/kbuild.mak.in	2011-10-11 22:34:35.000000000 +0000
@@ -1,7 +1,7 @@
 # Here are the configuration bits needed in the "caller" to use this file
 #SUBDIR = vmadump4
 #TARGET = vmadump
-#SOURCES = vmadump_common.c vmadump_@CR_ARCH@.c optional.h
+#SOURCES = vmadump_common.c vmadump_@CR_KARCH@.c optional.h
 #[optional]EXTRA_CFLAGS = -I$(top_builddir)/include -I$(top_builddir) -I$(srcdir)
 #[optional]IMPORTS_FROM = /some/other/kbuild/module/dir /and/another
 #
@@ -20,13 +20,13 @@
 srcdir := $(top_srcdir)/$(SUBDIR)
 builddir := $(top_builddir)/$(SUBDIR)/kbuild
 mkinstalldirs := $(SHELL) $(top_srcdir)/config/install-sh -d
-CLEAN_FILES := *.o *.ko *.mod.c .*.cmd .tmp_versions *.symvers modules.order
+CLEAN_FILES := *.o *.ko *.mod.c .*.cmd .tmp_versions *.symvers modules.order Module.markers
 TARGET_SUFFIX := .ko
 
 # Remove headers from the list of sources, and sort to remove possible duplicates
 DOT_C := $(sort $(filter %.c,$(SOURCES)))
 
-ifeq ($(TOPDIR),)
+ifeq ($(srctree),)
 # not within KBUILD - implement automake's standard goals
 
 all: $(LINUX_OBJ)/.config prepare
diff -Nru blcr-0.8.2/config/ltmain.sh blcr-0.8.4/config/ltmain.sh
--- blcr-0.8.2/config/ltmain.sh	2009-06-17 03:56:35.000000000 +0000
+++ blcr-0.8.4/config/ltmain.sh	2009-12-08 17:40:22.000000000 +0000
@@ -1,7 +1,7 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -17,13 +17,47 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.5.22
+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
@@ -36,7 +70,7 @@
   :
 else
   # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
 fi
 
 if test "X$1" = X--fallback-echo; then
@@ -45,19 +79,9 @@
   cat <<EOF
 $*
 EOF
-  exit 0
+  exit $EXIT_SUCCESS
 fi
 
-# The name of this program.
-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-modename="$progname"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.2
-TIMESTAMP=" (1.1220.2.60 2004/01/25 12:25:08)"
-
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
@@ -70,14 +94,15 @@
 Xsed="${SED}"' -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
 # test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
-  SP2NL="tr '\100' '\n'"
-  NL2SP="tr '\r\n' '\100\100'"
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  SP2NL='tr \040 \012'
+  NL2SP='tr \015\012 \040\040'
   ;;
- *) # Assume ASCII based system
-  SP2NL="tr '\040' '\012'"
-  NL2SP="tr '\015\012' '\040\040'"
+ *) # EBCDIC based system
+  SP2NL='tr \100 \n'
+  NL2SP='tr \r\n \100\100'
   ;;
 esac
 
@@ -86,21 +111,24 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+         save_$lt_var=\$$lt_var
+         $lt_var=C
+         export $lt_var
+       fi"
+done
 
 # Make sure IFS has a sensible default
-: ${IFS=" 	
-"}
+lt_nl='
+'
+IFS=" 	$lt_nl"
 
 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
   $echo "$modename: not configured to build any kind of library" 1>&2
   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
 # Global variables.
@@ -112,17 +140,62 @@
 show="$echo"
 show_help=
 execute_dlfiles=
+duplicate_deps=no
+preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
 # This seems to be the best place for them
 
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+	# Failing that, at least try and use $RANDOM to avoid a race
+	my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+	save_mktempdir_umask=`umask`
+	umask 0077
+	$mkdir "$my_tmpdir"
+	umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || {
+        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+	exit $EXIT_FAILURE
+      }
+    fi
+
+    $echo "X$my_tmpdir" | $Xsed
+}
+
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
-win32_libid () {
+func_win32_libid ()
+{
   win32_libid_type="unknown"
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
@@ -131,17 +204,16 @@
     ;;
   *ar\ archive*) # could be an import, or static
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
+	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
     fi
     ;;
-  *DLL*) 
+  *DLL*)
     win32_libid_type="x86 DLL"
     ;;
   *executable*) # but shell scripts are "executable" too...
@@ -155,9 +227,191 @@
   $echo $win32_libid_type
 }
 
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	case $arg in
+	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	CC_quoted="$CC_quoted $arg"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	    # Double-quote args containing other shell metacharacters.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    CC_quoted="$CC_quoted $arg"
+	  done
+	    case "$@ " in
+	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit $EXIT_FAILURE
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+
+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+      exit $EXIT_FAILURE
+    fi
+}
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+    my_status=""
+
+    $show "${rm}r $my_gentop"
+    $run ${rm}r "$my_gentop"
+    $show "$mkdir $my_gentop"
+    $run $mkdir "$my_gentop"
+    my_status=$?
+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
+      exit $my_status
+    fi
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+       *" $my_xlib_u "*)
+         extracted_serial=`expr $extracted_serial + 1`
+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+       *) break ;;
+       esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      $show "${rm}r $my_xdir"
+      $run ${rm}r "$my_xdir"
+      $show "$mkdir $my_xdir"
+      $run $mkdir "$my_xdir"
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
+	exit $exit_status
+      fi
+      case $host in
+      *-darwin*)
+	$show "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	if test -z "$run"; then
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
+	  if test -n "$darwin_arches"; then 
+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      lipo -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    ${rm}r unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd "$darwin_orig_dir"
+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	fi # $run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+        ;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+    func_extract_archives_result="$my_oldobjs"
+}
 # End of Shell function definitions
 #####################################
 
+# Darwin sucks
+eval std_shrext=\"$shrext_cmds\"
+
+disable_libs=no
+
 # Parse our command line options once, thoroughly.
 while test "$#" -gt 0
 do
@@ -183,7 +437,7 @@
       case $tagname in
       *[!-_A-Za-z0-9,/]*)
 	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit 1
+	exit $EXIT_FAILURE
 	;;
       esac
 
@@ -193,10 +447,10 @@
 	# not specially marked.
 	;;
       *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
 	  taglist="$taglist $tagname"
 	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
 	else
 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
 	fi
@@ -222,19 +476,19 @@
   --version)
     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
     $echo
-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
     $echo "This is free software; see the source for copying conditions.  There is NO"
     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit 0
+    exit $?
     ;;
 
   --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
     # Now print the configurations for the tags.
     for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
     done
-    exit 0
+    exit $?
     ;;
 
   --debug)
@@ -259,7 +513,7 @@
     else
       $echo "disable static libraries"
     fi
-    exit 0
+    exit $?
     ;;
 
   --finish) mode="finish" ;;
@@ -274,7 +528,11 @@
     preserve_args="$preserve_args $arg"
     ;;
 
-  --tag) prevopt="--tag" prev=tag ;;
+  --tag)
+    prevopt="--tag"
+    prev=tag
+    preserve_args="$preserve_args --tag"
+    ;;
   --tag=*)
     set tag "$optarg" ${1+"$@"}
     shift
@@ -290,7 +548,7 @@
   -*)
     $echo "$modename: unrecognized option \`$arg'" 1>&2
     $echo "$help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
 
   *)
@@ -303,9 +561,21 @@
 if test -n "$prevopt"; then
   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
+case $disable_libs in
+no) 
+  ;;
+shared)
+  build_libtool_libs=no
+  build_old_libs=yes
+  ;;
+static)
+  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+  ;;
+esac
+
 # If this variable is set in any of the actions, the command in it
 # will be execed at the end.  This prevents here-documents from being
 # left over by shells.
@@ -316,7 +586,7 @@
   # Infer the operation mode.
   if test -z "$mode"; then
     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
     case $nonopt in
     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
       mode=link
@@ -359,7 +629,7 @@
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
     $echo "$help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 
   # Change the help message to a mode-specific one.
@@ -382,7 +652,7 @@
 
     for arg
     do
-      case "$arg_mode" in
+      case $arg_mode in
       arg  )
 	# do not "continue".  Instead, add this to base_compile
 	lastarg="$arg"
@@ -401,7 +671,7 @@
 	-o)
 	  if test -n "$libobj" ; then
 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  arg_mode=target
 	  continue
@@ -426,7 +696,7 @@
 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
 	  lastarg=
 	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
+ 	  for arg in $args; do
 	    IFS="$save_ifs"
 
 	    # Double-quote args containing other shell metacharacters.
@@ -464,7 +734,10 @@
       case $lastarg in
       # Double-quote args containing other shell metacharacters.
       # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
+      # in scan sets (worked around with variable expansion),
+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
+      # at all, so we specify them separately.
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	lastarg="\"$lastarg\""
 	;;
@@ -476,11 +749,11 @@
     case $arg_mode in
     arg)
       $echo "$modename: you must specify an argument for -Xcompile"
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     target)
       $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     *)
       # Get the name of the library object.
@@ -505,6 +778,7 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -513,50 +787,11 @@
     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
     *)
       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     esac
 
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case "$base_compile " in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
+    func_infer_tag $base_compile
 
     for arg in $later; do
       case $arg in
@@ -577,6 +812,14 @@
       esac
     done
 
+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
+    case $qlibobj in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qlibobj="\"$qlibobj\"" ;;
+    esac
+    test "X$libobj" != "X$qlibobj" \
+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
     if test "X$xdir" = "X$obj"; then
@@ -589,7 +832,7 @@
     if test -z "$base_compile"; then
       $echo "$modename: you must specify a compilation command" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     # Delete any leftover library objects.
@@ -600,7 +843,7 @@
     fi
 
     $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
 
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
@@ -619,7 +862,7 @@
       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
       removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit 1" 1 2 15
+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
     else
       output_obj=
       need_locks=no
@@ -629,7 +872,7 @@
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
-      until $run ln "$0" "$lockfile" 2>/dev/null; do
+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
 	$show "Waiting for $lockfile to be removed"
 	sleep 2
       done
@@ -647,14 +890,19 @@
 compiler."
 
 	$run $rm $removelist
-	exit 1
+	exit $EXIT_FAILURE
       fi
-      $echo $srcfile > "$lockfile"
+      $echo "$srcfile" > "$lockfile"
     fi
 
     if test -n "$fix_srcfile_path"; then
       eval srcfile=\"$fix_srcfile_path\"
     fi
+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
+    case $qsrcfile in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+      qsrcfile="\"$qsrcfile\"" ;;
+    esac
 
     $run $rm "$libobj" "${libobj}T"
 
@@ -676,18 +924,18 @@
       fbsd_hideous_sh_bug=$base_compile
 
       if test "$pic_mode" != no; then
-	command="$base_compile $srcfile $pic_flag"
+	command="$base_compile $qsrcfile $pic_flag"
       else
 	# Don't build PIC code
-	command="$base_compile $srcfile"
+	command="$base_compile $qsrcfile"
       fi
 
       if test ! -d "${xdir}$objdir"; then
 	$show "$mkdir ${xdir}$objdir"
 	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
+	exit_status=$?
+	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
+	  exit $exit_status
 	fi
       fi
 
@@ -702,7 +950,7 @@
       if $run eval "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
-	exit 1
+	exit $EXIT_FAILURE
       fi
 
       if test "$need_locks" = warn &&
@@ -722,7 +970,7 @@
 compiler."
 
 	$run $rm $removelist
-	exit 1
+	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed, then go on to compile the next one
@@ -759,9 +1007,9 @@
     if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then
 	# Don't build PIC code
-	command="$base_compile $srcfile"
+	command="$base_compile $qsrcfile"
       else
-	command="$base_compile $srcfile $pic_flag"
+	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
 	command="$command -o $obj"
@@ -774,7 +1022,7 @@
       if $run eval "$command"; then :
       else
 	$run $rm $removelist
-	exit 1
+	exit $EXIT_FAILURE
       fi
 
       if test "$need_locks" = warn &&
@@ -794,7 +1042,7 @@
 compiler."
 
 	$run $rm $removelist
-	exit 1
+	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed
@@ -832,7 +1080,7 @@
       $run $rm "$lockfile"
     fi
 
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
   # libtool link mode
@@ -890,6 +1138,7 @@
     no_install=no
     objs=
     non_pic_objects=
+    notinst_path= # paths that contain not-installed libtool libraries
     precious_files_regex=
     prefer_static_libs=no
     preload=no
@@ -904,67 +1153,38 @@
     vinfo=
     vinfo_number=no
 
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base link
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case $base_compile in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in $compile_command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#       else
-#         $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
+    func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+    case $arg in
+    -all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
 	  if test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
-	else
+	  prefer_static_libs=yes
+	  ;;
+    -static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
-	fi
+	  prefer_static_libs=built
+	  ;;
+    -static-libtool-libs)
+      if test -z "$pic_flag" && test -n "$link_static_flag"; then
+        dlopen_self=$dlopen_self_static
+      fi
+      prefer_static_libs=yes
+      ;;
+    esac
 	build_libtool_libs=no
 	build_old_libs=yes
-	prefer_static_libs=yes
 	break
 	;;
       esac
@@ -1039,7 +1259,7 @@
 	  export_symbols="$arg"
 	  if test ! -f "$arg"; then
 	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  prev=
 	  continue
@@ -1091,7 +1311,7 @@
 		   test "$pic_object" = none && \
 		   test "$non_pic_object" = none; then
 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit 1
+		  exit $EXIT_FAILURE
 		fi
 
 		# Extract subdirectory from the argument.
@@ -1139,12 +1359,17 @@
 		  if test -z "$pic_object" || test "$pic_object" = none ; then
 		    arg="$non_pic_object"
 		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
 		fi
 	      else
 		# Only an error if not doing a dry-run.
 		if test -z "$run"; then
 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit 1
+		  exit $EXIT_FAILURE
 		else
 		  # Dry-run case.
 
@@ -1165,7 +1390,7 @@
 	    done
 	  else
 	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  arg=$save_arg
 	  prev=
@@ -1177,7 +1402,7 @@
 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
 	  *)
 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	    ;;
 	  esac
 	  if test "$prev" = rpath; then
@@ -1217,6 +1442,18 @@
 	  finalize_command="$finalize_command $qarg"
 	  continue
 	  ;;
+	shrext)
+  	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	darwin_framework|darwin_framework_skip)
+	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  prev=
+	  continue
+	  ;;
 	*)
 	  eval "$prev=\"\$arg\""
 	  prev=
@@ -1265,7 +1502,7 @@
       -export-symbols | -export-symbols-regex)
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 	if test "X$arg" = "X-export-symbols"; then
 	  prev=expsyms
@@ -1275,6 +1512,18 @@
 	continue
 	;;
 
+      -framework|-arch|-isysroot)
+	case " $CC " in
+	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
+		prev=darwin_framework_skip ;;
+	  *) compiler_flags="$compiler_flags $arg"
+	     prev=darwin_framework ;;
+	esac
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+	continue
+	;;
+
       -inst-prefix-dir)
 	prev=inst_prefix
 	continue
@@ -1301,7 +1550,8 @@
 	  absdir=`cd "$dir" && pwd`
 	  if test -z "$absdir"; then
 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit 1
+	    absdir="$dir"
+	    notinst_path="$notinst_path $dir"
 	  fi
 	  dir="$absdir"
 	  ;;
@@ -1315,10 +1565,15 @@
 	esac
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  *) dllsearchpath="$dllsearchpath:$dir";;
 	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
 	  ;;
 	esac
 	continue
@@ -1327,15 +1582,15 @@
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
-	  *-*-mingw* | *-*-os2*)
+	  *-*-os2*)
 	    # These systems don't actually have a C library (as such)
 	    test "X$arg" = "X-lc" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 	    # Do not include libc due to us having libc/libc_r.
 	    test "X$arg" = "X-lc" && continue
 	    ;;
@@ -1343,10 +1598,19 @@
 	    # Rhapsody C and math libraries are in the System framework
 	    deplibs="$deplibs -framework System"
 	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
 	  esac
 	elif test "X$arg" = "X-lc_r"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
@@ -1356,8 +1620,20 @@
 	continue
 	;;
 
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      -model)
+	compile_command="$compile_command $arg"
+	compiler_flags="$compiler_flags $arg"
+	finalize_command="$finalize_command $arg"
+	prev=xcompiler
+	continue
+	;;
+
      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	deplibs="$deplibs $arg"
+	compiler_flags="$compiler_flags $arg"
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
 	continue
 	;;
 
@@ -1366,13 +1642,19 @@
 	continue
 	;;
 
-      # gcc -m* arguments should be passed to the linker via $compiler_flags
-      # in order to pass architecture information to the linker
-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
-      # but this is not reliable with gcc because gcc may use -mfoo to
-      # select a different linker, different libraries, etc, while
-      # -Wl,-mfoo simply passes -mfoo to the linker.
-      -m*)
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m* pass through architecture-specific compiler args for GCC
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -pg pass through profiling flag for GCC
+      # @file GCC response files
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+      -t[45]*|-txscale*|@*)
+
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
@@ -1383,9 +1665,7 @@
 	esac
         compile_command="$compile_command $arg"
         finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
+        compiler_flags="$compiler_flags $arg"
         continue
         ;;
 
@@ -1452,7 +1732,7 @@
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
 	*)
 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 	case "$xrpath " in
@@ -1462,7 +1742,7 @@
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -1575,7 +1855,7 @@
 	     test "$pic_object" = none && \
 	     test "$non_pic_object" = none; then
 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 
 	  # Extract subdirectory from the argument.
@@ -1623,12 +1903,17 @@
 	    if test -z "$pic_object" || test "$pic_object" = none ; then
 	      arg="$non_pic_object"
 	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
 	  fi
 	else
 	  # Only an error if not doing a dry-run.
 	  if test -z "$run"; then
 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  else
 	    # Dry-run case.
 
@@ -1695,7 +1980,7 @@
     if test -n "$prev"; then
       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
@@ -1728,9 +2013,9 @@
     if test ! -d "$output_objdir"; then
       $show "$mkdir $output_objdir"
       $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
+	exit $exit_status
       fi
     fi
 
@@ -1739,7 +2024,7 @@
     "")
       $echo "$modename: you must specify an output file" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     *.$libext) linkmode=oldlib ;;
     *.lo | *.$objext) linkmode=obj ;;
@@ -1749,7 +2034,7 @@
 
     case $host in
     *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplcations in $postdeps and $predeps
+      # don't eliminate duplications in $postdeps and $predeps
       duplicate_compiler_generated_deps=yes
       ;;
     *)
@@ -1793,7 +2078,6 @@
     newlib_search_path=
     need_relink=no # whether we're linking any uninstalled libtool libraries
     notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
     case $linkmode in
     lib)
 	passes="conv link"
@@ -1802,7 +2086,7 @@
 	  *.la) ;;
 	  *)
 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	    ;;
 	  esac
 	done
@@ -1845,7 +2129,7 @@
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
-	    deplibs="$deplib $deplibs"
+	    compiler_flags="$compiler_flags $deplib"
 	  fi
 	  continue
 	  ;;
@@ -1854,13 +2138,9 @@
 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
 	    continue
 	  fi
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $shrext .so .a; do
+	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
 	      if test -f "$lib"; then
@@ -1936,11 +2216,11 @@
 	    fi
 	    if test "$pass" = scan; then
 	      deplibs="$deplib $deplibs"
-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    ;;
 	  *)
 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
@@ -1968,7 +2248,22 @@
 	  fi
 	  case $linkmode in
 	  lib)
-	    if test "$deplibs_check_method" != pass_all; then
+	    valid_a_lib=no
+	    case $deplibs_check_method in
+	      match_pattern*)
+		set dummy $deplibs_check_method
+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+		if eval $echo \"$deplib\" 2>/dev/null \
+		    | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		  valid_a_lib=yes
+		fi
+		;;
+	      pass_all)
+		valid_a_lib=yes
+		;;
+            esac
+	    if test "$valid_a_lib" != yes; then
 	      $echo
 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
 	      $echo "*** I have the capability to make that library automatically link in when"
@@ -2018,15 +2313,15 @@
 	esac # case $deplib
 	if test "$found" = yes || test -f "$lib"; then :
 	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit 1
+	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
+	  exit $EXIT_FAILURE
 	fi
 
 	# Check to see that this really is a libtool archive.
 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
 	else
 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
@@ -2042,6 +2337,8 @@
 	# it will not redefine variables installed, or shouldnotlink
 	installed=yes
 	shouldnotlink=no
+	avoidtemprpath=
+
 
 	# Read the .la file
 	case $lib in
@@ -2062,7 +2359,7 @@
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit 1
+	      exit $EXIT_FAILURE
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
@@ -2079,12 +2376,12 @@
 	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  continue
 	fi # $pass = conv
 
-    
+
 	# Get the name of the library we link against.
 	linklib=
 	for l in $old_library $library_names; do
@@ -2092,16 +2389,18 @@
 	done
 	if test -z "$linklib"; then
 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	# This library was specified with -dlopen.
 	if test "$pass" = dlopen; then
 	  if test -z "$libdir"; then
 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
 	    # If there is no dlname, no dlopen support or we're linking
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
@@ -2138,11 +2437,19 @@
 	    dir="$libdir"
 	    absdir="$libdir"
 	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  fi
 	fi # $installed = yes
 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 
@@ -2150,7 +2457,7 @@
 	if test "$pass" = dlpreopen; then
 	  if test -z "$libdir"; then
 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
 	  # are required to link).
@@ -2177,7 +2484,7 @@
 	  continue
 	fi
 
-    
+
 	if test "$linkmode" = prog && test "$pass" != link; then
 	  newlib_search_path="$newlib_search_path $ladir"
 	  deplibs="$lib $deplibs"
@@ -2213,14 +2520,16 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+         { { test "$prefer_static_libs" = no ||
+             test "$prefer_static_libs,$installed" = "built,yes"; } ||
+           test -z "$old_library"; }; then
 	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var"; then
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
 	      case "$temp_rpath " in
 	      *" $dir "*) ;;
 	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $dir" ;;
+	      *) temp_rpath="$temp_rpath $absdir" ;;
 	      esac
 	    fi
 
@@ -2257,24 +2566,29 @@
 	fi
 
 	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes ; then
+	  use_static_libs=no
+	fi
 	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
 	  if test "$installed" = no; then
 	    notinst_deplibs="$notinst_deplibs $lib"
 	    need_relink=yes
 	  fi
 	  # This is a shared library
-	
-      # Warn about portability, can't link against -module's on some systems (darwin)
-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
+
+	  # Warn about portability, can't link against -module's on
+	  # some systems (darwin)
+	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
 	    $echo
 	    if test "$linkmode" = prog; then
 	      $echo "*** Warning: Linking the executable $output against the loadable module"
 	    else
 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
 	    fi
-	    $echo "*** $linklib is not portable!"    
-      fi	  
+	    $echo "*** $linklib is not portable!"
+	  fi
 	  if test "$linkmode" = lib &&
 	     test "$hardcode_into_libs" = yes; then
 	    # Hardcode the library path.
@@ -2370,11 +2684,15 @@
 	      if test "$hardcode_direct" = no; then
 		add="$dir/$linklib"
 		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
 		  *-*-darwin* )
-		    # if the lib is a module then we can not link against it, someone
-		    # is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
+		    # if the lib is a module then we can not link against
+		    # it, someone is ignoring the new warnings I added
+		    if /usr/bin/file -L $add 2> /dev/null |
+                      $EGREP ": [^:]* bundle" >/dev/null ; then
 		      $echo "** Warning, lib $linklib is a module, not a shared library"
 		      if test -z "$old_library" ; then
 		        $echo
@@ -2382,7 +2700,7 @@
 		        $echo "** The link will probably fail, sorry"
 		      else
 		        add="$dir/$old_library"
-		      fi 
+		      fi
 		    fi
 		esac
 	      elif test "$hardcode_minus_L" = no; then
@@ -2405,7 +2723,7 @@
 		add_dir="-L$dir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
-		  case "$libdir" in
+		  case $libdir in
 		    [\\/]*)
 		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
 		      ;;
@@ -2424,7 +2742,7 @@
 
 	    if test "$lib_linked" != yes; then
 	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit 1
+	      exit $EXIT_FAILURE
 	    fi
 
 	    if test -n "$add_shlibpath"; then
@@ -2467,7 +2785,8 @@
 	      esac
 	      add="-l$name"
 	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
 	        add="$inst_prefix_dir$libdir/$linklib"
 	      else
 	        add="$libdir/$linklib"
@@ -2477,7 +2796,7 @@
 	      add_dir="-L$libdir"
 	      # Try looking first in the location we're being installed to.
 	      if test -n "$inst_prefix_dir"; then
-		case "$libdir" in
+		case $libdir in
 		  [\\/]*)
 		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
 		    ;;
@@ -2538,8 +2857,6 @@
 	      fi
 	    fi
 	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
 	    deplibs="$dir/$old_library $deplibs"
 	    link_static=yes
 	  fi
@@ -2547,7 +2864,8 @@
 
 	if test "$linkmode" = lib; then
 	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
 	       test "$link_static" = yes; }; then
 	    # Extract -R from dependency_libs
 	    temp_deplibs=
@@ -2604,7 +2922,7 @@
 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -z "$libdir"; then
 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit 1
+		    exit $EXIT_FAILURE
 		  fi
 		  if test "$absdir" != "$libdir"; then
 		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
@@ -2614,7 +2932,8 @@
 		depdepl=
 		case $host in
 		*-*-darwin*)
-		  # we do not want to link against static libs, but need to link against shared
+		  # we do not want to link against static libs,
+		  # but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
@@ -2622,7 +2941,7 @@
 		    done
 		    if test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
-		   fi
+		    fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
 		    *" $path "*) ;;
@@ -2632,36 +2951,35 @@
 		  path=""
 		  ;;
 		*)
-		path="-L$path"
-		;;
-		esac 
-		
+		  path="-L$path"
+		  ;;
+		esac
 		;;
-		  -l*)
+	      -l*)
 		case $host in
 		*-*-darwin*)
-		 # Again, we only want to link against shared libraries
-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		 for tmp in $newlib_search_path ; do
-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
-		       break
-		     fi  
-         done
-         path=""
+		  # Again, we only want to link against shared libraries
+		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+		  for tmp in $newlib_search_path ; do
+		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
+		      eval depdepl="$tmp/lib$tmp_libs.dylib"
+		      break
+		    fi
+		  done
+		  path=""
 		  ;;
 		*) continue ;;
-		esac  		  
+		esac
 		;;
 	      *) continue ;;
 	      esac
 	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$deplibs $depdepl" ;;
-	      esac	      
-	      case " $deplibs " in
 	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	      case " $deplibs " in
+	      *" $depdepl "*) ;;
+	      *) deplibs="$depdepl $deplibs" ;;
 	      esac
 	    done
 	  fi # link_all_deplibs != no
@@ -2748,7 +3066,8 @@
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
       tmp_libs=
       for i in $dependency_libs ; do
 	case " $predeps $postdeps $compiler_lib_search_path " in
@@ -2808,19 +3127,19 @@
       case $outputname in
       lib*)
 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext\"
+	eval shared_ext=\"$shrext_cmds\"
 	eval libname=\"$libname_spec\"
 	;;
       *)
 	if test "$module" = no; then
 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 	if test "$need_lib_prefix" != no; then
 	  # Add the "lib" prefix for modules if required
 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext\"
+	  eval shared_ext=\"$shrext_cmds\"
 	  eval libname=\"$libname_spec\"
 	else
 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
@@ -2831,7 +3150,7 @@
       if test -n "$objs"; then
 	if test "$deplibs_check_method" != pass_all; then
 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit 1
+	  exit $EXIT_FAILURE
 	else
 	  $echo
 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
@@ -2879,13 +3198,13 @@
 	if test -n "$8"; then
 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
 	# to make the code below a bit more comprehensible
-	
+
 	case $vinfo_number in
 	yes)
 	  number_major="$2"
@@ -2899,7 +3218,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -2925,36 +3244,36 @@
 
 	# Check that each of the things are valid numbers.
 	case $current in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 
 	case $revision in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 
 	case $age in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 
 	if test "$age" -gt "$current"; then
 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	# Calculate the version variables.
@@ -2971,7 +3290,7 @@
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3043,7 +3362,7 @@
 	*)
 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 
@@ -3097,9 +3416,11 @@
 	    *.$objext)
 	       ;;
 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	       then
-		 continue
+	       if test "X$precious_files_regex" != "X"; then
+	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+	         then
+		   continue
+		 fi
 	       fi
 	       removelist="$removelist $p"
 	       ;;
@@ -3121,11 +3442,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
+#      for path in $notinst_path; do
+#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+#      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3175,9 +3496,14 @@
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
 	    ;;
  	  *)
 	    # Add libc to deplibs on all other systems if necessary.
@@ -3221,13 +3547,12 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
+	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3262,13 +3587,11 @@
 	    # Error occurred in the first compile.  Let's try to salvage
 	    # the situation: Compile a separate program for each library.
 	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
+	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3300,7 +3623,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -3314,7 +3637,7 @@
 	  set dummy $deplibs_check_method
 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    name=`expr $a_deplib : '-l\(.*\)'`
 	    # If $name is empty we are operating on a -L argument.
             if test "$name" != "" && test  "$name" != "0"; then
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3383,7 +3706,7 @@
 	  set dummy $deplibs_check_method
 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    name=`expr $a_deplib : '-l\(.*\)'`
 	    # If $name is empty we are operating on a -L argument.
 	    if test -n "$name" && test "$name" != "0"; then
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3513,6 +3836,35 @@
 	deplibs=$newdeplibs
       fi
 
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+
       # All the library-specific variables (install_libdir is set above).
       library_names=
       old_library=
@@ -3580,7 +3932,7 @@
 	fi
 
 	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext\"
+	eval shared_ext=\"$shrext_cmds\"
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
 	realname="$2"
@@ -3596,6 +3948,7 @@
 	fi
 
 	lib="$output_objdir/$realname"
+	linknames=
 	for link
 	do
 	  linknames="$linknames $link"
@@ -3624,6 +3977,9 @@
 	        # The command line is too long to execute in one step.
 	        $show "using reloadable object file for export list..."
 	        skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
 	      fi
 	    done
 	    IFS="$save_ifs"
@@ -3644,12 +4000,12 @@
 	for test_deplib in $deplibs; do
 		case " $convenience " in
 		*" $test_deplib "*) ;;
-		*) 
+		*)
 			tmp_deplibs="$tmp_deplibs $test_deplib"
 			;;
 		esac
 	done
-	deplibs="$tmp_deplibs" 
+	deplibs="$tmp_deplibs"
 
 	if test -n "$convenience"; then
 	  if test -n "$whole_archive_flag_spec"; then
@@ -3657,67 +4013,13 @@
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 	  else
 	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
 	    generated="$generated $gentop"
 
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      # We will extract separately just the conflicting names and we will no
-	      # longer touch any unique names. It is faster to leave these extract
-	      # automatically by $AR in one run.
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-		:
-	      else
-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
-		do
-		  i=1
-		  while test "$i" -le "$count"
-		  do
-		   # Put our $i before any first dot (extension)
-		   # Never overwrite any file
-		   name_to="$name"
-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		   do
-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		   done
-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		   i=`expr $i + 1`
-		  done
-		done
-	      fi
-
-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	    done
+	    func_extract_archives $gentop $convenience
+	    libobjs="$libobjs $func_extract_archives_result"
 	  fi
 	fi
-
+	
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
 	  linker_flags="$linker_flags $flag"
@@ -3747,7 +4049,8 @@
 	  fi
 	fi
 
-	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+	if test "X$skipped_export" != "X:" &&
+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  :
 	else
@@ -3766,6 +4069,7 @@
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
@@ -3775,13 +4079,13 @@
 	  delfiles=
 	  last_robj=
 	  k=1
-	  output=$output_objdir/$save_output-${k}.$objext
+	  output=$output_objdir/$output_la-${k}.$objext
 	  # Loop over the list of objects to be linked.
 	  for obj in $save_libobjs
 	  do
 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
 	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*"` &&
+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 		 test "$len" -le "$max_cmd_len"; }; then
 	      objlist="$objlist $obj"
 	    else
@@ -3795,9 +4099,9 @@
 		# the last one created.
 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
 	      fi
-	      last_robj=$output_objdir/$save_output-${k}.$objext
+	      last_robj=$output_objdir/$output_la-${k}.$objext
 	      k=`expr $k + 1`
-	      output=$output_objdir/$save_output-${k}.$objext
+	      output=$output_objdir/$output_la-${k}.$objext
 	      objlist=$obj
 	      len=1
 	    fi
@@ -3817,13 +4121,13 @@
 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
           fi
 
-	  # Set up a command to remove the reloadale object files
+	  # Set up a command to remove the reloadable object files
 	  # after they are used.
 	  i=0
 	  while test "$i" -lt "$k"
 	  do
 	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
 	  done
 
 	  $echo "creating a temporary reloadable object file: $output"
@@ -3832,7 +4136,6 @@
 	  save_ifs="$IFS"; IFS='~'
 	  for cmd in $concat_cmds; do
 	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
 	    $show "$cmd"
 	    $run eval "$cmd" || exit $?
 	  done
@@ -3872,14 +4175,31 @@
 	  IFS="$save_ifs"
 	  eval cmd=\"$cmd\"
 	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
+	  $run eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$mode" = relink; then
+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	    fi
+
+	    exit $lt_exit
+	  }
 	done
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
 	if test "$mode" = relink; then
 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-	  exit 0
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      $show "${rm}r $gentop"
+	      $run ${rm}r "$gentop"
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
 	fi
 
 	# Create links to the real library.
@@ -3927,7 +4247,7 @@
       *.lo)
 	if test -n "$objs$old_deplibs"; then
 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 	libobj="$output"
 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
@@ -3948,72 +4268,20 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
-	  $show "${rm}r $gentop"
-	  $run ${rm}r "$gentop"
-	  $show "$mkdir $gentop"
-	  $run $mkdir "$gentop"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
-	    exit $status
-	  fi
 	  generated="$generated $gentop"
 
-	  for xlib in $convenience; do
-	    # Extract the objects.
-	    case $xlib in
-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	    *) xabs=`pwd`"/$xlib" ;;
-	    esac
-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	    xdir="$gentop/$xlib"
-
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "$mkdir $xdir"
-	    $run $mkdir "$xdir"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    # We will extract separately just the conflicting names and we will no
-	    # longer touch any unique names. It is faster to leave these extract
-	    # automatically by $AR in one run.
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	      :
-	    else
-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	      do
-		i=1
-		while test "$i" -le "$count"
-		do
-		 # Put our $i before any first dot (extension)
-		 # Never overwrite any file
-		 name_to="$name"
-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		 do
-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		 done
-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		 i=`expr $i + 1`
-		done
-	      done
-	    fi
-
-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	  done
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
@@ -4038,7 +4306,7 @@
 	  $run ${rm}r $gentop
 	fi
 
-	exit 0
+	exit $EXIT_SUCCESS
       fi
 
       if test "$build_libtool_libs" != yes; then
@@ -4051,7 +4319,7 @@
 	# accidentally link it into a program.
 	# $show "echo timestamp > $libobj"
 	# $run eval "echo timestamp > $libobj" || exit $?
-	exit 0
+	exit $EXIT_SUCCESS
       fi
 
       if test -n "$pic_flag" || test "$pic_mode" != default; then
@@ -4074,7 +4342,7 @@
 	$run ${rm}r $gentop
       fi
 
-      exit 0
+      exit $EXIT_SUCCESS
       ;;
 
     prog)
@@ -4114,6 +4382,35 @@
         ;;
       esac
 
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
       compile_command="$compile_command $compile_deplibs"
       finalize_command="$finalize_command $finalize_deplibs"
 
@@ -4158,10 +4455,15 @@
 	fi
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  *) dllsearchpath="$dllsearchpath:$libdir";;
 	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
 	  ;;
 	esac
       done
@@ -4275,13 +4577,25 @@
 
 	    # Prepare the list of exported symbols
 	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$output.exp"
+	      export_symbols="$output_objdir/$outputname.exp"
 	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+              case $host in
+              *cygwin* | *mingw* )
+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
 	    else
-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      $run eval 'mv "$nlist"T "$nlist"'
+              case $host in
+              *cygwin* | *mingw* )
+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
 	    fi
 	  fi
 
@@ -4332,7 +4646,26 @@
 #endif
 
 /* The mapping between symbol names and symbols. */
+"
+
+	    case $host in
+	    *cygwin* | *mingw* )
+	  $echo >> "$output_objdir/$dlsyms" "\
+/* DATA imports from DLLs on WIN32 can't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs */
+struct {
+"
+	      ;;
+	    * )
+	  $echo >> "$output_objdir/$dlsyms" "\
 const struct {
+"
+	      ;;
+	    esac
+
+
+	  $echo >> "$output_objdir/$dlsyms" "\
   const char *name;
   lt_ptr address;
 }
@@ -4379,20 +4712,33 @@
 	  esac
 
 	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
 
 	  # Clean up the generated files.
 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
 	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
 
 	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+          case $host in
+          *cygwin* | *mingw* )
+            if test -f "$output_objdir/${outputname}.def" ; then
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            else
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+             fi
+            ;;
+          * )
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            ;;
+          esac
 	  ;;
 	*)
 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
       else
@@ -4401,19 +4747,19 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	$show "$link_command"
 	$run eval "$link_command"
-	status=$?
+	exit_status=$?
 
 	# Delete the generated files.
 	if test -n "$dlsyms"; then
@@ -4421,7 +4767,7 @@
 	  $run $rm "$output_objdir/${outputname}S.${objext}"
 	fi
 
-	exit $status
+	exit $exit_status
       fi
 
       if test -n "$shlibpath_var"; then
@@ -4480,7 +4826,7 @@
 	# Link the executable and exit
 	$show "$link_command"
 	$run eval "$link_command" || exit $?
-	exit 0
+	exit $EXIT_SUCCESS
       fi
 
       if test "$hardcode_action" = relink; then
@@ -4494,7 +4840,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4531,14 +4877,14 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-	case $0 in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+	case $progpath in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
 	esac
 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
       else
@@ -4561,10 +4907,12 @@
 	esac
 	case $host in
 	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
+            output_name=`basename $output`
+            output_path=`dirname $output`
+            cwrappersource="$output_path/$objdir/lt-$output_name.c"
+            cwrapper="$output_path/$output_name.exe"
+            $rm $cwrappersource $cwrapper
+            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
 	    cat > $cwrappersource <<EOF
 
@@ -4573,7 +4921,7 @@
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
-   
+
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
 
@@ -4589,6 +4937,9 @@
 #include <malloc.h>
 #include <stdarg.h>
 #include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
 
 #if defined(PATH_MAX)
 # define LT_PATHMAX PATH_MAX
@@ -4599,15 +4950,19 @@
 #endif
 
 #ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
 #endif
 
 #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
   defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2 
-#define DIR_SEPARATOR_2 '\\'
-#endif
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
 #endif
 
 #ifndef DIR_SEPARATOR_2
@@ -4617,17 +4972,32 @@
         (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
 #endif /* DIR_SEPARATOR_2 */
 
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
   if (stale) { free ((void *) stale); stale = 0; } \
 } while (0)
 
+/* -DDEBUG is fairly common in CFLAGS.  */
+#undef DEBUG
+#if defined DEBUGWRAPPER
+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
+#else
+# define DEBUG(format, ...)
+#endif
+
 const char *program_name = NULL;
 
 void * xmalloc (size_t num);
 char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
+const char * base_name (const char *name);
+char * find_executable(const char *wrapper);
+int    check_executable(const char *path);
 char * strendzap(char *str, const char *pat);
 void lt_fatal (const char *message, ...);
 
@@ -4636,30 +5006,52 @@
 {
   char **newargz;
   int i;
-  
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  DEBUG("(main) argv[0]      : %s\n",argv[0]);
+  DEBUG("(main) program_name : %s\n",program_name);
   newargz = XMALLOC(char *, argc+2);
 EOF
 
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
+            cat >> $cwrappersource <<EOF
+  newargz[0] = (char *) xstrdup("$SHELL");
 EOF
 
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
+            cat >> $cwrappersource <<"EOF"
+  newargz[1] = find_executable(argv[0]);
+  if (newargz[1] == NULL)
+    lt_fatal("Couldn't find %s", argv[0]);
+  DEBUG("(main) found exe at : %s\n",newargz[1]);
   /* we know the script has the same name, without the .exe */
   /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe"); 
+  strendzap(newargz[1],".exe");
   for (i = 1; i < argc; i++)
     newargz[i+1] = xstrdup(argv[i]);
   newargz[argc+1] = NULL;
+
+  for (i=0; i<argc+1; i++)
+  {
+    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
+    ;
+  }
+
 EOF
 
-	    cat >> $cwrappersource <<EOF
+            case $host_os in
+              mingw*)
+                cat >> $cwrappersource <<EOF
+  execv("$SHELL",(char const **)newargz);
+EOF
+              ;;
+              *)
+                cat >> $cwrappersource <<EOF
   execv("$SHELL",newargz);
 EOF
+              ;;
+            esac
 
-	    cat >> $cwrappersource <<"EOF"
+            cat >> $cwrappersource <<"EOF"
+  return 127;
 }
 
 void *
@@ -4672,59 +5064,159 @@
   return p;
 }
 
-char * 
+char *
 xstrdup (const char *string)
 {
   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
 ;
 }
 
-char *
-basename (const char *name)
+const char *
+base_name (const char *name)
 {
   const char *base;
 
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
   /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':') 
+  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
     name += 2;
 #endif
 
   for (base = name; *name; name++)
     if (IS_DIR_SEPARATOR (*name))
       base = name + 1;
-  return (char *) base;
+  return base;
 }
 
-char * 
-fnqualify(const char *path)
+int
+check_executable(const char * path)
 {
-  size_t size;
-  char *p;
+  struct stat st;
+
+  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0) &&
+      (
+        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
+#if defined (S_IXOTH)
+       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
+#endif
+#if defined (S_IXGRP)
+       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
+#endif
+       ((st.st_mode & S_IXUSR) == S_IXUSR))
+      )
+    return 1;
+  else
+    return 0;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise */
+char *
+find_executable (const char* wrapper)
+{
+  int has_slash = 0;
+  const char* p;
+  const char* p_next;
+  /* static buffer for getcwd */
   char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char* concat_name;
+
+  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
 
-  assert(path != NULL);
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
 
-  /* Is it qualified already? */
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
+  {
+    concat_name = xstrdup (wrapper);
+    if (check_executable(concat_name))
+      return concat_name;
+    XFREE(concat_name);
+  }
+  else
+  {
+#endif
+    if (IS_DIR_SEPARATOR (wrapper[0]))
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable(concat_name))
+        return concat_name;
+      XFREE(concat_name);
+    }
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
+  }
 #endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
 
-  /* prepend the current directory */
-  /* doesn't handle '~' */
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+    {
+      has_slash = 1;
+      break;
+    }
+  if (!has_slash)
+  {
+    /* no slashes; search PATH */
+    const char* path = getenv ("PATH");
+    if (path != NULL)
+    {
+      for (p = path; *p; p = p_next)
+      {
+        const char* q;
+        size_t p_len;
+        for (q = p; *q; q++)
+          if (IS_PATH_SEPARATOR(*q))
+            break;
+        p_len = q - p;
+        p_next = (*q == '\0' ? q : q + 1);
+        if (p_len == 0)
+        {
+          /* empty path: current directory */
+          if (getcwd (tmp, LT_PATHMAX) == NULL)
+            lt_fatal ("getcwd failed");
+          tmp_len = strlen(tmp);
+          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, tmp, tmp_len);
+          concat_name[tmp_len] = '/';
+          strcpy (concat_name + tmp_len + 1, wrapper);
+        }
+        else
+        {
+          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, p, p_len);
+          concat_name[p_len] = '/';
+          strcpy (concat_name + p_len + 1, wrapper);
+        }
+        if (check_executable(concat_name))
+          return concat_name;
+        XFREE(concat_name);
+      }
+    }
+    /* not found in PATH; assume curdir */
+  }
+  /* Relative path | not found in path: prepend cwd */
   if (getcwd (tmp, LT_PATHMAX) == NULL)
     lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
+  tmp_len = strlen(tmp);
+  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable(concat_name))
+    return concat_name;
+  XFREE(concat_name);
+  return NULL;
 }
 
 char *
-strendzap(char *str, const char *pat) 
+strendzap(char *str, const char *pat)
 {
   size_t len, patlen;
 
@@ -4744,7 +5236,7 @@
 }
 
 static void
-lt_error_core (int exit_status, const char * mode, 
+lt_error_core (int exit_status, const char * mode,
           const char * message, va_list ap)
 {
   fprintf (stderr, "%s: %s: ", program_name, mode);
@@ -4764,16 +5256,16 @@
   va_end (ap);
 }
 EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit 1" 1 2 15
+          # we should really use a build-platform specific compiler
+          # here, but OTOH, the wrappers (shell script and this C one)
+          # are only useful if you want to execute the "real" binary.
+          # Since the "real" binary is built for $host, then this
+          # wrapper might as well be built for $host, too.
+          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
+          ;;
+        esac
+        $rm $output
+        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
 
 	$echo > $output "\
 #! $SHELL
@@ -4792,9 +5284,21 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 relink_command=\"$relink_command\"
 
@@ -4873,7 +5377,7 @@
       else
 	$echo \"\$relink_command_output\" >&2
 	$rm \"\$progdir/\$file\"
-	exit 1
+	exit $EXIT_FAILURE
       fi
     fi
 
@@ -4923,32 +5427,32 @@
 	# Backslashes separate directories on plain windows
 	*-*-mingw | *-*-os2*)
 	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 "
 	  ;;
 
 	*)
 	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
 "
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
+      \$echo \"\$0: cannot exec \$program \$*\"
+      exit $EXIT_FAILURE
     fi
   else
     # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
     \$echo \"This script is just a wrapper for \$program.\" 1>&2
     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 fi\
 "
 	chmod +x $output
       fi
-      exit 0
+      exit $EXIT_SUCCESS
       ;;
     esac
 
@@ -4971,71 +5475,73 @@
 
       if test -n "$addlibs"; then
 	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test "$status" -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
 	generated="$generated $gentop"
 
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  # We will extract separately just the conflicting names and we will no
-	  # longer touch any unique names. It is faster to leave these extract
-	  # automatically by $AR in one run.
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	    do
-	      i=1
-	      while test "$i" -le "$count"
-	      do
-	       # Put our $i before any first dot (extension)
-	       # Never overwrite any file
-	       name_to="$name"
-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-	       do
-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-	       done
-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-	       i=`expr $i + 1`
-	      done
-	    done
-	  fi
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-	done
+	func_extract_archives $gentop $addlibs
+	oldobjs="$oldobjs $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
        cmds=$old_archive_from_new_cmds
       else
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  $echo "copying selected object files to avoid basename conflicts..."
+
+	  if test -z "$gentop"; then
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
+
+	    $show "${rm}r $gentop"
+	    $run ${rm}r "$gentop"
+	    $show "$mkdir $gentop"
+	    $run $mkdir "$gentop"
+	    exit_status=$?
+	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
+	      exit $exit_status
+	    fi
+	  fi
+
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		counter=`expr $counter + 1`
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      $run ln "$obj" "$gentop/$newobj" ||
+	      $run cp "$obj" "$gentop/$newobj"
+	      oldobjs="$oldobjs $gentop/$newobj"
+	      ;;
+	    *) oldobjs="$oldobjs $obj" ;;
+	    esac
+	  done
+	fi
+
 	eval cmds=\"$old_archive_cmds\"
 
 	if len=`expr "X$cmds" : ".*"` &&
@@ -5049,31 +5555,18 @@
 	  objlist=
 	  concat_cmds=
 	  save_oldobjs=$oldobjs
-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-	  # encoded into archives.  This makes 'ar r' malfunction in
-	  # this piecewise linking case whenever conflicting object
-	  # names appear in distinct ar calls; check, warn and compensate.
-	    if (for obj in $save_oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-	    AR_FLAGS=cq
-	  fi
+
 	  # Is there a better way of finding the last object in the list?
 	  for obj in $save_oldobjs
 	  do
 	    last_oldobj=$obj
-	  done  
+	  done
 	  for obj in $save_oldobjs
 	  do
 	    oldobjs="$objlist $obj"
 	    objlist="$objlist $obj"
 	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*"` &&
+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 	       test "$len" -le "$max_cmd_len"; then
 	      :
 	    else
@@ -5081,7 +5574,7 @@
 	      oldobjs=$objlist
 	      if test "$obj" = "$last_oldobj" ; then
 	        RANLIB=$save_RANLIB
-	      fi  
+	      fi
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
 	      objlist=
@@ -5130,11 +5623,13 @@
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
-        relink_command=
-      fi  
+	relink_command=
+      fi
+
+
       # Only create the output if not a dry run.
       if test -z "$run"; then
 	for installed in no yes; do
@@ -5152,7 +5647,7 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		if test -z "$libdir"; then
 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit 1
+		  exit $EXIT_FAILURE
 		fi
 		newdependency_libs="$newdependency_libs $libdir/$name"
 		;;
@@ -5166,7 +5661,7 @@
 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 	      if test -z "$libdir"; then
 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
+		exit $EXIT_FAILURE
 	      fi
 	      newdlfiles="$newdlfiles $libdir/$name"
 	    done
@@ -5177,7 +5672,7 @@
 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 	      if test -z "$libdir"; then
 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
+		exit $EXIT_FAILURE
 	      fi
 	      newdlprefiles="$newdlprefiles $libdir/$name"
 	    done
@@ -5185,7 +5680,7 @@
 	  else
 	    newdlfiles=
 	    for lib in $dlfiles; do
-	      case $lib in 
+	      case $lib in
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
@@ -5194,7 +5689,7 @@
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
-	      case $lib in 
+	      case $lib in
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
@@ -5257,7 +5752,7 @@
       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
       ;;
     esac
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
   # libtool install mode
@@ -5268,11 +5763,11 @@
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+       $echo "X$nonopt" | grep shtool > /dev/null; then
       # Aesthetically quote it.
       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
       case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	arg="\"$arg\""
 	;;
       esac
@@ -5281,14 +5776,14 @@
       shift
     else
       install_prog=
-      arg="$nonopt"
+      arg=$nonopt
     fi
 
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
     case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
       arg="\"$arg\""
       ;;
     esac
@@ -5306,28 +5801,31 @@
     do
       if test -n "$dest"; then
 	files="$files $dest"
-	dest="$arg"
+	dest=$arg
 	continue
       fi
 
       case $arg in
       -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
+      -f) 
+      	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o) prev=$arg ;;
       -s)
 	stripme=" -s"
 	continue
 	;;
-      -*) ;;
-
+      -*)
+	;;
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
 	  prev=
 	else
-	  dest="$arg"
+	  dest=$arg
 	  continue
 	fi
 	;;
@@ -5336,7 +5834,7 @@
       # Aesthetically quote the argument.
       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
       case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	arg="\"$arg\""
 	;;
       esac
@@ -5346,13 +5844,13 @@
     if test -z "$install_prog"; then
       $echo "$modename: you must specify an install program" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     if test -n "$prev"; then
       $echo "$modename: the \`$prev' option requires an argument" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     if test -z "$files"; then
@@ -5362,7 +5860,7 @@
 	$echo "$modename: you must specify a destination" 1>&2
       fi
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     # Strip any trailing slash from the destination.
@@ -5383,7 +5881,7 @@
       if test "$#" -gt 2; then
 	$echo "$modename: \`$dest' is not a directory" 1>&2
 	$echo "$help" 1>&2
-	exit 1
+	exit $EXIT_FAILURE
       fi
     fi
     case $destdir in
@@ -5395,7 +5893,7 @@
 	*)
 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
       done
@@ -5424,7 +5922,7 @@
 	else
 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	library_names=
@@ -5466,14 +5964,14 @@
 	  # but it's something to keep an eye on.
 	  if test "$inst_prefix_dir" = "$destdir"; then
 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -5481,7 +5979,7 @@
 	  if $run eval "$relink_command"; then :
 	  else
 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	fi
 
@@ -5505,11 +6003,14 @@
 
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
 	    for linkname
 	    do
 	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
 	      fi
 	    done
 	  fi
@@ -5522,7 +6023,16 @@
 	    IFS="$save_ifs"
 	    eval cmd=\"$cmd\"
 	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
+	    $run eval "$cmd" || {
+	      lt_exit=$?
+
+	      # Restore the uninstalled library and exit
+	      if test "$mode" = relink; then
+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	      fi
+
+	      exit $lt_exit
+	    }
 	  done
 	  IFS="$save_ifs"
 	fi
@@ -5560,7 +6070,7 @@
 	*)
 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 
@@ -5578,7 +6088,7 @@
 	  $show "$install_prog $staticobj $staticdest"
 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
 	fi
-	exit 0
+	exit $EXIT_SUCCESS
 	;;
 
       *)
@@ -5616,23 +6126,21 @@
 	  notinst_deplibs=
 	  relink_command=
 
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
 	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
 	  esac
 
 	  # Check the variables that should have been set.
 	  if test -z "$notinst_deplibs"; then
 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 
 	  finalize=yes
@@ -5654,37 +6162,25 @@
 	  done
 
 	  relink_command=
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
 	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
 	  esac
 
 	  outputname=
 	  if test "$fast_install" = no && test -n "$relink_command"; then
 	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-              if tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`; then :
-	      else
-                tmpdir="$tmpdir/libtool-$$"
-		if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
-		else
-		  $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		  continue
-		fi
-	      fi
+	      tmpdir=`func_mktempdir`
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -5704,7 +6200,7 @@
 	fi
 
 	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
+	# one anyway 
 	case $install_prog,$host in
 	*/usr/bin/install*,*cygwin*)
 	  case $file:$destfile in
@@ -5760,9 +6256,9 @@
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
     else
-      exit 0
+      exit $EXIT_SUCCESS
     fi
     ;;
 
@@ -5802,9 +6298,9 @@
     fi
 
     # Exit here if they wanted silent mode.
-    test "$show" = : && exit 0
+    test "$show" = : && exit $EXIT_SUCCESS
 
-    $echo "----------------------------------------------------------------------"
+    $echo "X----------------------------------------------------------------------" | $Xsed
     $echo "Libraries have been installed in:"
     for libdir in $libdirs; do
       $echo "   $libdir"
@@ -5837,8 +6333,8 @@
     $echo
     $echo "See any operating system documentation about shared libraries for"
     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit 0
+    $echo "X----------------------------------------------------------------------" | $Xsed
+    exit $EXIT_SUCCESS
     ;;
 
   # libtool execute mode
@@ -5850,7 +6346,7 @@
     if test -z "$cmd"; then
       $echo "$modename: you must specify a COMMAND" 1>&2
       $echo "$help"
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     # Handle -dlopen flags immediately.
@@ -5858,7 +6354,7 @@
       if test ! -f "$file"; then
 	$echo "$modename: \`$file' is not a file" 1>&2
 	$echo "$help" 1>&2
-	exit 1
+	exit $EXIT_FAILURE
       fi
 
       dir=
@@ -5869,7 +6365,7 @@
 	else
 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	# Read the libtool library.
@@ -5896,7 +6392,7 @@
 	  dir="$dir/$objdir"
 	else
 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 	;;
 
@@ -5960,23 +6456,26 @@
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+       eval "if test \"\${save_$lt_var+set}\" = set; then
+               $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
+             fi"
+      done
+
 
       # Now prepare to actually exec the command.
-      exec_cmd="\"\$cmd\"$args"
+      exec_cmd="\$cmd$args"
     else
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
 	$echo "export $shlibpath_var"
       fi
-      eval \$echo \"\$cmd\"$args
-      exit 0
+      $echo "$cmd$args"
+      exit $EXIT_SUCCESS
     fi
     ;;
 
@@ -6004,7 +6503,7 @@
     if test -z "$rm"; then
       $echo "$modename: you must specify an RM program" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     rmdirs=
@@ -6054,9 +6553,17 @@
 	    rmfiles="$rmfiles $objdir/$n"
 	  done
 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
 
-	  if test "$mode" = uninstall; then
+	  case "$mode" in
+	  clean)
+	    case "  $library_names " in
+	    # "  " in the beginning catches empty $dlname
+	    *" $dlname "*) ;;
+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    esac
+	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    ;;
+	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
 	      cmds=$postuninstall_cmds
@@ -6089,7 +6596,8 @@
 	      IFS="$save_ifs"
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
-	  fi
+	    ;;
+	  esac
 	fi
 	;;
 
@@ -6118,7 +6626,7 @@
 	if test "$mode" = clean ; then
 	  noexename=$name
 	  case $file in
-	  *.exe) 
+	  *.exe)
 	    file=`$echo $file|${SED} 's,.exe$,,'`
 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
 	    # $file with .exe has already been added to rmfiles,
@@ -6163,20 +6671,20 @@
   "")
     $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
   esac
 
   if test -z "$exec_cmd"; then
     $echo "$modename: invalid operation mode \`$mode'" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 fi # test -z "$show_help"
 
 if test -n "$exec_cmd"; then
   eval exec $exec_cmd
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
 # We need to display help for each of the modes.
@@ -6212,7 +6720,7 @@
 a more detailed description of MODE.
 
 Report bugs to <bug-libtool@gnu.org>."
-  exit 0
+  exit $EXIT_SUCCESS
   ;;
 
 clean)
@@ -6313,9 +6821,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6329,9 +6837,11 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -6367,14 +6877,14 @@
 *)
   $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
   ;;
 esac
 
 $echo
 $echo "Try \`$modename --help' for more information about other modes."
 
-exit 0
+exit $?
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
@@ -6388,12 +6898,11 @@
 # configuration.  But we'll never go from static-only to shared-only.
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
+disable_libs=shared
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+disable_libs=static
 # ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
diff -Nru blcr-0.8.2/config/missing blcr-0.8.4/config/missing
--- blcr-0.8.2/config/missing	2009-06-17 03:56:41.000000000 +0000
+++ blcr-0.8.4/config/missing	2011-10-11 22:58:52.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2003-09-02.23
+scriptversion=2005-06-08.21
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -19,8 +19,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -60,11 +60,6 @@
     msg="probably too old"
   fi
   ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
 
   -h|--h|--he|--hel|--help)
     echo "\
@@ -92,10 +87,12 @@
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug-automake@gnu.org>."
+    exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
+    exit $?
     ;;
 
   -*)
@@ -104,12 +101,42 @@
     exit 1
     ;;
 
-  aclocal*)
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
     fi
+    ;;
+esac
 
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
@@ -119,11 +146,6 @@
     ;;
 
   autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -133,11 +155,6 @@
     ;;
 
   autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -157,11 +174,6 @@
     ;;
 
   automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
@@ -173,11 +185,6 @@
     ;;
 
   autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -254,11 +261,6 @@
     ;;
 
   help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
@@ -279,11 +281,6 @@
     ;;
 
   makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -291,20 +288,23 @@
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
     touch $file
     ;;
 
   tar)
     shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
 
     # We have already tried tar in the generic part.
     # Look for gnutar/gtar before invocation to avoid ugly error
diff -Nru blcr-0.8.2/configure blcr-0.8.4/configure
--- blcr-0.8.2/configure	2009-06-17 03:56:35.000000000 +0000
+++ blcr-0.8.4/configure	2011-10-11 22:58:47.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
-# From acinclude.m4 Revision: 1.177.14.2 .
-# From configure.ac Revision: 1.410.2.9 .
+# From acinclude.m4 Revision: 1.177.14.12 .
+# From configure.ac Revision: 1.410.2.39 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for blcr 0.8.2.
+# Generated by GNU Autoconf 2.59 for blcr 0.8.4.
 #
 # Report bugs to <http://ftg.lbl.gov/checkpoint>.
 #
@@ -306,15 +306,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -449,8 +449,8 @@
 # Identity of this package.
 PACKAGE_NAME='blcr'
 PACKAGE_TARNAME='blcr'
-PACKAGE_VERSION='0.8.2'
-PACKAGE_STRING='blcr 0.8.2'
+PACKAGE_VERSION='0.8.4'
+PACKAGE_STRING='blcr 0.8.4'
 PACKAGE_BUGREPORT='http://ftg.lbl.gov/checkpoint'
 
 ac_unique_file="cr_module/cr_module.c"
@@ -491,7 +491,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CR_RELEASE_MAJOR CR_RELEASE_MINOR CR_RELEASE_PATCH CR_RELEASE_VERSION LIBCR_MAJOR LIBCR_MINOR LIBCR_PATCH LIBCR_VERSION CR_MODULE_MAJOR CR_MODULE_MINOR CR_MODULE_PATCH CR_MODULE_VERSION LIBTOOL_INTERFACE LIBTOOL_AGE LIBTOOL_REVISION CONFIGURE_ARGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot PWD_PROG TOP_BUILDDIR TOP_SRCDIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os CR_ARCH CR_CPU CRI_DEBUG_TRUE CRI_DEBUG_FALSE CR_NDEBUG LIBCR_TRACING_TRUE LIBCR_TRACING_FALSE CR_KERNEL_TRACING_TRUE CR_KERNEL_TRACING_FALSE CR_BUILD_ETC_TRUE CR_BUILD_ETC_FALSE CR_INSTALLED_LIBCR_TRUE CR_INSTALLED_LIBCR_FALSE CR_INSTALLED_UTIL_TRUE CR_INSTALLED_UTIL_FALSE CR_BUILD_TESTSUITE_TRUE CR_BUILD_TESTSUITE_FALSE PERL MAKE RPMBUILD KCC RANLIB ac_ct_RANLIB LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP ECHO AR ac_ct_AR CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CR_ENABLE_STATIC_TRUE CR_ENABLE_STATIC_FALSE CR_ENABLE_SHARED_TRUE CR_ENABLE_SHARED_FALSE HAVE_RPMBUILD_TRUE HAVE_RPMBUILD_FALSE CR_LIBCR_CFLAGS CR_CLIENT_LDADD CR_FTB_INCLUDES CR_FTB_LDFLAGS CR_FTB_LDADD CR_SIGNUM CR_LIBARCH CR_BUILD_LIBCR32_TRUE CR_BUILD_LIBCR32_FALSE NM LINUX_SRC LINUX_OBJ LINUX_VER CR_KERNEL CR_KERNEL_BASE CR_MODULE_DIR KBUILD_MAKE_ARGS LINUX_SYMTAB_FILE LINUX_SYMTAB_CMD LINUX_SYMTAB_CONF CR_HAVE_SYSTEM_MAP_TRUE CR_HAVE_SYSTEM_MAP_FALSE CR_BUILD_MAN_TRUE CR_BUILD_MAN_FALSE CR_HAVE_FTB_TRUE CR_HAVE_FTB_FALSE CR_HAVE_CXX_TRUE CR_HAVE_CXX_FALSE GMAKE_IFEQ GMAKE_IFNEQ GMAKE_ELSE GMAKE_ENDIF KBUILD_MAK BUILD_CR_INFO_TRUE BUILD_CR_INFO_FALSE BUILD_VMADLIB_TRUE BUILD_VMADLIB_FALSE CR_BUILD_MODULES_TRUE CR_BUILD_MODULES_FALSE CR_BUILD_UTIL_TRUE CR_BUILD_UTIL_FALSE CR_BUILD_LIBCR_TRUE CR_BUILD_LIBCR_FALSE CR_BUILD_INCLUDE_TRUE CR_BUILD_INCLUDE_FALSE CR_BUILD_TESTS_TRUE CR_BUILD_TESTS_FALSE CR_BUILD_EXAMPLES_TRUE CR_BUILD_EXAMPLES_FALSE CR_BUILD_CONTRIB_TRUE CR_BUILD_CONTRIB_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CR_RELEASE_MAJOR CR_RELEASE_MINOR CR_RELEASE_PATCH CR_RELEASE_VERSION LIBCR_MAJOR LIBCR_MINOR LIBCR_PATCH LIBCR_VERSION CR_MODULE_MAJOR CR_MODULE_MINOR CR_MODULE_PATCH CR_MODULE_VERSION LIBTOOL_INTERFACE LIBTOOL_AGE LIBTOOL_REVISION CONFIGURE_ARGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar PWD_PROG TOP_BUILDDIR TOP_SRCDIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os CR_ARCH CR_CPU CRI_DEBUG_TRUE CRI_DEBUG_FALSE CR_NDEBUG LIBCR_TRACING_TRUE LIBCR_TRACING_FALSE CR_KERNEL_TRACING_TRUE CR_KERNEL_TRACING_FALSE CR_BUILD_ETC_TRUE CR_BUILD_ETC_FALSE CR_INSTALLED_LIBCR_TRUE CR_INSTALLED_LIBCR_FALSE CR_INSTALLED_UTIL_TRUE CR_INSTALLED_UTIL_FALSE CR_BUILD_TESTSUITE_TRUE CR_BUILD_TESTSUITE_FALSE PERL MAKE RPMBUILD KCC RANLIB ac_ct_RANLIB LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP ECHO AR ac_ct_AR CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CR_ENABLE_STATIC_TRUE CR_ENABLE_STATIC_FALSE CR_ENABLE_SHARED_TRUE CR_ENABLE_SHARED_FALSE HAVE_RPMBUILD_TRUE HAVE_RPMBUILD_FALSE CR_LIBCR_CFLAGS CR_CLIENT_LDADD CR_FTB_INCLUDES CR_FTB_LDFLAGS CR_FTB_LDADD CR_SIGNUM CR_LIBARCH CR_BUILD_LIBCR32_TRUE CR_BUILD_LIBCR32_FALSE NM LINUX_SRC LINUX_OBJ LINUX_VER CR_KERNEL CR_KERNEL_BASE CR_MODULE_DIR LINUX_SYMTAB_FILE LINUX_SYMTAB_CMD LINUX_SYMTAB_CONF CR_KARCH KBUILD_MAKE_ARGS CR_HAVE_SYSTEM_MAP_TRUE CR_HAVE_SYSTEM_MAP_FALSE CR_BUILD_MAN_TRUE CR_BUILD_MAN_FALSE CR_HAVE_FTB_TRUE CR_HAVE_FTB_FALSE CR_HAVE_CXX_TRUE CR_HAVE_CXX_FALSE GMAKE_IFEQ GMAKE_IFNEQ GMAKE_ELSE GMAKE_ENDIF KBUILD_MAK BUILD_CR_INFO_TRUE BUILD_CR_INFO_FALSE BUILD_VMADLIB_TRUE BUILD_VMADLIB_FALSE CR_BUILD_MODULES_TRUE CR_BUILD_MODULES_FALSE CR_BUILD_UTIL_TRUE CR_BUILD_UTIL_FALSE CR_BUILD_LIBCR_TRUE CR_BUILD_LIBCR_FALSE CR_BUILD_INCLUDE_TRUE CR_BUILD_INCLUDE_FALSE CR_BUILD_TESTS_TRUE CR_BUILD_TESTS_FALSE CR_BUILD_EXAMPLES_TRUE CR_BUILD_EXAMPLES_FALSE CR_BUILD_CONTRIB_TRUE CR_BUILD_CONTRIB_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files='CR_KSYM_IMPORT_DECLS CR_KSYM_IMPORT_CALLS'
 
 # Initialize some variables set by options.
@@ -996,7 +996,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures blcr 0.8.2 to adapt to many kinds of systems.
+\`configure' configures blcr 0.8.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1062,7 +1062,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of blcr 0.8.2:";;
+     short | recursive ) echo "Configuration of blcr 0.8.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1256,7 +1256,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-blcr configure 0.8.2
+blcr configure 0.8.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1294,7 +1294,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by blcr $as_me 0.8.2, which was
+It was created by blcr $as_me 0.8.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1645,7 +1645,7 @@
 #       'make clean' and rebuild everything to see the new library names.
 LIBCR_MAJOR=0
 LIBCR_MINOR=5
-LIBCR_PATCH=2
+LIBCR_PATCH=3
 
 # 3. Kernel module version
 # ------------------------
@@ -1660,7 +1660,7 @@
 # Observe same rules as for library (ie patch->0 when changing minor, etc).
 CR_MODULE_MAJOR=0
 CR_MODULE_MINOR=10
-CR_MODULE_PATCH=1
+CR_MODULE_PATCH=2
 
 # Derived version variables ###
 #   - Exported, so you can use @CR_FOO@ to get them in any files that configure
@@ -1668,7 +1668,7 @@
 #   - They are all also #defined in blcr_common.h.
 CR_RELEASE_MAJOR=0
 CR_RELEASE_MINOR=8
-CR_RELEASE_PATCH=2
+CR_RELEASE_PATCH=4
 CR_RELEASE_VERSION="$CR_RELEASE_MAJOR.$CR_RELEASE_MINOR.$CR_RELEASE_PATCH"
 
 
@@ -1724,7 +1724,7 @@
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
-am__api_version="1.8"
+am__api_version="1.9"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1876,13 +1876,21 @@
 fi
 
 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
   #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
 else
   # On NextStep and OpenStep, the `mkdir' command does not
   # recognize any option.  It will interpret all options as
@@ -1998,7 +2006,7 @@
 
 # Define the identity of the package.
  PACKAGE='blcr'
- VERSION='0.8.2'
+ VERSION='0.8.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2026,9 +2034,6 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
@@ -2121,6 +2126,13 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
 
 
 
@@ -4190,9 +4202,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CC_dependencies_compiler_type=$depmode
         break
       fi
@@ -4243,12 +4260,13 @@
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -4273,10 +4291,11 @@
     fi
   done
 done
-SED=$lt_cv_path_SED
 
 fi
 
+SED=$lt_cv_path_SED
+
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
@@ -4353,7 +4372,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -4387,7 +4406,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -4417,6 +4436,15 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 
 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -4427,36 +4455,43 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
 	  break
 	  ;;
 	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
@@ -4492,21 +4527,21 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[45]*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
 cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
+  # func_win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
@@ -4515,13 +4550,13 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -4537,7 +4572,7 @@
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -4553,6 +4588,11 @@
   esac
   ;;
 
+interix3*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $LD in
   *-32|*"-32 ") libmagic=32-bit;;
@@ -4565,15 +4605,6 @@
 
 # This must be Linux ELF.
 linux*)
-  case $host_cpu in
-  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64)
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4596,12 +4627,10 @@
   ;;
 
 openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   fi
   ;;
 
@@ -4609,15 +4638,11 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
@@ -4638,10 +4663,13 @@
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
 
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -4659,6 +4687,9 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
@@ -4694,7 +4725,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4697 "configure"' > conftest.$ac_ext
+  echo '#line 4728 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4737,7 +4768,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -4850,6 +4881,26 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 
 esac
 
@@ -5905,9 +5956,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CXX_dependencies_compiler_type=$depmode
         break
       fi
@@ -5938,7 +5994,12 @@
 fi
 
 
-ac_ext=cc
+
+
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cc
 ac_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'
@@ -6168,6 +6229,8 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+fi
+
 
 ac_ext=f
 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
@@ -6261,7 +6324,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:6264:" \
+echo "$as_me:6327:" \
      "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
@@ -6416,7 +6479,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     i=0
-  testring="ABCD"
+  teststring="ABCD"
 
   case $build_os in
   msdosdjgpp*)
@@ -6451,20 +6514,64 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
- *)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 	    lt_cv_sys_max_cmd_len=$new_result &&
 	    test $i != 17 # 1/2 MB should be enough
     do
       i=`expr $i + 1`
-      testring=$testring$testring
+      teststring=$teststring$teststring
     done
-    testring=
+    teststring=
     # 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.
@@ -6501,9 +6608,6 @@
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
 # Transform an extracted symbol line into a proper C declaration
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
@@ -6525,15 +6629,31 @@
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
+linux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDGIRSTW]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
 irix* | nonstopux*)
   symcode='[BCDEGRST]'
   ;;
 osf*)
   symcode='[BCDEGQRST]'
   ;;
-solaris* | sysv5*)
+solaris*)
   symcode='[BDRT]'
   ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
 sysv4)
   symcode='[DFNSTU]'
   ;;
@@ -6556,8 +6676,11 @@
 # Try without a prefix undercore, then with it.
 for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
   # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -6719,7 +6842,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
 
 # Same as above, but do not quote variable references.
@@ -6739,7 +6862,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -6996,6 +7119,7 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -7015,15 +7139,26 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -7049,7 +7184,7 @@
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -7111,7 +7246,7 @@
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -7206,68 +7341,25 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
-#
-# Check for any special shared library compilation flags.
-#
-lt_prog_cc_shlib=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    lt_prog_cc_shlib='-belf'
-    ;;
-  esac
-fi
-if test -n "$lt_prog_cc_shlib"; then
-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
-  else
-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-    lt_cv_prog_cc_can_build_shared=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-     else
-       lt_prog_compiler_static_works=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-
-if test x"$lt_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
 
 
 
@@ -7292,18 +7384,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7298: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7390: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7302: \$? = $ac_status" >&5
+   echo "$as_me:7394: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -7364,6 +7458,11 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -7380,7 +7479,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -7406,6 +7505,16 @@
 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic='-qnocommon'
+         lt_prog_compiler_wl='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -7417,7 +7526,7 @@
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -7441,12 +7550,19 @@
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl='-Wl,'
         # All Alpha code is PIC.
@@ -7461,15 +7577,15 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic='-Kpic'
-      lt_prog_compiler_static='-dn'
-      ;;
-
     solaris*)
-      lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -7478,7 +7594,7 @@
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -7491,6 +7607,17 @@
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic='-pic'
       lt_prog_compiler_static='-Bstatic'
@@ -7525,18 +7652,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7531: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7658: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7535: \$? = $ac_status" >&5
+   echo "$as_me:7662: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works=yes
      fi
    fi
@@ -7557,7 +7686,7 @@
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic=
@@ -7567,6 +7696,48 @@
     ;;
 esac
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works=yes
+       fi
+     else
+       lt_prog_compiler_static_works=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
 echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
@@ -7585,23 +7756,25 @@
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7591: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7762: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7595: \$? = $ac_status" >&5
+   echo "$as_me:7766: \$? = $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
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -7677,6 +7850,16 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -7687,6 +7870,10 @@
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -7697,6 +7884,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -7747,10 +7955,10 @@
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# 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
@@ -7759,7 +7967,53 @@
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    interix3*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
       else
 	ld_shlibs=no
       fi
@@ -7775,7 +8029,7 @@
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
 	cat <<EOF 1>&2
@@ -7796,6 +8050,33 @@
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -7803,31 +8084,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -7838,16 +8094,11 @@
       ;;
     esac
 
-    if test "$ld_shlibs" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
-      fi
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -7859,7 +8110,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct=unsupported
@@ -7893,6 +8144,7 @@
   	    break
   	  fi
 	  done
+	  ;;
 	esac
 
 	exp_sym_flag='-bexport'
@@ -7911,7 +8163,7 @@
       link_all_deplibs=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -7930,8 +8182,12 @@
   	  hardcode_libdir_flag_spec='-L$libdir'
   	  hardcode_libdir_separator=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -7939,11 +8195,11 @@
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
+	  if test "$aix_use_runtimelinking" = yes; then
 	    shared_flag='${wl}-G'
 	  else
 	    shared_flag='${wl}-bM:SRE'
-  	fi
+	  fi
 	fi
       fi
 
@@ -8008,12 +8264,12 @@
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -8073,13 +8329,11 @@
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec=' '
+	  whole_archive_flag_spec='$convenience'
 	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -8092,7 +8346,7 @@
       ld_shlibs=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec=-rdynamic
       ;;
 
@@ -8106,7 +8360,7 @@
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
       archive_cmds='$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.
@@ -8118,52 +8372,52 @@
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc=no
       hardcode_direct=no
       hardcode_automatic=yes
       hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec='-all_load $convenience'
+      whole_archive_flag_spec=''
       link_all_deplibs=yes
-    else
-      ld_shlibs=no
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs=no
+          ;;
+      esac
     fi
       ;;
 
@@ -8197,7 +8451,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -8220,47 +8474,62 @@
       export_dynamic_flag_spec='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	hardcode_direct=yes
+	export_dynamic_flag_spec='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
 	*)
 	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
 	  hardcode_libdir_flag_spec_ld='+b $libdir'
-	  hardcode_libdir_separator=:
 	  hardcode_direct=no
 	  hardcode_shlibpath_var=no
 	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
 	*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator=:
 	  hardcode_direct=yes
 	  export_dynamic_flag_spec='${wl}-E'
 
@@ -8308,6 +8577,7 @@
       hardcode_shlibpath_var=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec='${wl}-E'
       else
@@ -8353,7 +8623,7 @@
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -8361,21 +8631,15 @@
       hardcode_libdir_separator=:
       ;;
 
-    sco3.2v5*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       no_undefined_flag=' -z text'
       if test "$GCC" = yes; then
+	wlarc='${wl}'
 	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -8384,8 +8648,18 @@
       hardcode_shlibpath_var=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs=yes
       ;;
@@ -8442,36 +8716,45 @@
       fi
       ;;
 
-    sysv4.2uw2*)
-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
       ;;
 
-    sysv5*)
-      no_undefined_flag=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      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'
-      hardcode_libdir_flag_spec=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -8490,11 +8773,6 @@
 echo "${ECHO_T}$ld_shlibs" >&6
 test "$ld_shlibs" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -8527,6 +8805,7 @@
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -8562,7 +8841,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -8659,7 +8938,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -8675,7 +8954,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -8687,7 +8966,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -8717,7 +8997,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -8740,7 +9020,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # 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"`
@@ -8775,8 +9055,17 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -8794,14 +9083,19 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -8821,9 +9115,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -8838,7 +9132,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -8849,7 +9143,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -8861,6 +9155,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -8918,10 +9224,31 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390x*|powerpc64*)
+    echo '#line 9231 "configure"' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -8982,8 +9309,13 @@
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=yes
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -9003,7 +9335,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -9021,13 +9353,6 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -9053,7 +9378,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -9086,6 +9411,29 @@
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -9101,12 +9449,17 @@
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var " || \
-   test "X$hardcode_automatic"="Xyes" ; then
+   test -n "$runpath_var" || \
+   test "X$hardcode_automatic" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct" != no &&
@@ -9756,7 +10109,7 @@
     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -9772,7 +10125,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9775 "configure"
+#line 10128 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9829,6 +10182,8 @@
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }
@@ -9838,12 +10193,12 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
     esac
   else :
     # compilation failed
@@ -9858,7 +10213,7 @@
 echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
 if test "${lt_cv_dlopen_self_static+set}" = set; then
@@ -9870,7 +10225,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9873 "configure"
+#line 10228 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9927,6 +10282,8 @@
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }
@@ -9936,12 +10293,12 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
     esac
   else :
     # compilation failed
@@ -9974,7 +10331,7 @@
 fi
 
 
-# Report which librarie types wil actually be built
+# Report which library types will actually be built
 echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
 echo "$as_me:$LINENO: result: $can_build_shared" >&5
@@ -9986,7 +10343,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -9995,47 +10352,10 @@
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    archive_cmds_need_lc=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct=no
-    hardcode_automatic=yes
-    hardcode_shlibpath_var=unsupported
-    whole_archive_flag_spec='-all_load $convenience'
-    link_all_deplibs=yes
-  else
-    ld_shlibs=no
-  fi
     ;;
 esac
 echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -10061,7 +10381,7 @@
   # 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.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -10165,7 +10485,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -10176,11 +10496,11 @@
 SED=$lt_SED
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # The names of the tagged configurations supported by this script.
 available_tags=
@@ -10210,6 +10530,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -10221,12 +10547,18 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler
 
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC
 
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -10252,7 +10584,7 @@
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS=$lt_AS
+AS="$AS"
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -10271,7 +10603,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -10286,7 +10618,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -10360,11 +10692,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=$lt_predep_objects
+predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=$lt_postdep_objects
+postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -10376,7 +10708,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -10456,7 +10788,7 @@
 link_all_deplibs=$link_all_deplibs
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -10551,6 +10883,9 @@
 echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     fi
   fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
 
   # Extract list of available tagged configurations in $ofile.
   # Note that this assumes the entire list is on one line.
@@ -10581,7 +10916,9 @@
 
       case $tagname in
       CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
 	  ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10601,6 +10938,7 @@
 hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
 hardcode_automatic_CXX=no
 module_cmds_CXX=
 module_expsym_cmds_CXX=
@@ -10618,7 +10956,7 @@
 compiler_lib_search_path_CXX=
 
 # Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
 
 # Object file extension for compiled C++ test sources.
 objext=o
@@ -10628,17 +10966,34 @@
 lt_simple_compile_test_code="int some_variable = 0;\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
 lt_save_LD=$LD
@@ -10649,18 +11004,27 @@
 if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 else
-  unset lt_cv_prog_gnu_ld
+  $as_unset lt_cv_prog_gnu_ld
 fi
 if test -n "${lt_cv_path_LDCXX+set}"; then
   lt_cv_path_LD=$lt_cv_path_LDCXX
 else
-  unset lt_cv_path_LD
+  $as_unset lt_cv_path_LD
 fi
 test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
 compiler=$CC
 compiler_CXX=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 # We don't want -fno-exception wen compiling C++ code, so set the
 # no_builtin_flag separately
@@ -10731,7 +11095,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -10765,7 +11129,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -10856,6 +11220,7 @@
 	    ;;
 	  esac
 	done
+	;;
       esac
 
       exp_sym_flag='-bexport'
@@ -10874,7 +11239,7 @@
     link_all_deplibs_CXX=yes
 
     if test "$GXX" = yes; then
-      case $host_os in aix4.012|aix4.012.*)
+      case $host_os in aix4.[012]|aix4.[012].*)
       # We only want to do this on AIX 4.2 and lower, the check
       # below for broken collect2 doesn't work under 4.3+
 	collect2name=`${CC} -print-prog-name=collect2`
@@ -10893,8 +11258,12 @@
 	  hardcode_libdir_flag_spec_CXX='-L$libdir'
 	  hardcode_libdir_separator_CXX=
 	fi
+	;;
       esac
       shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
     else
       # not using gcc
       if test "$host_cpu" = ia64; then
@@ -10972,12 +11341,12 @@
 
       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
       if test "$host_cpu" = ia64; then
 	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
 	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
       else
 	# Determine the default libpath from the value encoded in an empty executable.
 	cat >conftest.$ac_ext <<_ACEOF
@@ -11037,16 +11406,26 @@
 	# -berok will link without error, but may produce a broken library.
 	no_undefined_flag_CXX=' ${wl}-bernotok'
 	allow_undefined_flag_CXX=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	always_export_symbols_CXX=yes
 	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX=' '
+	whole_archive_flag_spec_CXX='$convenience'
 	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	# This is similar to how AIX traditionally builds its shared libraries.
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
     ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      allow_undefined_flag_CXX=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      ld_shlibs_CXX=no
+    fi
+    ;;
+
   chorus*)
     case $cc_basename in
       *)
@@ -11065,7 +11444,7 @@
     enable_shared_with_static_runtimes_CXX=yes
 
     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       # 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
@@ -11074,70 +11453,81 @@
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
     else
       ld_shlibs_CXX=no
     fi
   ;;
-
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    archive_cmds_need_lc_CXX=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag_CXX='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_CXX='-undefined dynamic_lookup'
-            ;;
+      darwin* | rhapsody*)
+        case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
         esac
-      fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    else
-      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    fi
-    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      archive_cmds_need_lc_CXX=no
+      hardcode_direct_CXX=no
+      hardcode_automatic_CXX=yes
+      hardcode_shlibpath_var_CXX=unsupported
+      whole_archive_flag_spec_CXX=''
+      link_all_deplibs_CXX=yes
 
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct_CXX=no
-    hardcode_automatic_CXX=yes
-    hardcode_shlibpath_var_CXX=unsupported
-    whole_archive_flag_spec_CXX='-all_load $convenience'
-    link_all_deplibs_CXX=yes
-  else
-    ld_shlibs_CXX=no
-  fi
-    ;;
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
+      output_verbose_link_cmd='echo'
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
+      fi
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      else
+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+        fi
+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          else
+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          fi
+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_CXX=no
+          ;;
+      esac
+      fi
+        ;;
 
   dgux*)
     case $cc_basename in
-      ec++)
+      ec++*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      ghcx)
+      ghcx*)
 	# Green Hills C++ Compiler
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -11148,14 +11538,14 @@
 	;;
     esac
     ;;
-  freebsd12*)
+  freebsd[12]*)
     # C++ shared libraries reported to be fairly broken before switch to ELF
     ld_shlibs_CXX=no
     ;;
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -11172,11 +11562,11 @@
 				# location of the library.
 
     case $cc_basename in
-    CC)
+    CC*)
       # FIXME: insert proper C++ library support
       ld_shlibs_CXX=no
       ;;
-    aCC)
+    aCC*)
       archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
@@ -11186,7 +11576,7 @@
       # explicitly linking system object files so we need to strip them
       # from the output so that they don't get included in the library
       # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
       ;;
     *)
       if test "$GXX" = yes; then
@@ -11200,33 +11590,22 @@
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-      hppa*64*)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator_CXX=:
+
+      case $host_cpu in
+      hppa*64*|ia64*)
 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-	hardcode_libdir_separator_CXX=:
-        ;;
-      ia64*)
-	hardcode_libdir_flag_spec_CXX='-L$libdir'
         ;;
       *)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
 	export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
       esac
     fi
-    case "$host_cpu" in
-    hppa*64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      ;;
-    ia64*)
+    case $host_cpu in
+    hppa*64*|ia64*)
       hardcode_direct_CXX=no
       hardcode_shlibpath_var_CXX=no
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
       ;;
     *)
       hardcode_direct_CXX=yes
@@ -11237,14 +11616,17 @@
     esac
 
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      aCC)
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	*)
 	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -11263,9 +11645,12 @@
       *)
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
-	    ia64*|hppa*64*)
-	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	    case $host_cpu in
+	    hppa*64*)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    *)
 	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -11279,11 +11664,25 @@
 	;;
     esac
     ;;
+  interix3*)
+    hardcode_direct_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+    export_dynamic_flag_spec_CXX='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
   irix5* | irix6*)
     case $cc_basename in
-      CC)
+      CC*)
 	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	# Archives containing C++ object files must be created using
 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -11294,7 +11693,7 @@
       *)
 	if test "$GXX" = yes; then
 	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	  else
 	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 	  fi
@@ -11307,7 +11706,7 @@
     ;;
   linux*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -11332,17 +11731,41 @@
 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 	;;
-      icpc)
+      icpc*)
 	# Intel C++
 	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
 	archive_cmds_need_lc_CXX=no
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      cxx)
+      pgCC*)
+        # Portland Group C++ compiler
+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
 	# Compaq C++
 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -11373,7 +11796,7 @@
     ;;
   mvs*)
     case $cc_basename in
-      cxx)
+      cxx*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
@@ -11394,9 +11817,25 @@
     # Workaround some broken pre-1.5 toolchains
     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
     ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    ld_shlibs_CXX=no
+    ;;
+  openbsd*)
+    hardcode_direct_CXX=yes
+    hardcode_shlibpath_var_CXX=no
+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+      export_dynamic_flag_spec_CXX='${wl}-E'
+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    fi
+    output_verbose_link_cmd='echo'
+    ;;
   osf3*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -11412,14 +11851,14 @@
 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      cxx)
+      cxx*)
 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	hardcode_libdir_separator_CXX=:
@@ -11437,7 +11876,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -11456,7 +11895,7 @@
     ;;
   osf4* | osf5*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -11471,17 +11910,17 @@
 	# the KAI C++ compiler.
 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      cxx)
+      cxx*)
 	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 	  $rm $lib.exp'
 
 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -11500,7 +11939,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -11521,27 +11960,14 @@
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  sco*)
-    archive_cmds_need_lc_CXX=no
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
   sunos4*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.x
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      lcc)
+      lcc*)
 	# Lucid
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -11554,36 +11980,33 @@
     ;;
   solaris*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.2, 5.x and Centerline C++
+        archive_cmds_need_lc_CXX=yes
 	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	hardcode_libdir_flag_spec_CXX='-R$libdir'
 	hardcode_shlibpath_var_CXX=no
 	case $host_os in
-	  solaris2.0-5 | solaris2.0-5.*) ;;
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
 	    # The C++ compiler is used as linker so we must use $wl
 	    # flag to pass the commands to the underlying system
-	    # linker.
+	    # linker. We must also pass each convience library through
+	    # to the system linker between allextract/defaultextract.
+	    # The C++ compiler will combine linker options so we
+	    # cannot just pass the convience library names through
+	    # without $wl.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	output_verbose_link_cmd='echo'
 
 	# Archives containing C++ object files must be created using
 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -11591,7 +12014,7 @@
 	# in the archive.
 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
 	;;
-      gcx)
+      gcx*)
 	# Green Hills C++ Compiler
 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
@@ -11629,12 +12052,63 @@
 	;;
     esac
     ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+    no_undefined_flag_CXX='${wl}-z,text'
+    archive_cmds_need_lc_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    no_undefined_flag_CXX='${wl}-z,text'
+    allow_undefined_flag_CXX='${wl}-z,nodefs'
     archive_cmds_need_lc_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    hardcode_libdir_separator_CXX=':'
+    link_all_deplibs_CXX=yes
+    export_dynamic_flag_spec_CXX='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
     ;;
   tandem*)
     case $cc_basename in
-      NCC)
+      NCC*)
 	# NonStop-UX NCC 3.20
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -11687,7 +12161,7 @@
   # The `*' in the case matches for architectures that use `case' in
   # $output_verbose_cmd can trigger glob expansion during the loop
   # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
   for p in `eval $output_verbose_link_cmd`; do
     case $p in
@@ -11763,6 +12237,29 @@
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix3*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    postdeps_CXX='-lCstd -lCrun'
+    ;;
+  esac
+  ;;
+esac
+
+
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -11810,6 +12307,10 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
     sysv4*MP*)
       if test -d /usr/nec; then
 	lt_prog_compiler_pic_CXX=-Kconform_pic
@@ -11818,7 +12319,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	;;
       *)
@@ -11843,18 +12344,28 @@
 	;;
       chorus*)
 	case $cc_basename in
-	cxch68)
+	cxch68*)
 	  # Green Hills C++ Compiler
 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 	  ;;
 	esac
 	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           lt_prog_compiler_pic_CXX='-qnocommon'
+           lt_prog_compiler_wl_CXX='-Wl,'
+           ;;
+         esac
+       ;;
       dgux*)
 	case $cc_basename in
-	  ec++)
+	  ec++*)
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    ;;
-	  ghcx)
+	  ghcx*)
 	    # Green Hills C++ Compiler
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
@@ -11862,22 +12373,22 @@
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
 	    if test "$host_cpu" != ia64; then
 	      lt_prog_compiler_pic_CXX='+Z'
 	    fi
 	    ;;
-	  aCC)
+	  aCC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
@@ -11890,9 +12401,13 @@
 	    ;;
 	esac
 	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    # CC pic flag -KPIC is the default.
@@ -11903,18 +12418,24 @@
 	;;
       linux*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    # KAI C++ Compiler
 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
-	  icpc)
+	  icpc* | ecpc*)
 	    # Intel C++
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  cxx)
+	  pgCC*)
+	    # Portland Group C++ compiler.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
 	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -11931,7 +12452,7 @@
 	;;
       mvs*)
 	case $cc_basename in
-	  cxx)
+	  cxx*)
 	    lt_prog_compiler_pic_CXX='-W c,exportall'
 	    ;;
 	  *)
@@ -11942,14 +12463,14 @@
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 	    ;;
-	  RCC)
+	  RCC*)
 	    # Rational C++ 2.4.1
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
-	  cxx)
+	  cxx*)
 	    # Digital/Compaq C++
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -11963,24 +12484,15 @@
 	;;
       psos*)
 	;;
-      sco*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
       solaris*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-Bstatic'
 	    lt_prog_compiler_wl_CXX='-Qoption ld '
 	    ;;
-	  gcx)
+	  gcx*)
 	    # Green Hills C++ Compiler
 	    lt_prog_compiler_pic_CXX='-PIC'
 	    ;;
@@ -11990,12 +12502,12 @@
 	;;
       sunos4*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.x
 	    lt_prog_compiler_pic_CXX='-pic'
 	    lt_prog_compiler_static_CXX='-Bstatic'
 	    ;;
-	  lcc)
+	  lcc*)
 	    # Lucid
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
@@ -12005,7 +12517,7 @@
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC)
+	  NCC*)
 	    # NonStop-UX NCC 3.20
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    ;;
@@ -12013,7 +12525,14 @@
 	    ;;
 	esac
 	;;
-      unixware*)
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
 	;;
       vxworks*)
 	;;
@@ -12046,18 +12565,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12052: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12571: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12056: \$? = $ac_status" >&5
+   echo "$as_me:12575: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_CXX=yes
      fi
    fi
@@ -12078,7 +12599,7 @@
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_CXX=
@@ -12088,6 +12609,48 @@
     ;;
 esac
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
+
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
 echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
@@ -12106,23 +12669,25 @@
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12112: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12675: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12116: \$? = $ac_status" >&5
+   echo "$as_me:12679: \$? = $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
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -12177,7 +12742,7 @@
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -12188,11 +12753,6 @@
 echo "${ECHO_T}$ld_shlibs_CXX" >&6
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -12225,6 +12785,7 @@
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_CXX
+	pic_flag=$lt_prog_compiler_pic_CXX
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -12260,7 +12821,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -12357,7 +12918,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12373,7 +12934,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -12385,7 +12946,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -12415,7 +12977,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -12438,7 +13000,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # 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"`
@@ -12473,8 +13035,17 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -12492,14 +13063,19 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -12519,9 +13095,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -12536,7 +13112,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -12547,7 +13123,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -12559,6 +13135,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -12616,10 +13204,31 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390x*|powerpc64*)
+    echo '#line 13211 "configure"' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12680,8 +13289,13 @@
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=yes
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12701,7 +13315,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -12719,13 +13333,6 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -12751,7 +13358,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -12784,6 +13391,29 @@
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12799,12 +13429,17 @@
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var CXX" || \
-   test "X$hardcode_automatic_CXX"="Xyes" ; then
+   test -n "$runpath_var_CXX" || \
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_CXX" != no &&
@@ -12836,1111 +13471,288 @@
   enable_fast_install=needless
 fi
 
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
 
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # 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.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    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 \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_CXX \
+    CC_CXX \
+    LD_CXX \
+    lt_prog_compiler_wl_CXX \
+    lt_prog_compiler_pic_CXX \
+    lt_prog_compiler_static_CXX \
+    lt_prog_compiler_no_builtin_flag_CXX \
+    export_dynamic_flag_spec_CXX \
+    thread_safe_flag_spec_CXX \
+    whole_archive_flag_spec_CXX \
+    enable_shared_with_static_runtimes_CXX \
+    old_archive_cmds_CXX \
+    old_archive_from_new_cmds_CXX \
+    predep_objects_CXX \
+    postdep_objects_CXX \
+    predeps_CXX \
+    postdeps_CXX \
+    compiler_lib_search_path_CXX \
+    archive_cmds_CXX \
+    archive_expsym_cmds_CXX \
+    postinstall_cmds_CXX \
+    postuninstall_cmds_CXX \
+    old_archive_from_expsyms_cmds_CXX \
+    allow_undefined_flag_CXX \
+    no_undefined_flag_CXX \
+    export_symbols_cmds_CXX \
+    hardcode_libdir_flag_spec_CXX \
+    hardcode_libdir_flag_spec_ld_CXX \
+    hardcode_libdir_separator_CXX \
+    hardcode_automatic_CXX \
+    module_cmds_CXX \
+    module_expsym_cmds_CXX \
+    lt_cv_prog_compiler_c_o_CXX \
+    exclude_expsyms_CXX \
+    include_expsyms_CXX; do
 
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
+    case $var in
+    old_archive_cmds_CXX | \
+    old_archive_from_new_cmds_CXX | \
+    archive_cmds_CXX | \
+    archive_expsym_cmds_CXX | \
+    module_cmds_CXX | \
+    module_expsym_cmds_CXX | \
+    old_archive_from_expsyms_cmds_CXX | \
+    export_symbols_cmds_CXX | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
     ;;
+  esac
 
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
+cfgfile="$ofile"
 
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
 
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
 
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
 
-fi
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
 
-   ;;
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
 
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
-#undef shl_load
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
 
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# A C compiler.
+LTCC=$lt_LTCC
 
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# A language-specific compiler.
+CC=$lt_compiler_CXX
 
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_CXX
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+# An ERE matcher.
+EGREP=$lt_EGREP
 
-#undef dlopen
+# The linker used to build libraries.
+LD=$lt_LD_CXX
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
 
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# A BSD-compatible nm program.
+NM=$lt_NM
 
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# A symbol stripping program
+STRIP=$lt_STRIP
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
 
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
 
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# Used on cygwin: assembler.
+AS="$AS"
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
 
-fi
+# Object file suffix (normally "o").
+objext="$ac_objext"
 
+# Old archive suffix (normally "a").
+libext="$libext"
 
-fi
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
 
+# Executable file suffix (normally "").
+exeext="$exeext"
 
-fi
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+pic_mode=$pic_mode
 
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
-fi
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
 
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
 
-fi
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
 
-    ;;
-  esac
+# Do we need a version for libraries?
+need_version=$need_version
 
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
 
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
 
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
 
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
 
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 13473 "configure"
-#include "confdefs.h"
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
 
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
 
-#include <stdio.h>
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
 
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
 
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
+# Library versioning type.
+version_type=$version_type
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
 
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
 
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
 
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_CXX
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
 
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 13571 "configure"
-#include "confdefs.h"
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
 
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
 
-#include <stdio.h>
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
 
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # 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.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    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 \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS=$lt_AS
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=$lt_postdep_objects_CXX
+postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -13952,7 +13764,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -14032,7 +13844,7 @@
 link_all_deplibs=$link_all_deplibs_CXX
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -14139,16 +13951,42 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${F77-"f77"}
 compiler=$CC
 compiler_F77=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
@@ -14161,7 +13999,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -14169,8 +14007,10 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
 echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -14183,8 +14023,6 @@
 echo "$as_me:$LINENO: result: $enable_static" >&5
 echo "${ECHO_T}$enable_static" >&6
 
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
 GCC_F77="$G77"
 LD_F77="$LD"
 
@@ -14231,6 +14069,11 @@
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -14247,7 +14090,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -14273,6 +14116,16 @@
 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic_F77='-qnocommon'
+         lt_prog_compiler_wl_F77='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -14284,7 +14137,7 @@
       lt_prog_compiler_wl_F77='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -14308,12 +14161,19 @@
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
 	lt_prog_compiler_pic_F77='-KPIC'
 	lt_prog_compiler_static_F77='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl_F77='-Wl,'
+	lt_prog_compiler_pic_F77='-fpic'
+	lt_prog_compiler_static_F77='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl_F77='-Wl,'
         # All Alpha code is PIC.
@@ -14328,15 +14188,15 @@
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic_F77='-Kpic'
-      lt_prog_compiler_static_F77='-dn'
-      ;;
-
     solaris*)
-      lt_prog_compiler_wl_F77='-Wl,'
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl_F77='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl_F77='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -14345,7 +14205,7 @@
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl_F77='-Wl,'
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -14358,6 +14218,17 @@
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_can_build_shared_F77=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic_F77='-pic'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -14392,18 +14263,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14398: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14269: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14402: \$? = $ac_status" >&5
+   echo "$as_me:14273: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_F77=yes
      fi
    fi
@@ -14424,7 +14297,7 @@
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_F77=
@@ -14434,6 +14307,48 @@
     ;;
 esac
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works_F77=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works_F77=yes
+       fi
+     else
+       lt_prog_compiler_static_works_F77=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
+
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+    :
+else
+    lt_prog_compiler_static_F77=
+fi
+
+
 echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
@@ -14452,23 +14367,25 @@
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14458: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14373: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14462: \$? = $ac_status" >&5
+   echo "$as_me:14377: \$? = $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
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_F77=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -14544,6 +14461,16 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -14554,6 +14481,10 @@
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -14564,6 +14495,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_F77=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -14614,10 +14566,10 @@
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# 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
@@ -14626,9 +14578,55 @@
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
-	ld_shlibs=no
+	ld_shlibs_F77=no
+      fi
+      ;;
+
+    interix3*)
+      hardcode_direct_F77=no
+      hardcode_shlibpath_var_F77=no
+      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec_F77='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+      else
+	ld_shlibs_F77=no
       fi
       ;;
 
@@ -14642,7 +14640,7 @@
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_F77=no
 	cat <<EOF 1>&2
@@ -14663,6 +14661,33 @@
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs_F77=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs_F77=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -14670,31 +14695,6 @@
       hardcode_shlibpath_var_F77=no
       ;;
 
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds_F77="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds_F77="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs_F77=no
-    fi
-    ;;
-
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -14705,16 +14705,11 @@
       ;;
     esac
 
-    if test "$ld_shlibs_F77" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-      fi
+    if test "$ld_shlibs_F77" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec_F77=
+      export_dynamic_flag_spec_F77=
+      whole_archive_flag_spec_F77=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -14726,7 +14721,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct_F77=unsupported
@@ -14760,6 +14755,7 @@
   	    break
   	  fi
 	  done
+	  ;;
 	esac
 
 	exp_sym_flag='-bexport'
@@ -14778,7 +14774,7 @@
       link_all_deplibs_F77=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -14797,8 +14793,12 @@
   	  hardcode_libdir_flag_spec_F77='-L$libdir'
   	  hardcode_libdir_separator_F77=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -14806,11 +14806,11 @@
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
+	  if test "$aix_use_runtimelinking" = yes; then
 	    shared_flag='${wl}-G'
 	  else
 	    shared_flag='${wl}-bM:SRE'
-  	fi
+	  fi
 	fi
       fi
 
@@ -14865,12 +14865,12 @@
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
        hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -14920,13 +14920,11 @@
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag_F77=' ${wl}-bernotok'
 	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_F77=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77=' '
+	  whole_archive_flag_spec_F77='$convenience'
 	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -14939,7 +14937,7 @@
       ld_shlibs_F77=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec_F77=-rdynamic
       ;;
 
@@ -14953,64 +14951,64 @@
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
       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'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_F77=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_F77='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_F77='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc_F77=no
       hardcode_direct_F77=no
       hardcode_automatic_F77=yes
       hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77='-all_load $convenience'
+      whole_archive_flag_spec_F77=''
       link_all_deplibs_F77=yes
-    else
-      ld_shlibs_F77=no
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_F77=no
+          ;;
+      esac
     fi
       ;;
 
@@ -15044,7 +15042,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@ -15067,47 +15065,62 @@
       export_dynamic_flag_spec_F77='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
+	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_F77=:
+
+	hardcode_direct_F77=yes
+	export_dynamic_flag_spec_F77='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L_F77=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
 	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
+	ia64*)
+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
 	*)
 	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_F77=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_libdir_separator_F77=:
 	  hardcode_direct_F77=no
 	  hardcode_shlibpath_var_F77=no
 	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_F77='-L$libdir'
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
 	*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_F77=:
 	  hardcode_direct_F77=yes
 	  export_dynamic_flag_spec_F77='${wl}-E'
 
@@ -15155,6 +15168,7 @@
       hardcode_shlibpath_var_F77=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_F77='${wl}-E'
       else
@@ -15200,7 +15214,7 @@
 	allow_undefined_flag_F77=' -expect_unresolved \*'
 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
@@ -15208,21 +15222,15 @@
       hardcode_libdir_separator_F77=:
       ;;
 
-    sco3.2v5*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       no_undefined_flag_F77=' -z text'
       if test "$GCC" = yes; then
+	wlarc='${wl}'
 	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -15231,8 +15239,18 @@
       hardcode_shlibpath_var_F77=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -15289,36 +15307,45 @@
       fi
       ;;
 
-    sysv4.2uw2*)
-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      no_undefined_flag_F77='${wl}-z,text'
+      archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_F77='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
       ;;
 
-    sysv5*)
-      no_undefined_flag_F77=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      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'
-      hardcode_libdir_flag_spec_F77=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag_F77='${wl}-z,text'
+      allow_undefined_flag_F77='${wl}-z,nodefs'
+      archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
+      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator_F77=':'
+      link_all_deplibs_F77=yes
+      export_dynamic_flag_spec_F77='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -15337,11 +15364,6 @@
 echo "${ECHO_T}$ld_shlibs_F77" >&6
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -15374,6 +15396,7 @@
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_F77
+	pic_flag=$lt_prog_compiler_pic_F77
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -15409,7 +15432,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -15506,7 +15529,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15522,7 +15545,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -15534,7 +15557,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -15564,7 +15588,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -15587,7 +15611,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # 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"`
@@ -15622,8 +15646,17 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -15641,14 +15674,19 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -15668,9 +15706,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -15685,7 +15723,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -15696,7 +15734,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -15708,6 +15746,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -15765,10 +15815,31 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390x*|powerpc64*)
+    echo '#line 15822 "configure"' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15829,8 +15900,13 @@
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=yes
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -15850,7 +15926,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -15868,13 +15944,6 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -15900,7 +15969,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -15933,6 +16002,29 @@
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15948,12 +16040,17 @@
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var F77" || \
-   test "X$hardcode_automatic_F77"="Xyes" ; then
+   test -n "$runpath_var_F77" || \
+   test "X$hardcode_automatic_F77" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_F77" != no &&
@@ -15985,36 +16082,6 @@
   enable_fast_install=needless
 fi
 
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -16029,7 +16096,7 @@
   # 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.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -16130,6 +16197,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -16141,12 +16214,18 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_F77
 
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_F77
 
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -16172,7 +16251,7 @@
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS=$lt_AS
+AS="$AS"
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -16191,7 +16270,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -16206,7 +16285,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -16280,11 +16359,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=$lt_predep_objects_F77
+predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=$lt_postdep_objects_F77
+postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -16296,7 +16375,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -16376,7 +16455,7 @@
 link_all_deplibs=$link_all_deplibs_F77
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -16444,26 +16523,55 @@
 lt_simple_compile_test_code="class foo {}\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${GCJ-"gcj"}
 compiler=$CC
 compiler_GCJ=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 archive_cmds_need_lc_GCJ=no
 
+old_archive_cmds_GCJ=$old_archive_cmds
+
 
 lt_prog_compiler_no_builtin_flag_GCJ=
 
@@ -16486,18 +16594,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16492: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16600: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16496: \$? = $ac_status" >&5
+   echo "$as_me:16604: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -16558,6 +16668,11 @@
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -16574,7 +16689,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -16600,6 +16715,16 @@
 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic_GCJ='-qnocommon'
+         lt_prog_compiler_wl_GCJ='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -16611,7 +16736,7 @@
       lt_prog_compiler_wl_GCJ='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -16635,12 +16760,19 @@
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
 	lt_prog_compiler_pic_GCJ='-KPIC'
 	lt_prog_compiler_static_GCJ='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl_GCJ='-Wl,'
+	lt_prog_compiler_pic_GCJ='-fpic'
+	lt_prog_compiler_static_GCJ='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl_GCJ='-Wl,'
         # All Alpha code is PIC.
@@ -16655,15 +16787,15 @@
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic_GCJ='-Kpic'
-      lt_prog_compiler_static_GCJ='-dn'
-      ;;
-
     solaris*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl_GCJ='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -16672,7 +16804,7 @@
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl_GCJ='-Wl,'
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16685,6 +16817,17 @@
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_can_build_shared_GCJ=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic_GCJ='-pic'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16719,18 +16862,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16725: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16868: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16729: \$? = $ac_status" >&5
+   echo "$as_me:16872: \$? = $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
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_GCJ=yes
      fi
    fi
@@ -16751,7 +16896,7 @@
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_GCJ=
@@ -16761,6 +16906,48 @@
     ;;
 esac
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works_GCJ=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works_GCJ=yes
+       fi
+     else
+       lt_prog_compiler_static_works_GCJ=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
+
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+    :
+else
+    lt_prog_compiler_static_GCJ=
+fi
+
+
 echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
@@ -16779,23 +16966,25 @@
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16785: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16972: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16789: \$? = $ac_status" >&5
+   echo "$as_me:16976: \$? = $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
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_GCJ=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -16871,6 +17060,16 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -16881,6 +17080,10 @@
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -16891,6 +17094,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_GCJ=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -16941,10 +17165,10 @@
       allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# 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
@@ -16953,9 +17177,55 @@
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
-	ld_shlibs=no
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    interix3*)
+      hardcode_direct_GCJ=no
+      hardcode_shlibpath_var_GCJ=no
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec_GCJ='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+      else
+	ld_shlibs_GCJ=no
       fi
       ;;
 
@@ -16969,7 +17239,7 @@
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_GCJ=no
 	cat <<EOF 1>&2
@@ -16990,6 +17260,33 @@
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs_GCJ=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs_GCJ=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -16997,31 +17294,6 @@
       hardcode_shlibpath_var_GCJ=no
       ;;
 
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds_GCJ="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs_GCJ=no
-    fi
-    ;;
-
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -17032,16 +17304,11 @@
       ;;
     esac
 
-    if test "$ld_shlibs_GCJ" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-      fi
+    if test "$ld_shlibs_GCJ" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec_GCJ=
+      export_dynamic_flag_spec_GCJ=
+      whole_archive_flag_spec_GCJ=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -17053,7 +17320,7 @@
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct_GCJ=unsupported
@@ -17087,6 +17354,7 @@
   	    break
   	  fi
 	  done
+	  ;;
 	esac
 
 	exp_sym_flag='-bexport'
@@ -17105,7 +17373,7 @@
       link_all_deplibs_GCJ=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -17124,8 +17392,12 @@
   	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
   	  hardcode_libdir_separator_GCJ=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -17133,11 +17405,11 @@
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
+	  if test "$aix_use_runtimelinking" = yes; then
 	    shared_flag='${wl}-G'
 	  else
 	    shared_flag='${wl}-bM:SRE'
-  	fi
+	  fi
 	fi
       fi
 
@@ -17202,12 +17474,12 @@
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
        hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -17267,13 +17539,11 @@
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag_GCJ=' ${wl}-bernotok'
 	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_GCJ=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ=' '
+	  whole_archive_flag_spec_GCJ='$convenience'
 	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -17286,7 +17556,7 @@
       ld_shlibs_GCJ=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec_GCJ=-rdynamic
       ;;
 
@@ -17300,64 +17570,64 @@
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
       archive_cmds_GCJ='$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_GCJ='true'
       # FIXME: Should let the user specify the lib program.
       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_GCJ=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_GCJ='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc_GCJ=no
       hardcode_direct_GCJ=no
       hardcode_automatic_GCJ=yes
       hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ='-all_load $convenience'
+      whole_archive_flag_spec_GCJ=''
       link_all_deplibs_GCJ=yes
-    else
-      ld_shlibs_GCJ=no
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_GCJ=no
+          ;;
+      esac
     fi
       ;;
 
@@ -17391,7 +17661,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@ -17414,47 +17684,62 @@
       export_dynamic_flag_spec_GCJ='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
+	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_GCJ=:
+
+	hardcode_direct_GCJ=yes
+	export_dynamic_flag_spec_GCJ='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L_GCJ=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
 	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
+	ia64*)
+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
 	*)
 	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_GCJ=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_libdir_separator_GCJ=:
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
 	  hardcode_direct_GCJ=no
 	  hardcode_shlibpath_var_GCJ=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
 	  ;;
 	*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_GCJ=:
 	  hardcode_direct_GCJ=yes
 	  export_dynamic_flag_spec_GCJ='${wl}-E'
 
@@ -17502,6 +17787,7 @@
       hardcode_shlibpath_var_GCJ=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_GCJ='${wl}-E'
       else
@@ -17547,7 +17833,7 @@
 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
@@ -17555,21 +17841,15 @@
       hardcode_libdir_separator_GCJ=:
       ;;
 
-    sco3.2v5*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       no_undefined_flag_GCJ=' -z text'
       if test "$GCC" = yes; then
+	wlarc='${wl}'
 	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -17578,8 +17858,18 @@
       hardcode_shlibpath_var_GCJ=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -17636,36 +17926,45 @@
       fi
       ;;
 
-    sysv4.2uw2*)
-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      no_undefined_flag_GCJ='${wl}-z,text'
+      archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
       ;;
 
-    sysv5*)
-      no_undefined_flag_GCJ=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      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'
-      hardcode_libdir_flag_spec_GCJ=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag_GCJ='${wl}-z,text'
+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
+      archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator_GCJ=':'
+      link_all_deplibs_GCJ=yes
+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -17684,11 +17983,6 @@
 echo "${ECHO_T}$ld_shlibs_GCJ" >&6
 test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -17721,6 +18015,7 @@
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_GCJ
+	pic_flag=$lt_prog_compiler_pic_GCJ
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -17756,7 +18051,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -17853,7 +18148,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -17869,7 +18164,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -17881,7 +18176,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -17911,7 +18207,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -17934,7 +18230,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # 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"`
@@ -17969,8 +18265,17 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -17988,14 +18293,19 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -18015,9 +18325,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -18032,7 +18342,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -18043,7 +18353,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -18055,6 +18365,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -18112,10 +18434,31 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390x*|powerpc64*)
+    echo '#line 18441 "configure"' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -18176,8 +18519,13 @@
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=yes
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -18197,7 +18545,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -18215,13 +18563,6 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -18247,7 +18588,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -18280,6 +18621,29 @@
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -18295,12 +18659,17 @@
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action_GCJ=
 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var GCJ" || \
-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
+   test -n "$runpath_var_GCJ" || \
+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_GCJ" != no &&
@@ -18332,94 +18701,2069 @@
   enable_fast_install=needless
 fi
 
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
 
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # 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.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    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 \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_GCJ \
+    CC_GCJ \
+    LD_GCJ \
+    lt_prog_compiler_wl_GCJ \
+    lt_prog_compiler_pic_GCJ \
+    lt_prog_compiler_static_GCJ \
+    lt_prog_compiler_no_builtin_flag_GCJ \
+    export_dynamic_flag_spec_GCJ \
+    thread_safe_flag_spec_GCJ \
+    whole_archive_flag_spec_GCJ \
+    enable_shared_with_static_runtimes_GCJ \
+    old_archive_cmds_GCJ \
+    old_archive_from_new_cmds_GCJ \
+    predep_objects_GCJ \
+    postdep_objects_GCJ \
+    predeps_GCJ \
+    postdeps_GCJ \
+    compiler_lib_search_path_GCJ \
+    archive_cmds_GCJ \
+    archive_expsym_cmds_GCJ \
+    postinstall_cmds_GCJ \
+    postuninstall_cmds_GCJ \
+    old_archive_from_expsyms_cmds_GCJ \
+    allow_undefined_flag_GCJ \
+    no_undefined_flag_GCJ \
+    export_symbols_cmds_GCJ \
+    hardcode_libdir_flag_spec_GCJ \
+    hardcode_libdir_flag_spec_ld_GCJ \
+    hardcode_libdir_separator_GCJ \
+    hardcode_automatic_GCJ \
+    module_cmds_GCJ \
+    module_expsym_cmds_GCJ \
+    lt_cv_prog_compiler_c_o_GCJ \
+    exclude_expsyms_GCJ \
+    include_expsyms_GCJ; do
 
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
+    case $var in
+    old_archive_cmds_GCJ | \
+    old_archive_from_new_cmds_GCJ | \
+    archive_cmds_GCJ | \
+    archive_expsym_cmds_GCJ | \
+    module_cmds_GCJ | \
+    module_expsym_cmds_GCJ | \
+    old_archive_from_expsyms_cmds_GCJ | \
+    export_symbols_cmds_GCJ | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
     ;;
+  esac
 
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
+cfgfile="$ofile"
 
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_GCJ
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
+# A language-specific compiler.
+CC=$lt_compiler_GCJ
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_GCJ
+
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_GCJ
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_GCJ
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_GCJ
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_GCJ
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_GCJ
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_GCJ
+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_GCJ
+module_expsym_cmds=$lt_module_expsym_cmds_GCJ
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_GCJ
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_GCJ
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_GCJ
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_GCJ
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_GCJ
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_GCJ
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_GCJ
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_GCJ
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_GCJ
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_GCJ"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_GCJ
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_GCJ
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_GCJ
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_GCJ
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+
+
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+objext_RC=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+compiler_RC=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+lt_cv_prog_compiler_c_o_RC=yes
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # 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.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    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 \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_RC \
+    CC_RC \
+    LD_RC \
+    lt_prog_compiler_wl_RC \
+    lt_prog_compiler_pic_RC \
+    lt_prog_compiler_static_RC \
+    lt_prog_compiler_no_builtin_flag_RC \
+    export_dynamic_flag_spec_RC \
+    thread_safe_flag_spec_RC \
+    whole_archive_flag_spec_RC \
+    enable_shared_with_static_runtimes_RC \
+    old_archive_cmds_RC \
+    old_archive_from_new_cmds_RC \
+    predep_objects_RC \
+    postdep_objects_RC \
+    predeps_RC \
+    postdeps_RC \
+    compiler_lib_search_path_RC \
+    archive_cmds_RC \
+    archive_expsym_cmds_RC \
+    postinstall_cmds_RC \
+    postuninstall_cmds_RC \
+    old_archive_from_expsyms_cmds_RC \
+    allow_undefined_flag_RC \
+    no_undefined_flag_RC \
+    export_symbols_cmds_RC \
+    hardcode_libdir_flag_spec_RC \
+    hardcode_libdir_flag_spec_ld_RC \
+    hardcode_libdir_separator_RC \
+    hardcode_automatic_RC \
+    module_cmds_RC \
+    module_expsym_cmds_RC \
+    lt_cv_prog_compiler_c_o_RC \
+    exclude_expsyms_RC \
+    include_expsyms_RC; do
+
+    case $var in
+    old_archive_cmds_RC | \
+    old_archive_from_new_cmds_RC | \
+    archive_cmds_RC | \
+    archive_expsym_cmds_RC | \
+    module_cmds_RC | \
+    module_expsym_cmds_RC | \
+    old_archive_from_expsyms_cmds_RC | \
+    export_symbols_cmds_RC | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_RC
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
+# A language-specific compiler.
+CC=$lt_compiler_RC
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_RC
+
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_RC
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_RC
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_RC
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_RC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_RC
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_RC
+archive_expsym_cmds=$lt_archive_expsym_cmds_RC
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_RC
+module_expsym_cmds=$lt_module_expsym_cmds_RC
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_RC
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_RC
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_RC
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_RC
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_RC
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_RC
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_RC
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_RC
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_RC
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_RC"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_RC
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_RC
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_RC
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_RC
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+	;;
+
+      *)
+	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+# Prevent multiple expansion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test x"$enable_static$enable_all_static" = xnoyes; then
+  { { echo "$as_me:$LINENO: error: You cannot pass --enable-all-static without one of --enable-static or --disable-shared" >&5
+echo "$as_me: error: You cannot pass --enable-all-static without one of --enable-static or --disable-shared" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+if test $enable_static = yes; then
+  CR_ENABLE_STATIC_TRUE=
+  CR_ENABLE_STATIC_FALSE='#'
+else
+  CR_ENABLE_STATIC_TRUE='#'
+  CR_ENABLE_STATIC_FALSE=
+fi
+
+
+
+if test $enable_shared = yes; then
+  CR_ENABLE_SHARED_TRUE=
+  CR_ENABLE_SHARED_FALSE='#'
+else
+  CR_ENABLE_SHARED_TRUE='#'
+  CR_ENABLE_SHARED_FALSE=
+fi
+
+
+# Check for rpmbuild
+
+  for ac_prog in rpmbuild rpmb rpm
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_RPMBUILD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $RPMBUILD in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_RPMBUILD="$RPMBUILD" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/lib/rpm"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+RPMBUILD=$ac_cv_path_RPMBUILD
+
+if test -n "$RPMBUILD"; then
+  echo "$as_me:$LINENO: result: $RPMBUILD" >&5
+echo "${ECHO_T}$RPMBUILD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$RPMBUILD" && break
+done
+test -n "$RPMBUILD" || RPMBUILD="none"
+
+  if $RPMBUILD -bs 2>&1 | grep 'no spec' >/dev/null 2>/dev/null; then
+    :
+  else
+    RPMBUILD=none
+  fi
+
+
+
+if test $RPMBUILD != none; then
+  HAVE_RPMBUILD_TRUE=
+  HAVE_RPMBUILD_FALSE='#'
+else
+  HAVE_RPMBUILD_TRUE='#'
+  HAVE_RPMBUILD_FALSE=
+fi
+
+
+# Check for a GNU C compiler (or a work alike?)
+
+  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
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$ac_ct_CC" && break
+done
+
+  CC=$ac_ct_CC
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_cc_g=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std1 is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std1.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  *)
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   '' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+#include <stdlib.h>
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC"   am_compiler_list=
+
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+  if test "$GCC" = yes; then
+    :
+  else
+    cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+   { { echo "$as_me:$LINENO: error: the C compiler '$CC' is not a GNU C compiler." >&5
+echo "$as_me: error: the C compiler '$CC' is not a GNU C compiler." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+
+
+# Configure inlining (XXX: need to probe gcc for support?)
+
+cat >>confdefs.h <<\_ACEOF
+#define CR_INLINE static __inline__ __attribute__ ((__unused__))
+_ACEOF
+
+
+# Check for additional flags needed when building libcr
+if test x"$cr_build_libcr" = xyes; then
+CR_LIBCR_CFLAGS=""
+
+    echo "$as_me:$LINENO: checking whether gcc accepts -Wall" >&5
+echo $ECHO_N "checking whether gcc accepts -Wall... $ECHO_C" >&6
+if test "${cr_cv_gcc_flag_WALL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    SAVE_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -Wall"
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  cr_cv_gcc_flag_WALL=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+cr_cv_gcc_flag_WALL=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+    CFLAGS=$SAVE_CFLAGS
+
+fi
+echo "$as_me:$LINENO: result: $cr_cv_gcc_flag_WALL" >&5
+echo "${ECHO_T}$cr_cv_gcc_flag_WALL" >&6
+
+  if eval test $cr_cv_gcc_flag_WALL = yes; then
+    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wall"
+  else
+    :
+  fi
+
+
+
+    echo "$as_me:$LINENO: checking whether gcc accepts -Wno-unused-function" >&5
+echo $ECHO_N "checking whether gcc accepts -Wno-unused-function... $ECHO_C" >&6
+if test "${cr_cv_gcc_flag_WNO_UNUSED_FUNCTION+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+
+    SAVE_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -Wno-unused-function"
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
 int
 main ()
 {
-dlopen ();
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+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
@@ -18433,41 +20777,64 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
+  cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dl_dlopen=no
+cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+    CFLAGS=$SAVE_CFLAGS
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
+echo "$as_me:$LINENO: result: $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&5
+echo "${ECHO_T}$cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&6
+
+  if eval test $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION = yes; then
+    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wno-unused-function"
+  else
+    :
+  fi
 
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
 
+
+fi # cr_build_libcr
+
+# Additional flags needed when linking utils, tests and examples
+CR_CLIENT_LDADD=""
+if test x"$enable_all_static" = xyes; then
+  CR_CLIENT_LDADD="$CR_CLIENT_LDADD -all-static"
 fi
 
-   ;;
 
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
+# If building the tests, we can optionally test C++
+# Note, however, that  bug 2619 reports that we can't call this conditionally.
+
+  # Totally gross way to perform a non-fatal probe for CXX
+
+
+
+
+  # Now validate the choice
+  if test "x$CXX" != xno; then
+
+
+    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
+
+    echo "$as_me:$LINENO: checking for void *" >&5
+echo $ECHO_N "checking for void *... $ECHO_C" >&6
+if test "${ac_cv_type_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18476,54 +20843,21 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
+$ac_includes_default
 int
 main ()
 {
-return f != shl_load;
+if ((void * *) 0)
+  return 0;
+if (sizeof (void *))
+  return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -18537,59 +20871,97 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
+  ac_cv_type_void_p=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_shl_load=no
+ac_cv_type_void_p=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
+echo "${ECHO_T}$ac_cv_type_void_p" >&6
+
+echo "$as_me:$LINENO: checking size of void *" >&5
+echo $ECHO_N "checking size of void *... $ECHO_C" >&6
+if test "${ac_cv_sizeof_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
+  if test "$ac_cv_type_void_p" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)];
+test_array [0] = 0
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
-shl_load ();
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -18603,87 +20975,91 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
+  ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
+$ac_includes_default
+int
+main ()
 {
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
-return f != dlopen;
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -18697,59 +21073,58 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
+  ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
+$ac_includes_default
 int
 main ()
 {
-dlopen ();
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -18763,1768 +21138,3264 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
+  ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_void_p=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (void *), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
+$ac_includes_default
+long longval () { return (long) (sizeof (void *)); }
+unsigned long ulongval () { return (long) (sizeof (void *)); }
+#include <stdio.h>
+#include <stdlib.h>
 int
 main ()
 {
-dlopen ();
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if (((long) (sizeof (void *))) < 0)
+    {
+      long i = longval ();
+      if (i != ((long) (sizeof (void *))))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (void *))))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+rm -f conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  (eval $ac_link) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
+  ac_cv_sizeof_void_p=`cat conftest.val`
 else
-  echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_svld_dlopen=no
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (void *), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+fi
+rm -f conftest.val
 else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  ac_cv_sizeof_void_p=0
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+_ACEOF
+
+
+    ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+    echo "$as_me:$LINENO: checking whether CXX='$CXX' acts like a C++ compiler" >&5
+echo $ECHO_N "checking whether CXX='$CXX' acts like a C++ compiler... $ECHO_C" >&6
+if test "${cr_cv_cxx_is_cxx+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+
+      cr_cv_cxx_is_cxx=no
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
+	#ifndef __cplusplus
+	    #error __cplusplus must be defined in a C++ compilation!
+	#endif
+
 int
 main ()
 {
-dld_link ();
+ int x = 1;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 { 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'
+	 { 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
-  ac_cv_lib_dld_dld_link=yes
+  cr_cv_cxx_is_cxx=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 18969 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
 fi
-rm -fr conftest*
-
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
+echo "$as_me:$LINENO: result: $cr_cv_cxx_is_cxx" >&5
+echo "${ECHO_T}$cr_cv_cxx_is_cxx" >&6
+    if test x"$cr_cv_cxx_is_cxx" = xyes; then
+      echo "$as_me:$LINENO: checking whether CXX='$CXX' matches wordsize of CC" >&5
+echo $ECHO_N "checking whether CXX='$CXX' matches wordsize of CC... $ECHO_C" >&6
+if test "${cr_cv_cxx_voidp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 19067 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # 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.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    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 \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS=$lt_AS
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
 
-# Object file suffix (normally "o").
-objext="$ac_objext"
+        cr_cv_cxx_voidp=no
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# Old archive suffix (normally "a").
-libext="$libext"
+	  #ifndef __cplusplus
+	      #error __cplusplus must be defined in a C++ compilation!
+	  #endif
 
-# Shared library suffix (normally ".so").
-shrext='$shrext'
+int
+main ()
+{
+ int a[(($ac_cv_sizeof_void_p == sizeof(void *))? 1 : -1)];
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { 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
+  cr_cv_cxx_voidp=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Executable file suffix (normally "").
-exeext="$exeext"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
+fi
+echo "$as_me:$LINENO: result: $cr_cv_cxx_voidp" >&5
+echo "${ECHO_T}$cr_cv_cxx_voidp" >&6
+    fi
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
+    if test x"$cr_cv_cxx_is_cxx$cr_cv_cxx_voidp" != xyesyes; then
+      CXX=no
+    fi
+  fi
 
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
 
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
+################################################################################
+# Check libraries
+################################################################################
 
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
+if test x"$cr_build_libcr" = xyes; then
+# Check for a sufficiently new glibc
+# XXX: What is our true lower bound?
 
-# Do we need a version for libraries?
-need_version=$need_version
+    echo "$as_me:$LINENO: checking for GNU libc version >= 2.2" >&5
+echo $ECHO_N "checking for GNU libc version >= 2.2... $ECHO_C" >&6
+if test "${cr_cv_check_glibc_2_2_or_higher+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
+	#include <features.h>
+	#ifndef __GLIBC_PREREQ
+	    #define __GLIBC_PREREQ(maj, min) \
+		((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
+	#endif
+	#if !__GLIBC_PREREQ(2, 2)
+	    #error "Bad glibc version"
+	#endif
+	extern int gnu_get_libc_version(void); /* Ensures this *is* glibc */
 
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
+int
+main ()
+{
 
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
+	return !gnu_get_libc_version();
 
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  cr_cv_check_glibc_2_2_or_higher=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
+cr_cv_check_glibc_2_2_or_higher=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
+fi
+echo "$as_me:$LINENO: result: $cr_cv_check_glibc_2_2_or_higher" >&5
+echo "${ECHO_T}$cr_cv_check_glibc_2_2_or_higher" >&6
 
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
+  if eval test $cr_cv_check_glibc_2_2_or_higher = yes; then
+    :
+  else
+    cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
-# Library versioning type.
-version_type=$version_type
+_ACEOF
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+   { { echo "$as_me:$LINENO: error: the C library does not appear to be glibc 2.2 or higher." >&5
+echo "$as_me: error: the C library does not appear to be glibc 2.2 or higher." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
 
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
 
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+# Checks for required libraries and fail if they are not found
+# Note that we are NOT adding them to LIBS, just verifying their presence.
+echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
+echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlsym+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlsym ();
+int
+main ()
+{
+dlsym ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlsym=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
+ac_cv_lib_dl_dlsym=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
+if test $ac_cv_lib_dl_dlsym = yes; then
+  :
+else
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
+_ACEOF
 
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+   { { echo "$as_me:$LINENO: error: required library libdl not found." >&5
+echo "$as_me: error: required library libdl not found." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
+echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char pthread_create ();
+int
+main ()
+{
+pthread_create ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_pthread_pthread_create=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+ac_cv_lib_pthread_pthread_create=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+if test $ac_cv_lib_pthread_pthread_create = yes; then
+  :
+else
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
+_ACEOF
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+   { { echo "$as_me:$LINENO: error: required library libpthread not found." >&5
+echo "$as_me: error: required library libpthread not found." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
 
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
+# Prep a variable for possible use in messages below
+if test x"$enable_multilib" = xyes; then
+  ldsuggest='-L/usr/lib/nptl -L/usr/lib64/nptl'
+elif test x"$ac_cv_sizeof_void_p" = x8; then
+  ldsuggest='-L/usr/lib64/nptl'
+else
+  ldsuggest='-L/usr/lib/nptl'
+fi
 
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
+# Helper for LinuxThreads probes
+# CR_LT_PROBE(cv_varname, cross_varname)
 
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
 
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
+# Look for LinuxThreads in the default (probably dynamic) library
+echo "$as_me:$LINENO: checking whether default pthreads library is LinuxThreads" >&5
+echo $ECHO_N "checking whether default pthreads library is LinuxThreads... $ECHO_C" >&6
+if test "${cr_cv_pt_default_lt+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
+  SAVE_LIBS="$LIBS"
+  LIBS="-lpthread $LIBS"
 
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
+  if test "$cross_compiling" = yes; then
 
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+  if test "${cross_linuxthreads-unset}" = unset; then
+    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_linuxthreads must be set." >&5
+echo "$as_me: error: When cross-compiling, variable cross_linuxthreads must be set." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+    if test x"$cross_linuxthreads" != x0; then
+  cr_cv_pt_default_lt=yes
+else
+  cr_cv_pt_default_lt=no
+fi
 
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
+	#include <sys/types.h>
+	#include <unistd.h>
+	#include <stdio.h>
+	#include <pthread.h>
 
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
 
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
+	int main(void) {
+	    pthread_t th;
+	    void *join_val;
 
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
+		fputs("Error calling pthread_create()\n", stderr);
+		return -1;
+	    }
+	    if (0 != pthread_join(th, &join_val)) {
+		fputs("Error calling pthread_join()\n", stderr);
+		return -1;
+	    }
 
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
+	    /* zero = NOT equal pids = LinuxThreads */
+	    return ((long)join_val == (long)getpid());
+	}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_pt_default_lt=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
+( exit $ac_status )
+cr_cv_pt_default_lt=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
 
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+  LIBS="$SAVE_LIBS"
 
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
+fi
+echo "$as_me:$LINENO: result: $cr_cv_pt_default_lt" >&5
+echo "${ECHO_T}$cr_cv_pt_default_lt" >&6
+if test x"$cr_cv_pt_default_lt" = xyes; then
+  { { echo "$as_me:$LINENO: error: linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&5
+echo "$as_me: error: linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
+# Now look for LinuxThreads in the static libs if we are building static ones ourself
+if test x"$enable_static" = xyes; then
+  # Look for LinuxThreads in the static library
+  echo "$as_me:$LINENO: checking whether static pthreads library is LinuxThreads" >&5
+echo $ECHO_N "checking whether static pthreads library is LinuxThreads... $ECHO_C" >&6
+if test "${cr_cv_pt_static_lt+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
+    SAVE_LIBS="$LIBS"
+    SAVE_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS -static"
+    LIBS="-lpthread $LIBS"
 
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
+  if test "$cross_compiling" = yes; then
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
+  if test "${cross_linuxthreads_static-unset}" = unset; then
+    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_linuxthreads_static must be set." >&5
+echo "$as_me: error: When cross-compiling, variable cross_linuxthreads_static must be set." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+    if test x"$cross_linuxthreads_static" != x0; then
+  cr_cv_pt_static_lt=yes
+else
+  cr_cv_pt_static_lt=no
+fi
 
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+	#include <sys/types.h>
+	#include <unistd.h>
+	#include <stdio.h>
+	#include <pthread.h>
 
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
+	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
+	int main(void) {
+	    pthread_t th;
+	    void *join_val;
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
+		fputs("Error calling pthread_create()\n", stderr);
+		return -1;
+	    }
+	    if (0 != pthread_join(th, &join_val)) {
+		fputs("Error calling pthread_join()\n", stderr);
+		return -1;
+	    }
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
+	    /* zero = NOT equal pids = LinuxThreads */
+	    return ((long)join_val == (long)getpid());
+	}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_pt_static_lt=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
+( exit $ac_status )
+cr_cv_pt_static_lt=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
 
-# ### END LIBTOOL TAG CONFIG: $tagname
+    LIBS="$SAVE_LIBS"
+    LDFLAGS="$SAVE_LDFLAGS"
 
-__EOF__
+fi
+echo "$as_me:$LINENO: result: $cr_cv_pt_static_lt" >&5
+echo "${ECHO_T}$cr_cv_pt_static_lt" >&6
+  if test x"$cr_cv_pt_static_lt" = xyes; then
+    { echo "$as_me:$LINENO: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&5
+echo "$as_me: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&2;}
+    cr_static_link_warning="yes"
+    if test x"$enable_all_static" = xyes; then
+      cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
+_ACEOF
 
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+      { { echo "$as_me:$LINENO: error: static linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&5
+echo "$as_me: error: static linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
   fi
 fi
 
+# Check for atfork handling
 
-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
-
-CC="$lt_save_CC"
+for ac_func in __register_atfork
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
 
-	else
-	  tagname=""
-	fi
-	;;
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
-      RC)
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
+#undef $ac_func
 
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
 
-# Source file extension for RC test sources.
-ac_ext=rc
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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 "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+fi
+done
 
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
 
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+# Check for call to disable NSCD
 
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
+for ac_func in __nss_disable_nscd
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
 
-# Allow CC to be a program name with arguments.
-compiler=$CC
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-lt_cv_prog_compiler_c_o_RC=yes
+#undef $ac_func
 
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # 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.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    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 \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
 
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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 "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
-cfgfile="$ofile"
+fi
+done
 
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Check for pthread_attr_setstacksize
+SAVE_LIBS="$LIBS"
+LIBS="-lpthread $LIBS"
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+for ac_func in pthread_attr_setstacksize
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
+#undef $ac_func
 
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
 
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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 "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# The host system.
-host_alias=$host_alias
-host=$host
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
+fi
+done
 
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
+LIBS="$SAVE_LIBS"
 
-# A C compiler.
-LTCC=$lt_LTCC
+# Look for prctl(PR_SET_PDEATHSIG, ...)
+echo "$as_me:$LINENO: checking for pctrl()" >&5
+echo $ECHO_N "checking for pctrl()... $ECHO_C" >&6
+if test "${cr_cv_prctl+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-# A language-specific compiler.
-CC=$lt_compiler_RC
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
+    #include <sys/prctl.h>
 
-# An ERE matcher.
-EGREP=$lt_EGREP
+int
+main ()
+{
 
-# The linker used to build libraries.
-LD=$lt_LD_RC
+    int rc = prctl(PR_SET_PDEATHSIG, 0);
 
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  cr_cv_prctl=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# A BSD-compatible nm program.
-NM=$lt_NM
+cr_cv_prctl=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-# A symbol stripping program
-STRIP=$lt_STRIP
+fi
+echo "$as_me:$LINENO: result: $cr_cv_prctl" >&5
+echo "${ECHO_T}$cr_cv_prctl" >&6
 
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
+  if test x$cr_cv_prctl = xyes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PRCTL 1
+_ACEOF
 
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PRCTL 0
+_ACEOF
 
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
+  fi
 
-# Used on cygwin: assembler.
-AS=$lt_AS
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
+# Check various constants needed for asm
+SAVE_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -I${TOP_SRCDIR}/include"
 
-# Object file suffix (normally "o").
-objext="$ac_objext"
+    CR_ASM_OP_HAND_CHKPT=""
 
-# Old archive suffix (normally "a").
-libext="$libext"
+    echo "$as_me:$LINENO: checking for value for CR_ASM_OP_HAND_CHKPT" >&5
+echo $ECHO_N "checking for value for CR_ASM_OP_HAND_CHKPT... $ECHO_C" >&6
+if test "${cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-# Shared library suffix (normally ".so").
-shrext='$shrext'
+    cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) >= 0)];
+test_array [0] = 0
 
-# Executable file suffix (normally "").
-exeext="$exeext"
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) <= $ac_mid)];
+test_array [0] = 0
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) < 0)];
+test_array [0] = 0
 
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) >= $ac_mid)];
+test_array [0] = 0
 
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) <= $ac_mid)];
+test_array [0] = 0
 
-# Do we need a version for libraries?
-need_version=$need_version
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=$ac_lo;;
+'')  ;;
+esac
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+long longval () { return CR_OP_HAND_CHKPT; }
+unsigned long ulongval () { return CR_OP_HAND_CHKPT; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
 
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((CR_OP_HAND_CHKPT) < 0)
+    {
+      long i = longval ();
+      if (i != (CR_OP_HAND_CHKPT))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != (CR_OP_HAND_CHKPT))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
 
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=`cat conftest.val`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
 
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+fi
+echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&5
+echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&6
+  if test "$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" != "not found"; then
+    CR_ASM_OP_HAND_CHKPT="$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"
+  fi
 
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+  if test -n "$CR_ASM_OP_HAND_CHKPT"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_ASM_OP_HAND_CHKPT $CR_ASM_OP_HAND_CHKPT
+_ACEOF
 
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
 
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
 
-# Library versioning type.
-version_type=$version_type
+  fi
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
 
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
+    CR_ASM_CHECKPOINT_STUB=""
 
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+    echo "$as_me:$LINENO: checking for value for CR_ASM_CHECKPOINT_STUB" >&5
+echo $ECHO_N "checking for value for CR_ASM_CHECKPOINT_STUB... $ECHO_C" >&6
+if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+    cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+int
+main ()
+{
+static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) >= 0)];
+test_array [0] = 0
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+int
+main ()
+{
+static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) <= $ac_mid)];
+test_array [0] = 0
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+int
+main ()
+{
+static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) < 0)];
+test_array [0] = 0
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+int
+main ()
+{
+static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) >= $ac_mid)];
+test_array [0] = 0
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+int
+main ()
+{
+static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) <= $ac_mid)];
+test_array [0] = 0
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=$ac_lo;;
+'')  ;;
+esac
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+long longval () { return _CR_CHECKPOINT_STUB; }
+unsigned long ulongval () { return _CR_CHECKPOINT_STUB; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
 
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((_CR_CHECKPOINT_STUB) < 0)
+    {
+      long i = longval ();
+      if (i != (_CR_CHECKPOINT_STUB))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != (_CR_CHECKPOINT_STUB))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
 
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=`cat conftest.val`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
 
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
+fi
+echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&5
+echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&6
+  if test "$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" != "not found"; then
+    CR_ASM_CHECKPOINT_STUB="$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"
+  fi
 
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
+  if test -n "$CR_ASM_CHECKPOINT_STUB"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_ASM_CHECKPOINT_STUB $CR_ASM_CHECKPOINT_STUB
+_ACEOF
 
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
 
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+  fi
+    # ICK!
 
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+    CR_ASM_OP_HAND_ABORT=""
 
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
+    echo "$as_me:$LINENO: checking for value for CR_ASM_OP_HAND_ABORT" >&5
+echo $ECHO_N "checking for value for CR_ASM_OP_HAND_ABORT... $ECHO_C" >&6
+if test "${cr_cv_compute_int_CR_ASM_OP_HAND_ABORT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
+    cr_cv_compute_int_CR_ASM_OP_HAND_ABORT="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) >= 0)];
+test_array [0] = 0
 
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) <= $ac_mid)];
+test_array [0] = 0
 
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) < 0)];
+test_array [0] = 0
 
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) >= $ac_mid)];
+test_array [0] = 0
 
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) <= $ac_mid)];
+test_array [0] = 0
 
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=$ac_lo;;
+'')  ;;
+esac
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/ioctl.h>
+	 #include "blcr_ioctl.h"
+long longval () { return CR_OP_HAND_ABORT; }
+unsigned long ulongval () { return CR_OP_HAND_ABORT; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((CR_OP_HAND_ABORT) < 0)
+    {
+      long i = longval ();
+      if (i != (CR_OP_HAND_ABORT))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != (CR_OP_HAND_ABORT))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=`cat conftest.val`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
 
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+fi
+echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&5
+echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&6
+  if test "$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" != "not found"; then
+    CR_ASM_OP_HAND_ABORT="$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"
+  fi
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+  if test -n "$CR_ASM_OP_HAND_ABORT"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_ASM_OP_HAND_ABORT $CR_ASM_OP_HAND_ABORT
+_ACEOF
 
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+  fi
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
+    CR_ASM_CHECKPOINT_OMIT=""
 
-# ### END LIBTOOL TAG CONFIG: $tagname
+    echo "$as_me:$LINENO: checking for value for CR_ASM_CHECKPOINT_OMIT" >&5
+echo $ECHO_N "checking for value for CR_ASM_CHECKPOINT_OMIT... $ECHO_C" >&6
+if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-__EOF__
+    cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) >= 0)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) <= $ac_mid)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid; break
 else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) < 0)];
+test_array [0] = 0
 
-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
-
-CC="$lt_save_CC"
-
-	;;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) >= $ac_mid)];
+test_array [0] = 0
 
-      *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-      esac
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   done
-  IFS="$lt_save_ifs"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+ac_lo= ac_hi=
 fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+int
+main ()
+{
+static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) <= $ac_mid)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=$ac_lo;;
+'')  ;;
+esac
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "blcr_common.h.in"
+long longval () { return CR_CHECKPOINT_OMIT; }
+unsigned long ulongval () { return CR_CHECKPOINT_OMIT; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
 
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((CR_CHECKPOINT_OMIT) < 0)
+    {
+      long i = longval ();
+      if (i != (CR_CHECKPOINT_OMIT))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != (CR_CHECKPOINT_OMIT))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=`cat conftest.val`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-if test x"$enable_static$enable_all_static" = xnoyes; then
-  { { echo "$as_me:$LINENO: error: You cannot pass --enable-all-static without one of --enable-static or --disable-shared" >&5
-echo "$as_me: error: You cannot pass --enable-all-static without one of --enable-static or --disable-shared" >&2;}
-   { (exit 1); exit 1; }; }
 fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
 
-
-if test $enable_static = yes; then
-  CR_ENABLE_STATIC_TRUE=
-  CR_ENABLE_STATIC_FALSE='#'
-else
-  CR_ENABLE_STATIC_TRUE='#'
-  CR_ENABLE_STATIC_FALSE=
 fi
+echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&5
+echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&6
+  if test "$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" != "not found"; then
+    CR_ASM_CHECKPOINT_OMIT="$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"
+  fi
 
+  if test -n "$CR_ASM_CHECKPOINT_OMIT"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_ASM_CHECKPOINT_OMIT $CR_ASM_CHECKPOINT_OMIT
+_ACEOF
 
 
-if test $enable_shared = yes; then
-  CR_ENABLE_SHARED_TRUE=
-  CR_ENABLE_SHARED_FALSE='#'
-else
-  CR_ENABLE_SHARED_TRUE='#'
-  CR_ENABLE_SHARED_FALSE=
-fi
 
+  fi
+    # ICK!
 
-# Check for rpmbuild
+    CR_ASM_SI_PID_OFFSET=""
 
-  for ac_prog in rpmbuild rpmb rpm
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_RPMBUILD+set}" = set; then
+    echo "$as_me:$LINENO: checking for value for CR_ASM_SI_PID_OFFSET" >&5
+echo $ECHO_N "checking for value for CR_ASM_SI_PID_OFFSET... $ECHO_C" >&6
+if test "${cr_cv_compute_int_CR_ASM_SI_PID_OFFSET+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  case $RPMBUILD in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RPMBUILD="$RPMBUILD" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/usr/lib/rpm"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
 
-  ;;
-esac
-fi
-RPMBUILD=$ac_cv_path_RPMBUILD
+    cr_cv_compute_int_CR_ASM_SI_PID_OFFSET="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <signal.h>
+	 #ifndef offsetof
+  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+	 #endif
+int
+main ()
+{
+static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) >= 0)];
+test_array [0] = 0
 
-if test -n "$RPMBUILD"; then
-  echo "$as_me:$LINENO: result: $RPMBUILD" >&5
-echo "${ECHO_T}$RPMBUILD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <signal.h>
+	 #ifndef offsetof
+  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+	 #endif
+int
+main ()
+{
+static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) <= $ac_mid)];
+test_array [0] = 0
 
-  test -n "$RPMBUILD" && break
-done
-test -n "$RPMBUILD" || RPMBUILD="none"
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  if $RPMBUILD -bs 2>&1 | grep 'no spec' >/dev/null 2>/dev/null; then
-    :
-  else
-    RPMBUILD=none
-  fi
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <signal.h>
+	 #ifndef offsetof
+  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+	 #endif
+int
+main ()
+{
+static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) < 0)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <signal.h>
+	 #ifndef offsetof
+  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+	 #endif
+int
+main ()
+{
+static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) >= $ac_mid)];
+test_array [0] = 0
 
-if test $RPMBUILD != none; then
-  HAVE_RPMBUILD_TRUE=
-  HAVE_RPMBUILD_FALSE='#'
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=$ac_mid; break
 else
-  HAVE_RPMBUILD_TRUE='#'
-  HAVE_RPMBUILD_FALSE=
-fi
-
-
-# Check for a GNU C compiler (or a work alike?)
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  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
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_lo= ac_hi=
 fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <signal.h>
+	 #ifndef offsetof
+  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+	 #endif
+int
+main ()
+{
+static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) <= $ac_mid)];
+test_array [0] = 0
 
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=$ac_lo;;
+'')  ;;
+esac
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 else
-  CC="$ac_cv_prog_CC"
-fi
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <signal.h>
+	 #ifndef offsetof
+  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+	 #endif
+long longval () { return offsetof(struct siginfo, si_pid); }
+unsigned long ulongval () { return offsetof(struct siginfo, si_pid); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
 
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((offsetof(struct siginfo, si_pid)) < 0)
+    {
+      long i = longval ();
+      if (i != (offsetof(struct siginfo, si_pid)))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != (offsetof(struct siginfo, si_pid)))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=`cat conftest.val`
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
 fi
+rm -f conftest.val
 
 fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&5
+echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&6
+  if test "$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" != "not found"; then
+    CR_ASM_SI_PID_OFFSET="$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"
   fi
-done
-done
 
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+  if test -n "$CR_ASM_SI_PID_OFFSET"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_ASM_SI_PID_OFFSET $CR_ASM_SI_PID_OFFSET
+_ACEOF
 
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
 
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
 
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
   fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
 
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
 
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+    CR_ASM_NR_ioctl=""
 
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+    echo "$as_me:$LINENO: checking for value for CR_ASM_NR_ioctl" >&5
+echo $ECHO_N "checking for value for CR_ASM_NR_ioctl... $ECHO_C" >&6
+if test "${cr_cv_compute_int_CR_ASM_NR_ioctl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+
+    cr_cv_compute_int_CR_ASM_NR_ioctl="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((__NR_ioctl) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((__NR_ioctl) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid; break
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((__NR_ioctl) < 0)];
+test_array [0] = 0
 
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ;
+  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); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&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); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+  (exit $ac_status); }; }; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
 int
 main ()
 {
-#ifndef __GNUC__
-       choke me
-#endif
+static int test_array [1 - 2 * !((__NR_ioctl) >= $ac_mid)];
+test_array [0] = 0
 
   ;
   return 0;
@@ -20552,38 +24423,45 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
+  ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_lo= ac_hi=
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
 int
 main ()
 {
+static int test_array [1 - 2 * !((__NR_ioctl) <= $ac_mid)];
+test_array [0] = 0
 
   ;
   return 0;
@@ -20611,102 +24489,178 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
+  ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
+done
+case $ac_lo in
+?*) cr_cv_compute_int_CR_ASM_NR_ioctl=$ac_lo;;
+'')  ;;
+esac
 else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
+long longval () { return __NR_ioctl; }
+unsigned long ulongval () { return __NR_ioctl; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((__NR_ioctl) < 0)
+    {
+      long i = longval ();
+      if (i != (__NR_ioctl))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
   else
-    CFLAGS=
-  fi
+    {
+      unsigned long i = ulongval ();
+      if (i != (__NR_ioctl))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_compute_int_CR_ASM_NR_ioctl=`cat conftest.val`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
+
+fi
+echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_NR_ioctl" >&5
+echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_NR_ioctl" >&6
+  if test "$cr_cv_compute_int_CR_ASM_NR_ioctl" != "not found"; then
+    CR_ASM_NR_ioctl="$cr_cv_compute_int_CR_ASM_NR_ioctl"
+  fi
+
+  if test -n "$CR_ASM_NR_ioctl"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_ASM_NR_ioctl $CR_ASM_NR_ioctl
+_ACEOF
+
+
+
+  fi
+
+
+    CR_ASM_NR_rt_sigreturn=""
+
+    echo "$as_me:$LINENO: checking for value for CR_ASM_NR_rt_sigreturn" >&5
+echo $ECHO_N "checking for value for CR_ASM_NR_rt_sigreturn... $ECHO_C" >&6
+if test "${cr_cv_compute_int_CR_ASM_NR_rt_sigreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
+
+    cr_cv_compute_int_CR_ASM_NR_rt_sigreturn="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
+int
+main ()
 {
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+static int test_array [1 - 2 * !((__NR_rt_sigreturn) >= 0)];
+test_array [0] = 0
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
 int
 main ()
 {
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+static int test_array [1 - 2 * !((__NR_rt_sigreturn) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
+rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>conftest.er1
   ac_status=$?
@@ -20728,38 +24682,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((__NR_rt_sigreturn) < 0)];
+test_array [0] = 0
 
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((__NR_rt_sigreturn) >= $ac_mid)];
+test_array [0] = 0
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
+  ;
+  return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -20783,26 +24782,46 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
 int
 main ()
 {
-exit (42);
+static int test_array [1 - 2 * !((__NR_rt_sigreturn) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -20829,277 +24848,222 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  :
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=$ac_lo;;
+'')  ;;
+esac
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
+#include <asm/unistd.h>
+	 #include <linux/unistd.h>
+long longval () { return __NR_rt_sigreturn; }
+unsigned long ulongval () { return __NR_rt_sigreturn; }
+#include <stdio.h>
+#include <stdlib.h>
 int
 main ()
 {
-exit (42);
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((__NR_rt_sigreturn) < 0)
+    {
+      long i = longval ();
+      if (i != (__NR_rt_sigreturn))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != (__NR_rt_sigreturn))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+  (exit $ac_status); } && { ac_try='./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
-  break
+  cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=`cat conftest.val`
 else
-  echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
+rm -f conftest.val
 
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+fi
+echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&5
+echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&6
+  if test "$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" != "not found"; then
+    CR_ASM_NR_rt_sigreturn="$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn"
   fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
+  if test -n "$CR_ASM_NR_rt_sigreturn"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_ASM_NR_rt_sigreturn $CR_ASM_NR_rt_sigreturn
+_ACEOF
 
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
 
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
+  fi
 
+CFLAGS="$SAVE_CFLAGS"
 
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
+# Probe for direction of stack growth
+
+    echo "$as_me:$LINENO: checking for direction of stack growth" >&5
+echo $ECHO_N "checking for direction of stack growth... $ECHO_C" >&6
+if test "${cr_cv_check_stack_direction+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
 
+   if test "$cross_compiling" = yes; then
 
+  if test "${cross_stack_direction-unset}" = unset; then
+    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_stack_direction must be set." >&5
+echo "$as_me: error: When cross-compiling, variable cross_stack_direction must be set." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 
-  if test "$GCC" = yes; then
-    :
-  else
-    cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+	 if test $cross_stack_direction = 1; then
+	   cr_cv_check_stack_direction=up
+	 else
+	   cr_cv_check_stack_direction=down
+	 fi
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+    int find_stack_direction (void) {
+      static char *addr = 0;
+      auto char dummy;
+      if (addr == 0) {
+        addr = &dummy;
+        return find_stack_direction();
+      } else {
+        return (&dummy > addr) ? 0 : 1;
+      }
+    }
+    int main(void) {
+      return find_stack_direction();
+    }
 _ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_check_stack_direction=up
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
+( exit $ac_status )
+cr_cv_check_stack_direction=down
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f confcache
-   { { echo "$as_me:$LINENO: error: the C compiler '$CC' is not a GNU C compiler." >&5
-echo "$as_me: error: the C compiler '$CC' is not a GNU C compiler." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
 
+fi
+echo "$as_me:$LINENO: result: $cr_cv_check_stack_direction" >&5
+echo "${ECHO_T}$cr_cv_check_stack_direction" >&6
+  if test $cr_cv_check_stack_direction = up; then
+    cr_stack_direction=1
+  else
+    cr_stack_direction=-1
+  fi
+  cat >>confdefs.h <<_ACEOF
+#define CR_STACK_GROWTH $cr_stack_direction
+_ACEOF
 
-# Configure inlining (XXX: need to probe gcc for support?)
 
-cat >>confdefs.h <<\_ACEOF
-#define CR_INLINE static __inline__ __attribute__ ((__unused__))
-_ACEOF
 
 
-# Check for additional flags needed when building libcr
-if test x"$cr_build_libcr" = xyes; then
-CR_LIBCR_CFLAGS=""
 
-    echo "$as_me:$LINENO: checking whether gcc accepts -Wall" >&5
-echo $ECHO_N "checking whether gcc accepts -Wall... $ECHO_C" >&6
-if test "${cr_cv_gcc_flag_WALL+set}" = set; then
+# Look for FTB header and libs
+ cr_have_ftb=no
+ if test x"$FTB_HOME" != xno; then
+  cr_have_ftb=yes
+  SAVE_CPPFLAGS="$CPPFLAGS"
+  SAVE_LDFLAGS="$LDFLAGS"
+  SAVE_LIBS="$LIBS"
+  CR_FTB_INCLUDES=""
+  CR_FTB_LDFLAGS=""
+  echo "$as_me:$LINENO: checking for FTB headers" >&5
+echo $ECHO_N "checking for FTB headers... $ECHO_C" >&6
+if test "${cr_cv_ftb_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    SAVE_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -Wall"
-    cat >conftest.$ac_ext <<_ACEOF
+    cr_result=no
+    for cr_tmp in "" "${FTB_HOME}/include"; do
+      CPPFLAGS="$SAVE_CPPFLAGS${cr_tmp:+ -I$cr_tmp}"
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+        #include <libftb.h>
+
 int
 main ()
 {
 
+        FTB_client_t x;
+
   ;
   return 0;
 }
@@ -21126,54 +25090,61 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cr_cv_gcc_flag_WALL=yes
+  cr_result="$cr_tmp"; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cr_cv_gcc_flag_WALL=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-    CFLAGS=$SAVE_CFLAGS
+    done
+    if test -z "$cr_result"; then
+      cr_cv_ftb_incdir="default"
+    else
+      cr_cv_ftb_incdir="$cr_result"
+    fi
 
 fi
-echo "$as_me:$LINENO: result: $cr_cv_gcc_flag_WALL" >&5
-echo "${ECHO_T}$cr_cv_gcc_flag_WALL" >&6
-
-  if eval test $cr_cv_gcc_flag_WALL = yes; then
-    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wall"
-  else
-    :
+echo "$as_me:$LINENO: result: $cr_cv_ftb_incdir" >&5
+echo "${ECHO_T}$cr_cv_ftb_incdir" >&6
+  if test x"$cr_cv_ftb_incdir" = xno; then
+    cr_have_ftb=no
+  elif test x"$cr_cv_ftb_incdir" != "xdefault"; then
+    CR_FTB_INCLUDES="-I$cr_cv_ftb_incdir"
   fi
-
-
-
-    echo "$as_me:$LINENO: checking whether gcc accepts -Wno-unused-function" >&5
-echo $ECHO_N "checking whether gcc accepts -Wno-unused-function... $ECHO_C" >&6
-if test "${cr_cv_gcc_flag_WNO_UNUSED_FUNCTION+set}" = set; then
+  echo "$as_me:$LINENO: checking for FTB libs" >&5
+echo $ECHO_N "checking for FTB libs... $ECHO_C" >&6
+if test "${cr_cv_ftb_libdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    SAVE_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -Wno-unused-function"
-    cat >conftest.$ac_ext <<_ACEOF
+    CPPFLAGS="$SAVE_CPPFLAGS $CR_FTB_INCLUDES"
+    LIBS="-lftb -lpthread $SAVE_LIBS"
+    cr_result=no
+    for cr_tmp in "" "${FTB_HOME}/lib64" "${FTB_HOME}/lib32" "${FTB_HOME}/lib"; do
+      LDFLAGS="$SAVE_LDFLAGS${cr_tmp:+-L$cr_tmp}"
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+        #include <libftb.h>
+
 int
 main ()
 {
 
+        return FTB_Connect(NULL, NULL);
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext 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
@@ -21187,62 +25158,150 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+	 { 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
-  cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=yes
+  cr_result="$cr_tmp"; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-    CFLAGS=$SAVE_CFLAGS
-
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+    done
+    if test -z "$cr_result"; then
+      cr_cv_ftb_libdir="default"
+    else
+      cr_cv_ftb_libdir="$cr_result"
+    fi
+
+fi
+echo "$as_me:$LINENO: result: $cr_cv_ftb_libdir" >&5
+echo "${ECHO_T}$cr_cv_ftb_libdir" >&6
+  if test x"$cr_cv_ftb_libdir" = xno; then
+    cr_have_ftb=no
+  elif test x"$cr_cv_ftb_libdir" != "xdefault"; then
+    CR_FTB_LDFLAGS="-L$cr_cv_ftb_libdir"
+    CR_FTB_LDADD="-lftb"
+  fi
+  LIBS="$SAVE_LIBS"
+  LDFLAGS="$SAVE_LDFLAGS"
+  CPPFLAGS="$SAVE_CPPFLAGS"
+  if test x"$cr_have_ftb$cr_force_ftb" = xnoyes; then
+    { { echo "$as_me:$LINENO: error: Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" >&5
+echo "$as_me: error: Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+
+
+ fi
+
+  if test x$cr_have_ftb = xyes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FTB 1
+_ACEOF
+
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FTB 0
+_ACEOF
+
+  fi
+
+
+
+
+fi # cr_build_libcr
+
+# Probe libc for the RT signal number to use
+
+    echo "$as_me:$LINENO: checking for value of CR_SIGNUM" >&5
+echo $ECHO_N "checking for value of CR_SIGNUM... $ECHO_C" >&6
+if test "${cr_cv_check_cr_signum+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_cv_check_cr_signum="failed"
+    SAVE_LIBS="$LIBS"
+    LIBS="-ldl -lpthread $LIBS"
+    if test "$cross_compiling" = yes; then
+
+  if test "${cross_signum-unset}" = unset; then
+    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_signum must be set." >&5
+echo "$as_me: error: When cross-compiling, variable cross_signum must be set." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+	 cr_cv_check_cr_signum=$cross_signum
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdio.h>
+	#include <dlfcn.h>
+
+	extern int __libc_allocate_rtsig(int);
+	int main()
+	{
+	  int s = -1;
+	  FILE *f=fopen("conftestval", "w");
+	  void *dlhandle = dlopen(NULL, RTLD_LAZY);
+	  if (dlhandle) {
+	    int *tmp = (int *)dlsym(dlhandle, "cri_signum");
+	    dlclose(dlhandle);
+	    if (tmp) s = *tmp;
+	  }
+	  if (s <= 0) {
+	    s=__libc_allocate_rtsig(0);
+	  }
+	  if (!f || s<=0) return(1);
+	  fprintf(f, "%d\n", s);
+	  return(0);
+	}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_check_cr_signum=`cat conftestval`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: Failed to probe CR_SIGNUM" >&5
+echo "$as_me: error: Failed to probe CR_SIGNUM" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&5
-echo "${ECHO_T}$cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&6
-
-  if eval test $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION = yes; then
-    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wno-unused-function"
-  else
-    :
-  fi
-
-
-
-fi # cr_build_libcr
+    LIBS="$SAVE_LIBS"
 
-# Additional flags needed when linking utils, tests and examples
-CR_CLIENT_LDADD=""
-if test x"$enable_all_static" = xyes; then
-  CR_CLIENT_LDADD="$CR_CLIENT_LDADD -all-static"
 fi
+echo "$as_me:$LINENO: result: $cr_cv_check_cr_signum" >&5
+echo "${ECHO_T}$cr_cv_check_cr_signum" >&6
+  CR_SIGNUM=$cr_cv_check_cr_signum
 
 
-# If building the tests, we can optionally test C++
-if test x"$cr_build_tests" = xyes; then
-
-  # Totally gross way to perform a non-fatal probe for CXX
-
-
-
-
-  # Now validate the choice
-  if test "x$CXX" != xno; then
-
-
-    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
 
-    echo "$as_me:$LINENO: checking for void *" >&5
+# Check for 32- or 64-bit architecture
+echo "$as_me:$LINENO: checking for void *" >&5
 echo $ECHO_N "checking for void *... $ECHO_C" >&6
 if test "${ac_cv_type_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21656,481 +25715,636 @@
 _ACEOF
 
 
-    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
+CR_LIBARCH=$CR_ARCH
+if test $ac_cv_sizeof_void_p != $cr_wordsize; then
+  if test $cr_wordsize = 8; then
+    CR_LIBARCH=$CR_ARCH32
+  else
+    { { echo "$as_me:$LINENO: error: CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" >&5
+echo "$as_me: error: CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
 
-    echo "$as_me:$LINENO: checking whether CXX='$CXX' acts like a C++ compiler" >&5
-echo $ECHO_N "checking whether CXX='$CXX' acts like a C++ compiler... $ECHO_C" >&6
-if test "${cr_cv_cxx_is_cxx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
-      cr_cv_cxx_is_cxx=no
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+################################################################################
+# Sub-configure for 32-bit libs on 64-bit platforms
+################################################################################
 
-	#ifndef __cplusplus
-	    #error __cplusplus must be defined in a C++ compilation!
-	#endif
+cr_build_libcr32=no
+if test x"$enable_multilib" = xyes; then
+  if test x"$cr_build_libcr" != xyes; then
+    { { echo "$as_me:$LINENO: error: --enable-multilib requested but not building libcr" >&5
+echo "$as_me: error: --enable-multilib requested but not building libcr" >&2;}
+   { (exit 1); exit 1; }; }
+  elif test -f "${TOP_BUILDDIR}/configure.ac"; then # More robust than TOP_BUILDDIR == TOP_SRCDIR
+    { { echo "$as_me:$LINENO: error: When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" >&5
+echo "$as_me: error: When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" >&2;}
+   { (exit 1); exit 1; }; }
+  elif test -z "$CR_ARCH32"; then
+    { { echo "$as_me:$LINENO: error: --enable-multilib not supported on architecture $CR_ARCH" >&5
+echo "$as_me: error: --enable-multilib not supported on architecture $CR_ARCH" >&2;}
+   { (exit 1); exit 1; }; }
+  elif test $ac_cv_sizeof_void_p = 4; then
+    { { echo "$as_me:$LINENO: error: --enable-multilib requested but CC='$CC' generates 32-bit objects.  Perhaps try configuring with CC='$CC -m64' or similar." >&5
+echo "$as_me: error: --enable-multilib requested but CC='$CC' generates 32-bit objects.  Perhaps try configuring with CC='$CC -m64' or similar." >&2;}
+   { (exit 1); exit 1; }; }
+  elif test \! -d /lib64; then
+    { { echo "$as_me:$LINENO: error: --enable-multilib requested but /lib64 does not exist" >&5
+echo "$as_me: error: --enable-multilib requested but /lib64 does not exist" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  if test -z "$libdir32"; then
+    if expr "$libdir" : '.*/lib64$' >/dev/null; then
+      libdir32=`echo $libdir | sed -e 's/64$//'`
+    elif test "$libdir" = '${exec_prefix}/lib'; then
+      libdir32='${exec_prefix}/lib'
+      libdir='${exec_prefix}/lib64'
+    else
+      { { echo "$as_me:$LINENO: error: --enable-multilib requested but libdir='$libdir' does not end in 'lib64'" >&5
+echo "$as_me: error: --enable-multilib requested but libdir='$libdir' does not end in 'lib64'" >&2;}
+   { (exit 1); exit 1; }; };
+    fi
+  fi
+  SUBCMD="${TOP_SRCDIR}/configure '--srcdir=${TOP_SRCDIR}' '--build=${CR_ARCH32}-linux' '--libdir=${libdir32}' --with-components=libcr,tests,examples"
+  eval set -- $ac_configure_args
+  for x in "$@"; do
+    case "$x" in
+      --host=*|--build=*|--target=*|host_alias=*|build_alias=*|target_alias=*|--libdir=*|--srcdir=*|--with-components=*|--enable-multilib|--enable-testsuite|CFLAGS=*|CXXFLAGS=*)
+	# skip
+	;;
+      *)
+	# keep as-is
+	SUBCMD="$SUBCMD '$x'"
+	;;
+    esac
+  done
+  # Strip -m64 out of CFLAGS and CXXFLAGS, if present
+  if test -n "$CFLAGS32"; then
+    SUBCMD="$SUBCMD 'CFLAGS=$CFLAGS32'"
+  elif test -n "$CFLAGS"; then
+    set --
+    for x in $CFLAGS; do test x"$x" = "x-m64" || set -- "$@" "$x"; done
+    SUBCMD="$SUBCMD 'CFLAGS=$@'"
+  fi
+  if test -n "$CXXFLAGS32"; then
+    SUBCMD="$SUBCMD 'CXXFLAGS=$CXXFLAGS32'"
+  elif test -n "$CXXFLAGS"; then
+    set --
+    for x in $CXXFLAGS; do test x"$x" = "x-m64" || set -- "$@" "$x"; done
+    SUBCMD="$SUBCMD 'CXXFLAGS=$@'"
+  fi
+  # Strip -m64 from definitions of CC and CXX, adding -m32
+  if test -n "$CC32"; then
+    SUBCMD="$SUBCMD 'CC=$CC32'"
+  else
+    set --
+    for x in $CC; do test x"$x" = "x-m64" || set -- "$@" "$x"; done
+    SUBCMD="$SUBCMD 'CC=$@ -m32'"
+  fi
+  if test -n "$CXX32"; then
+    SUBCMD="$SUBCMD 'CXX=$CXX32'"
+  elif test -n "$CXX" -a "$CXX" != no; then
+    set --
+    for x in $CXX; do test x"$x" = "x-m64" || set -- "$@" "$x"; done
+    SUBCMD="$SUBCMD 'CXX=$@ -m32'"
+  fi
+  # Look for 32-bit versions of remaining bin tools
+  if test -n "$CPP32"; then
+    SUBCMD="$SUBCMD 'CPP=$CPP32'"
+  fi
+  if test -n "$LD32"; then
+    SUBCMD="$SUBCMD 'LD=$LD32'"
+  fi
+  if test -n "$AR32"; then
+    SUBCMD="$SUBCMD 'AR=$AR32'"
+  fi
+  if test -n "$NM32"; then
+    SUBCMD="$SUBCMD 'NM=$NM32'"
+  fi
+  if test -n "$RANLIB32"; then
+    SUBCMD="$SUBCMD 'RANLIB=$RANLIB32'"
+  fi
+  # Others?
+  { echo "$as_me:$LINENO: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&5
+echo "$as_me: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&6;}
+  { echo "$as_me:$LINENO: ${SUBCMD}" >&5
+echo "$as_me: ${SUBCMD}" >&6;}
+  ( mkdir -p libcr32 && cd libcr32 && ln -sf ../util util && eval "${SUBCMD}" )
+  if test "$?" = 0; then
+    { echo "$as_me:$LINENO: <<<< END sub-configure for 32-bit libs <<<<" >&5
+echo "$as_me: <<<< END sub-configure for 32-bit libs <<<<" >&6;}
+    cr_build_libcr32=yes
+  else
+    rm -rf libcr32
+    { { echo "$as_me:$LINENO: error: --enable-multilib requested but FAILED sub-configure for 32-bit libs" >&5
+echo "$as_me: error: --enable-multilib requested but FAILED sub-configure for 32-bit libs" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
 
-int
-main ()
-{
- int x = 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { 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
-  cr_cv_cxx_is_cxx=yes
+
+if test x$cr_build_libcr32 = xyes; then
+  CR_BUILD_LIBCR32_TRUE=
+  CR_BUILD_LIBCR32_FALSE='#'
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  CR_BUILD_LIBCR32_TRUE='#'
+  CR_BUILD_LIBCR32_FALSE=
+fi
+
+
+################################################################################
+# Check kernel (source location, symbol table, features, etc.)
+################################################################################
+
+if test x"$cr_build_modules" = xyes; then
 
+# Compiler to build kernel modules
+echo "$as_me:$LINENO: checking compiler to build kernel modules" >&5
+echo $ECHO_N "checking compiler to build kernel modules... $ECHO_C" >&6
+if test -n "${KCC}"; then
+  echo "$as_me:$LINENO: result: $KCC (user setting)" >&5
+echo "${ECHO_T}$KCC (user setting)" >&6
+else
+  KCC=$CC
+  echo "$as_me:$LINENO: result: $KCC (default)" >&5
+echo "${ECHO_T}$KCC (default)" >&6
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+
+# Find BSD-compatible NM command
+echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+if test "${lt_cv_path_NM+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
-echo "$as_me:$LINENO: result: $cr_cv_cxx_is_cxx" >&5
-echo "${ECHO_T}$cr_cv_cxx_is_cxx" >&6
-    if test x"$cr_cv_cxx_is_cxx" = xyes; then
-      echo "$as_me:$LINENO: checking whether CXX='$CXX' matches wordsize of CC" >&5
-echo $ECHO_N "checking whether CXX='$CXX' matches wordsize of CC... $ECHO_C" >&6
-if test "${cr_cv_cxx_voidp+set}" = set; then
+fi
+echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6
+NM="$lt_cv_path_NM"
+
+NM=$NM
+
+
+# First deal with user-specified kernel type (UP, SMP, BIGMEM, etc.) if any.
+case x"$with_kernel_type" in
+  x|xyes|xno) ;;
+  *)
+  cr_kernel_type=`echo "$with_kernel_type" | tr 'a-z' 'A-Z'`
+  cr_header="/boot/kernel.h"
+  echo "$as_me:$LINENO: checking for $cr_header" >&5
+echo $ECHO_N "checking for $cr_header... $ECHO_C" >&6;
+  cr_result=ok
+  if test \! -e "$cr_header"; then
+    cr_result='missing'
+  elif test \! -r "$cr_header"; then
+    cr_result='not readable'
+  fi
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+  if test "$cr_result" != "ok"; then
+    { { echo "$as_me:$LINENO: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." >&5
+echo "$as_me: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  cr_kernel_var="__BOOT_KERNEL_$cr_kernel_type"
+  if test -z "`grep \"$cr_kernel_var\" $cr_header 2>/dev/null`"; then
+    { { echo "$as_me:$LINENO: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." >&5
+echo "$as_me: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  # The following sed command transforms all the #ifndef lines from kernel.h into
+  # corresponding preprocessor flags (on one line) which select the desired kernel type.
+  # Note use of [] for m4 quoting of a sed command containing [ and ]
+  CR_KTYPE_CPPFLAGS=`sed -n -e '/^#ifndef \('$cr_kernel_var'\)$/ {s//-D\1=1 /;H;}' \
+			     -e '/^#ifndef \(__BOOT_KERNEL_[A-Z]*\)$/ {s//-D\1=0 /;H;}' \
+			     -e '$ {x;s/[ \t\n]\+/ /g;s/^ //;s/ $//;p;}' \
+			     $cr_header`
+
+esac
+# Checks for required kernel src/obj dirs and fail if they are not found
+
+
+
+
+
+
+
+
+    if test "${LINUX_OBJ_ARG+set}${cr_cv_var_LINUX_OBJ_ARG+set}" = setset; then
+    if test "$LINUX_OBJ_ARG" != "$cr_cv_var_LINUX_OBJ_ARG"; then
+      { { echo "$as_me:$LINENO: error: Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG).  Remove '$cache_file' before re-running configure." >&5
+echo "$as_me: error: Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG).  Remove '$cache_file' before re-running configure." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  elif test "${cr_cv_var_LINUX_OBJ_ARG+set}" = set; then
+    LINUX_OBJ_ARG="$cr_cv_var_LINUX_OBJ_ARG"
+  fi
+
+  if expr X"$LINUX_OBJ_ARG" : X/ >/dev/null; then
+    # User provided a path
+
+  echo "$as_me:$LINENO: checking for Linux kernel build in ${LINUX_OBJ_ARG}" >&5
+echo $ECHO_N "checking for Linux kernel build in ${LINUX_OBJ_ARG}... $ECHO_C" >&6
+  cr_cvname=cr_cv_kernel_obj_`echo "${LINUX_OBJ_ARG}" | $as_tr_sh`
+  if eval "test \"\${${cr_cvname}+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-        cr_cv_cxx_voidp=no
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    if test -d "${LINUX_OBJ_ARG}"; then
+      # Check for version.h
 
-	  #ifndef __cplusplus
-	      #error __cplusplus must be defined in a C++ compilation!
-	  #endif
+  if test -r ${LINUX_OBJ_ARG}/include/linux/version.h; then
+    cr_tmp=`  $PERL -- - "${LINUX_OBJ_ARG}" "$KCC -E -I${LINUX_OBJ_ARG}/include -D__KERNEL__ -DMODULE $CR_KTYPE_CPPFLAGS $CPPFLAGS" <<'_EOF_'
 
-int
-main ()
-{
- int a[(($ac_cv_sizeof_void_p == sizeof(void *))? 1 : -1)];
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { 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
-  cr_cv_cxx_voidp=yes
+    my ($srcdir, $cpp_cmd) = @ARGV;
+    my $stamp = time;
+    $cpp_cmd =~ s/([#()])/\\${LINUX_OBJ_ARG}/g; # quote problematic shell metachars
+    FILE: foreach my $file qw(linux/version.h linux/utsrelease.h generated/utsrelease.h) {
+      my $path = "$srcdir/include/$file";
+      next FILE unless (-f $path);
+      open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
+      LINE: while (<F>) {
+        next LINE if(/^#/);
+        if ((my $uts) = /=${stamp}->"(2\.[46]\.[0-9].*)"<-/o) {
+          print "$uts\n";
+          exit 0;
+        }
+      }
+      close(F) || exit 1;
+    }
+    exit 1;
+
+_EOF_
+`
+    test $? = 0 || cr_tmp='no UTS_RELEASE could be extracted'
+  else
+    cr_tmp='include/linux/version.h missing'
+  fi
+
+      # Check for .config if required
+      if expr "$cr_tmp" : '2\.[46]\.' >/dev/null; then
+        test -r "${LINUX_OBJ_ARG}/.config" || cr_tmp='.config missing'
+      fi
+    else
+      cr_tmp='not found'
+    fi
+    eval "$cr_cvname='$cr_tmp'"
+    unset cr_tmp
+
+fi
+
+  eval "cr_result=\$$cr_cvname"
+  unset cr_cvname
+  if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
+    echo "$as_me:$LINENO: result: found version $cr_result" >&5
+echo "${ECHO_T}found version $cr_result" >&6
+  else
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+  fi
+  # Check that version appears acceptible
+
+  if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
+    cr_linux_obj_ver="$cr_result"
+  else
+    cr_linux_obj_ver=''
+  fi
+
+
+
+  if test -z "$cr_linux_obj_ver"; then
+    { { echo "$as_me:$LINENO: error: Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" >&5
+echo "$as_me: error: Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    :
+  fi
+
+    LINUX_OBJ="${LINUX_OBJ_ARG}"
+  else
+    if test -z "$LINUX_OBJ_ARG"; then
+      cr_tmp_ver=`uname -r`
+    elif expr "$LINUX_OBJ_ARG" : '2\.[46]\.' >/dev/null; then
+      cr_tmp_ver="$LINUX_OBJ_ARG"
+    else
+      { { echo "$as_me:$LINENO: error: --with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" >&5
+echo "$as_me: error: --with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_ver_patt="`echo $cr_tmp_ver | sed -e 's/\./\\\\./g;'`\$"
+    # Search standard locations
+    for cr_linux_dir in \
+			/lib/modules/${cr_tmp_ver}/build \
+			/usr/src/linux-${cr_tmp_ver}-obj \
+			/usr/src/linux-${cr_tmp_ver} \
+	     		/usr/src/kernels/${cr_tmp_ver} \
+			; do
+
+  echo "$as_me:$LINENO: checking for Linux kernel build in ${cr_linux_dir}" >&5
+echo $ECHO_N "checking for Linux kernel build in ${cr_linux_dir}... $ECHO_C" >&6
+  cr_cvname=cr_cv_kernel_obj_`echo "${cr_linux_dir}" | $as_tr_sh`
+  if eval "test \"\${${cr_cvname}+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test -d "${cr_linux_dir}"; then
+      # Check for version.h
+
+  if test -r ${cr_linux_dir}/include/linux/version.h; then
+    cr_tmp=`  $PERL -- - "${cr_linux_dir}" "$KCC -E -I${cr_linux_dir}/include -D__KERNEL__ -DMODULE $CR_KTYPE_CPPFLAGS $CPPFLAGS" <<'_EOF_'
+
+    my ($srcdir, $cpp_cmd) = @ARGV;
+    my $stamp = time;
+    $cpp_cmd =~ s/([#()])/\\${cr_linux_dir}/g; # quote problematic shell metachars
+    FILE: foreach my $file qw(linux/version.h linux/utsrelease.h generated/utsrelease.h) {
+      my $path = "$srcdir/include/$file";
+      next FILE unless (-f $path);
+      open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
+      LINE: while (<F>) {
+        next LINE if(/^#/);
+        if ((my $uts) = /=${stamp}->"(2\.[46]\.[0-9].*)"<-/o) {
+          print "$uts\n";
+          exit 0;
+        }
+      }
+      close(F) || exit 1;
+    }
+    exit 1;
+
+_EOF_
+`
+    test $? = 0 || cr_tmp='no UTS_RELEASE could be extracted'
+  else
+    cr_tmp='include/linux/version.h missing'
+  fi
+
+      # Check for .config if required
+      if expr "$cr_tmp" : '2\.[46]\.' >/dev/null; then
+        test -r "${cr_linux_dir}/.config" || cr_tmp='.config missing'
+      fi
+    else
+      cr_tmp='not found'
+    fi
+    eval "$cr_cvname='$cr_tmp'"
+    unset cr_tmp
 
 fi
-echo "$as_me:$LINENO: result: $cr_cv_cxx_voidp" >&5
-echo "${ECHO_T}$cr_cv_cxx_voidp" >&6
-    fi
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    if test x"$cr_cv_cxx_is_cxx$cr_cv_cxx_voidp" != xyesyes; then
-      CXX=no
-    fi
+  eval "cr_result=\$$cr_cvname"
+  unset cr_cvname
+  if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
+    echo "$as_me:$LINENO: result: found version $cr_result" >&5
+echo "${ECHO_T}found version $cr_result" >&6
+  else
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
   fi
+  # Check that version appears acceptible
 
-fi
+  if expr "$cr_result" : ${cr_ver_patt} >/dev/null; then
+    cr_linux_obj_ver="$cr_result"
+  else
+    cr_linux_obj_ver=''
+  fi
 
-################################################################################
-# Check libraries
-################################################################################
 
-if test x"$cr_build_libcr" = xyes; then
-# Check for a sufficiently new glibc
-# XXX: What is our true lower bound?
+      if test -n "$cr_linux_obj_ver"; then
+        LINUX_OBJ="${cr_linux_dir}"
+        break
+      fi
+    done
 
-    echo "$as_me:$LINENO: checking for GNU libc version >= 2.2" >&5
-echo $ECHO_N "checking for GNU libc version >= 2.2... $ECHO_C" >&6
-if test "${cr_cv_check_glibc_2_2_or_higher+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+  if test -z "$cr_linux_obj_ver"; then
+    { { echo "$as_me:$LINENO: error: Could not find a directory containing a Linux kernel ${cr_tmp_ver} build.  Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" >&5
+echo "$as_me: error: Could not find a directory containing a Linux kernel ${cr_tmp_ver} build.  Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    :
+  fi
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    unset cr_tmp_ver
+  fi
 
-	#include <features.h>
-	#ifndef __GLIBC_PREREQ
-	    #define __GLIBC_PREREQ(maj, min) \
-		((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
-	#endif
-	#if !__GLIBC_PREREQ(2, 2)
-	    #error "Bad glibc version"
-	#endif
-	extern int gnu_get_libc_version(void); /* Ensures this *is* glibc */
 
-int
-main ()
-{
+  if test -n "$cr_linux_obj_ver"; then
 
-	return !gnu_get_libc_version();
+  cr_linux_src_ver=''
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  cr_cv_check_glibc_2_2_or_higher=yes
+    if test "${LINUX_SRC_ARG+set}${cr_cv_var_LINUX_SRC_ARG+set}" = setset; then
+    if test "$LINUX_SRC_ARG" != "$cr_cv_var_LINUX_SRC_ARG"; then
+      { { echo "$as_me:$LINENO: error: Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG).  Remove '$cache_file' before re-running configure." >&5
+echo "$as_me: error: Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG).  Remove '$cache_file' before re-running configure." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  elif test "${cr_cv_var_LINUX_SRC_ARG+set}" = set; then
+    LINUX_SRC_ARG="$cr_cv_var_LINUX_SRC_ARG"
+  fi
+
+  if expr X"$LINUX_SRC_ARG" : X/ >/dev/null; then
+    cr_list="$LINUX_SRC_ARG"
+  elif test -n "$LINUX_SRC_ARG"; then
+    { { echo "$as_me:$LINENO: error: --with-linux-src argument '$LINUX_SRC_ARG' is not a full path" >&5
+echo "$as_me: error: --with-linux-src argument '$LINUX_SRC_ARG' is not a full path" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    # Search standard locations
+    cr_list="${LINUX_OBJ} \
+	     /lib/modules/$cr_linux_obj_ver/source \
+	     /usr/src/linux-$cr_linux_obj_ver \
+	     /usr/src/kernels/$cr_linux_obj_ver"
+  fi
+  for cr_linux_dir in $cr_list; do
+
+  echo "$as_me:$LINENO: checking for Linux kernel source in $cr_linux_dir" >&5
+echo $ECHO_N "checking for Linux kernel source in $cr_linux_dir... $ECHO_C" >&6
+  cr_cvname=cr_cv_kernel_src_`echo "$cr_linux_dir" | $as_tr_sh`
+  if eval "test \"\${${cr_cvname}+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-cr_cv_check_glibc_2_2_or_higher=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+    cr_tmp=''
+    if test -e "$cr_linux_dir/Makefile"; then
+      # First try "asking" the Makefile
+      # If a .config does not exist, then make may complain if/when the main Makefile
+      # tries to include it.  The -k and 2>/dev/null take care of that.
+      cr_tmp=`(make -k echo_kver --no-print-directory -C $cr_linux_dir -f - 2>/dev/null | grep '^2\.[46]\.') <<'_EOF_'
+echo_kver:
+	@echo '$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)'
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_check_glibc_2_2_or_higher" >&5
-echo "${ECHO_T}$cr_cv_check_glibc_2_2_or_higher" >&6
+include Makefile
+_EOF_`
+      expr "$cr_tmp" : '2\.[46]\.' >/dev/null || cr_tmp='' # Reject if not matched to pattern
 
-  if eval test $cr_cv_check_glibc_2_2_or_higher = yes; then
-    :
-  else
-    cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+      # Second try grepping the Makefile
+      if test -z "$cr_tmp"; then
+        # Note the use of [] for m4 quoting, since the pattern contains [ and ]
+        cr_linux_ver1=`sed -n -e '/^VERSION[ \t]*=[ \t]*\([0-9]\+\).*$/ {s//\1/p;q;}' "$cr_linux_dir/Makefile"`
+        cr_linux_ver2=`sed -n -e '/^PATCHLEVEL[ \t]*=[ \t]*\([0-9]\+\).*$/ {s//\1/p;q;}' "$cr_linux_dir/Makefile"`
+        cr_linux_ver3=`sed -n -e '/^SUBLEVEL[ \t]*=[ \t]*\([0-9]\+\).*$/ {s//\1/p;q;}' "$cr_linux_dir/Makefile"`
+        cr_tmp="${cr_linux_ver1}.${cr_linux_ver2}.${cr_linux_ver3}"
+        expr "$cr_tmp" : '2\.[46]\.' >/dev/null || cr_tmp='' # Reject if not matched to pattern
+      fi
 
-_ACEOF
+      # ONLY if we found something but without SUBLEVEL, then use version.h to get it.
+      if expr "$cr_tmp" : '2\.[46]\.$' >/dev/null; then
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+  if test -r $cr_linux_dir/include/linux/version.h; then
+    cr_tmp=`  $PERL -- - "$cr_linux_dir" "$KCC -E -I$cr_linux_dir/include -D__KERNEL__ -DMODULE $CR_KTYPE_CPPFLAGS $CPPFLAGS" <<'_EOF_'
+
+    my ($srcdir, $cpp_cmd) = @ARGV;
+    my $stamp = time;
+    $cpp_cmd =~ s/([#()])/\\$cr_linux_dir/g; # quote problematic shell metachars
+    FILE: foreach my $file qw(linux/version.h linux/utsrelease.h generated/utsrelease.h) {
+      my $path = "$srcdir/include/$file";
+      next FILE unless (-f $path);
+      open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
+      LINE: while (<F>) {
+        next LINE if(/^#/);
+        if ((my $uts) = /=${stamp}->"(2\.[46]\.[0-9].*)"<-/o) {
+          print "$uts\n";
+          exit 0;
+        }
+      }
+      close(F) || exit 1;
+    }
+    exit 1;
+
+_EOF_
+`
+    test $? = 0 || cr_tmp='no UTS_RELEASE could be extracted'
   else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-   { { echo "$as_me:$LINENO: error: the C library does not appear to be glibc 2.2 or higher." >&5
-echo "$as_me: error: the C library does not appear to be glibc 2.2 or higher." >&2;}
-   { (exit 1); exit 1; }; }
+    cr_tmp='include/linux/version.h missing'
   fi
 
+        # Now trim EXTRAVERSION, or yield empty if no pattern match
+        cr_tmp=`echo $cr_tmp | sed -n -e '/^\(2\.[46]\.[0-9]\+\).*$/ {s//\1/p;q;}'`
+      fi
 
+      test -n "$cr_tmp" || cr_tmp='not found'
+    elif test -d "$cr_linux_dir"; then
+      cr_tmp='Makefile missing'
+    else
+      cr_tmp='not found'
+    fi
+    eval "$cr_cvname='$cr_tmp'"
+    unset cr_tmp
 
-# Checks for required libraries and fail if they are not found
-# Note that we are NOT adding them to LIBS, just verifying their presence.
-echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
-echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+fi
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlsym ();
-int
-main ()
-{
-dlsym ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlsym=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  eval "cr_result=\$$cr_cvname"
+  unset cr_cvname
+  if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
+    echo "$as_me:$LINENO: result: found version $cr_result" >&5
+echo "${ECHO_T}found version $cr_result" >&6
+  else
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+  fi
+  # Check that version is acceptible (exact match, or a prefix with the next char non-numeric)
+  case "$cr_linux_obj_ver" in
+    ${cr_result}|${cr_result}[^0-9]*)      # the outer [] is m4 quoting
+        cr_linux_src_ver="$cr_result";;
+    *)  cr_linux_src_ver='';;
+  esac
 
-ac_cv_lib_dl_dlsym=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
-if test $ac_cv_lib_dl_dlsym = yes; then
-  :
-else
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+      if test -n "$cr_linux_src_ver"; then
+	LINUX_SRC="$cr_linux_dir"
+	break
+      fi
+  done
+
+  if test -z "$cr_linux_src_ver"; then
+    { { echo "$as_me:$LINENO: error: Could not locate source directory corresponding to build directory '${LINUX_OBJ}'.  Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" >&5
+echo "$as_me: error: Could not locate source directory corresponding to build directory '${LINUX_OBJ}'.  Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    :
+  fi
 
-_ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
   else
-    echo "not updating unwritable cache $cache_file"
+    :
   fi
-fi
-rm -f confcache
-   { { echo "$as_me:$LINENO: error: required library libdl not found." >&5
-echo "$as_me: error: required library libdl not found." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pthread_create ();
-int
-main ()
-{
-pthread_create ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pthread_pthread_create=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if test -n "$cr_linux_src_ver" -a -n "$cr_linux_obj_ver"; then
 
-ac_cv_lib_pthread_pthread_create=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
-if test $ac_cv_lib_pthread_pthread_create = yes; then
-  :
-else
+    case "$cr_linux_obj_ver" in
+      2.6.*) HAVE_LINUX_2_6=yes;;
+    esac
+    LINUX_VER="$cr_linux_obj_ver"
+    CR_KERNEL=`echo $cr_linux_obj_ver | tr - _`
+    CR_KERNEL_BASE=`echo $CR_KERNEL | sed -e 's:smp\|enterprise\|bigmem\|hugemem::g'`
+    test -n "$LINUX_SRC_ARG" && cr_cv_var_LINUX_SRC_ARG="$LINUX_SRC_ARG"
+    test -n "$LINUX_OBJ_ARG" && cr_cv_var_LINUX_OBJ_ARG="$LINUX_OBJ_ARG"
+
+   if test -z "$cache_file" || \
+    test "$cache_file" = /dev/null || \
+    cmp "${LINUX_OBJ}/.config" .cached_kconfig >/dev/null 2>/dev/null; then
+   : # OK - either not caching or cached version still matches
+ else
+   if test -f .cached_kconfig; then
+     { echo "$as_me:$LINENO: WARNING: kernel configuration has changed... discarding cached results." >&5
+echo "$as_me: WARNING: kernel configuration has changed... discarding cached results." >&2;}
+     rm -f .cached_kconfig
+   fi
+   for cr_var in cr_cv_kconfig__NON_EMPTY_HACK `(set) | grep "^cr_cv_kconfig_" | cut -d= -f1`; do
+     unset $cr_var
+   done
+   cp "${LINUX_OBJ}/.config" .cached_kconfig
+ fi
+
+
+  else
+    :
+  fi
+
+
+if test -z "${HAVE_LINUX_2_6}"; then
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -22185,212 +26399,150 @@
   fi
 fi
 rm -f confcache
-   { { echo "$as_me:$LINENO: error: required library libpthread not found." >&5
-echo "$as_me: error: required library libpthread not found." >&2;}
+   { { echo "$as_me:$LINENO: error: required Linux 2.6.x kernel headers and/or build not found." >&5
+echo "$as_me: error: required Linux 2.6.x kernel headers and/or build not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-# Prep a variable for possible use in messages below
-if test x"$enable_multilib" = xyes; then
-  ldsuggest='-L/usr/lib/nptl -L/usr/lib64/nptl'
-elif test x"$ac_cv_sizeof_void_p" = x8; then
-  ldsuggest='-L/usr/lib64/nptl'
+# Module install dir
+
+echo "$as_me:$LINENO: checking directory to install kernel modules" >&5
+echo $ECHO_N "checking directory to install kernel modules... $ECHO_C" >&6
+if test -n "${CR_MODULE_DIR}"; then
+  cr_why='passed via --with-kmod-dir'
+elif test ${sysconfdir} = /etc; then
+  CR_MODULE_DIR="/lib/modules/${LINUX_VER}/extra"
+  cr_why='default when sysconfdir=/etc'
 else
-  ldsuggest='-L/usr/lib/nptl'
+  CR_MODULE_DIR="${libdir}/${PACKAGE}/${LINUX_VER}"
+  cr_why='default'
 fi
+echo "$as_me:$LINENO: result: ${CR_MODULE_DIR} ($cr_why)" >&5
+echo "${ECHO_T}${CR_MODULE_DIR} ($cr_why)" >&6
 
-# Helper for LinuxThreads probes
-# CR_LT_PROBE(cv_varname, cross_varname)
+# Checks for matching (we hope) symbol table
 
 
-# Look for LinuxThreads in the default (probably dynamic) library
-echo "$as_me:$LINENO: checking whether default pthreads library is LinuxThreads" >&5
-echo $ECHO_N "checking whether default pthreads library is LinuxThreads... $ECHO_C" >&6
-if test "${cr_cv_pt_default_lt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+  echo "$as_me:$LINENO: checking for Linux kernel symbol table" >&5
+echo $ECHO_N "checking for Linux kernel symbol table... $ECHO_C" >&6
 
-  SAVE_LIBS="$LIBS"
-  LIBS="-lpthread $LIBS"
 
-  if test "$cross_compiling" = yes; then
 
 
-  if test "${cross_linuxthreads-unset}" = unset; then
-    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_linuxthreads must be set." >&5
-echo "$as_me: error: When cross-compiling, variable cross_linuxthreads must be set." >&2;}
+    if test "${LINUX_SYSTEM_MAP+set}${cr_cv_var_LINUX_SYSTEM_MAP+set}" = setset; then
+    if test "$LINUX_SYSTEM_MAP" != "$cr_cv_var_LINUX_SYSTEM_MAP"; then
+      { { echo "$as_me:$LINENO: error: Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP).  Remove '$cache_file' before re-running configure." >&5
+echo "$as_me: error: Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP).  Remove '$cache_file' before re-running configure." >&2;}
    { (exit 1); exit 1; }; }
+    fi
+  elif test "${cr_cv_var_LINUX_SYSTEM_MAP+set}" = set; then
+    LINUX_SYSTEM_MAP="$cr_cv_var_LINUX_SYSTEM_MAP"
   fi
 
-    if test x"$cross_linuxthreads" != x0; then
-  cr_cv_pt_default_lt=yes
-else
-  cr_cv_pt_default_lt=no
-fi
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-	#include <sys/types.h>
-	#include <unistd.h>
-	#include <stdio.h>
-	#include <pthread.h>
-
-	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
-
-	int main(void) {
-	    pthread_t th;
-	    void *join_val;
-
-	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
-		fputs("Error calling pthread_create()\n", stderr);
-		return -1;
-	    }
-	    if (0 != pthread_join(th, &join_val)) {
-		fputs("Error calling pthread_join()\n", stderr);
-		return -1;
-	    }
-
-	    /* zero = NOT equal pids = LinuxThreads */
-	    return ((long)join_val == (long)getpid());
-	}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./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
-  cr_cv_pt_default_lt=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-cr_cv_pt_default_lt=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-  LIBS="$SAVE_LIBS"
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_pt_default_lt" >&5
-echo "${ECHO_T}$cr_cv_pt_default_lt" >&6
-if test x"$cr_cv_pt_default_lt" = xyes; then
-  { { echo "$as_me:$LINENO: error: linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&5
-echo "$as_me: error: linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&2;}
+    if test "${LINUX_VMLINUX+set}${cr_cv_var_LINUX_VMLINUX+set}" = setset; then
+    if test "$LINUX_VMLINUX" != "$cr_cv_var_LINUX_VMLINUX"; then
+      { { echo "$as_me:$LINENO: error: Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX).  Remove '$cache_file' before re-running configure." >&5
+echo "$as_me: error: Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX).  Remove '$cache_file' before re-running configure." >&2;}
    { (exit 1); exit 1; }; }
-fi
-
-# Now look for LinuxThreads in the static libs if we are building static ones ourself
-if test x"$enable_static" = xyes; then
-  # Look for LinuxThreads in the static library
-  echo "$as_me:$LINENO: checking whether static pthreads library is LinuxThreads" >&5
-echo $ECHO_N "checking whether static pthreads library is LinuxThreads... $ECHO_C" >&6
-if test "${cr_cv_pt_static_lt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    SAVE_LIBS="$LIBS"
-    SAVE_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS -static"
-    LIBS="-lpthread $LIBS"
+    fi
+  elif test "${cr_cv_var_LINUX_VMLINUX+set}" = set; then
+    LINUX_VMLINUX="$cr_cv_var_LINUX_VMLINUX"
+  fi
 
-  if test "$cross_compiling" = yes; then
+  LINUX_SYMTAB_CMD=""
+  # First try validating the user's (or cached) selection
+  if test -n "$LINUX_SYSTEM_MAP" ; then
 
+  if test -n ""$LINUX_SYSTEM_MAP"" -a -r ""$LINUX_SYSTEM_MAP"" && grep -e '[TD] sys_open' -e '[AB] _end' <""$LINUX_SYSTEM_MAP"" >/dev/null 2>/dev/null; then
+    if grep -B1 '[AB] _end' <""$LINUX_SYSTEM_MAP"" | grep _stext >/dev/null 2>/dev/null; then
+      # Reject "stripped" files (such as in FC2)
+      # Recognized (poorly) by _stext and _end as last two entries.
+      cr_stripped_maps="$cr_stripped_maps "$LINUX_SYSTEM_MAP""
+    else
+      LINUX_SYSTEM_MAP=""$LINUX_SYSTEM_MAP""
+      LINUX_SYMTAB_FILE=""$LINUX_SYSTEM_MAP""
+      LINUX_SYMTAB_CMD="cat "$LINUX_SYSTEM_MAP" 2>/dev/null"
+    fi
+  fi
 
-  if test "${cross_linuxthreads_static-unset}" = unset; then
-    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_linuxthreads_static must be set." >&5
-echo "$as_me: error: When cross-compiling, variable cross_linuxthreads_static must be set." >&2;}
+    if test -z "$LINUX_SYMTAB_CMD"; then
+      # The user specified a file, but we can't use it.  Abort.
+      echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6
+      { { echo "$as_me:$LINENO: error: Failed to validate \"$LINUX_SYSTEM_MAP\"" >&5
+echo "$as_me: error: Failed to validate \"$LINUX_SYSTEM_MAP\"" >&2;}
    { (exit 1); exit 1; }; }
+    fi
   fi
+  if test -z "$LINUX_SYMTAB_CMD" -a -n "$LINUX_VMLINUX" ; then
 
-    if test x"$cross_linuxthreads_static" != x0; then
-  cr_cv_pt_static_lt=yes
-else
-  cr_cv_pt_static_lt=no
-fi
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-	#include <sys/types.h>
-	#include <unistd.h>
-	#include <stdio.h>
-	#include <pthread.h>
 
-	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
+  if test -n ""$LINUX_VMLINUX"" -a -r ""$LINUX_VMLINUX"" && ($NM ""$LINUX_VMLINUX"" | grep -e '[TD] sys_open' -e '[AB] _end') >/dev/null 2>/dev/null; then
+    LINUX_VMLINUX=""$LINUX_VMLINUX""
+    LINUX_SYMTAB_FILE=""$LINUX_VMLINUX""
+    LINUX_SYMTAB_CMD="$NM "$LINUX_VMLINUX" 2>/dev/null"
+  fi
 
-	int main(void) {
-	    pthread_t th;
-	    void *join_val;
+    if test -z "$LINUX_SYMTAB_CMD"; then
+      # The user specified a file, but we can't use it.  Abort.
+      echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6
+      { { echo "$as_me:$LINENO: error: Failed to validate \"$LINUX_VMLINUX\"" >&5
+echo "$as_me: error: Failed to validate \"$LINUX_VMLINUX\"" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+  # Next try searching for System.map or vmlinux in standard locations
+  # Note we use the kernel version found in the headers, not `uname -r`
+  if test -z "$LINUX_SYMTAB_CMD" ; then
+    for cr_file_pattern in "$LINUX_OBJ/@-$LINUX_VER" \
+			   "/boot/@-$LINUX_VER"      \
+			   "/@-$LINUX_VER"           \
+			   "$LINUX_OBJ/@"            \
+			   "/usr/lib/debug/boot/@-$LINUX_VER" \
+			   "/usr/lib/debug/lib/modules/$LINUX_VER/@" \
+			; do
+      # Try System.map in the given location
+      cr_file=`echo $cr_file_pattern | sed -e 's|@|System.map|'`
 
-	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
-		fputs("Error calling pthread_create()\n", stderr);
-		return -1;
-	    }
-	    if (0 != pthread_join(th, &join_val)) {
-		fputs("Error calling pthread_join()\n", stderr);
-		return -1;
-	    }
+  if test -n "$cr_file" -a -r "$cr_file" && grep -e '[TD] sys_open' -e '[AB] _end' <"$cr_file" >/dev/null 2>/dev/null; then
+    if grep -B1 '[AB] _end' <"$cr_file" | grep _stext >/dev/null 2>/dev/null; then
+      # Reject "stripped" files (such as in FC2)
+      # Recognized (poorly) by _stext and _end as last two entries.
+      cr_stripped_maps="$cr_stripped_maps $cr_file"
+    else
+      LINUX_SYSTEM_MAP="$cr_file"
+      LINUX_SYMTAB_FILE="$cr_file"
+      LINUX_SYMTAB_CMD="cat $cr_file 2>/dev/null"
+    fi
+  fi
 
-	    /* zero = NOT equal pids = LinuxThreads */
-	    return ((long)join_val == (long)getpid());
-	}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./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
-  cr_cv_pt_static_lt=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+      if test -n "$LINUX_SYMTAB_CMD"; then
+	break
+      fi
+      # Try vmlinux in the given location
+      cr_file=`echo $cr_file_pattern | sed -e 's|@|vmlinux|'`
 
-( exit $ac_status )
-cr_cv_pt_static_lt=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
 
-    LIBS="$SAVE_LIBS"
-    LDFLAGS="$SAVE_LDFLAGS"
+  if test -n "$cr_file" -a -r "$cr_file" && ($NM "$cr_file" | grep -e '[TD] sys_open' -e '[AB] _end') >/dev/null 2>/dev/null; then
+    LINUX_VMLINUX="$cr_file"
+    LINUX_SYMTAB_FILE="$cr_file"
+    LINUX_SYMTAB_CMD="$NM $cr_file 2>/dev/null"
+  fi
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_pt_static_lt" >&5
-echo "${ECHO_T}$cr_cv_pt_static_lt" >&6
-  if test x"$cr_cv_pt_static_lt" = xyes; then
-    { echo "$as_me:$LINENO: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&5
-echo "$as_me: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&2;}
-    cr_static_link_warning="yes"
-    if test x"$enable_all_static" = xyes; then
-      cat >confcache <<\_ACEOF
+      if test -n "$LINUX_SYMTAB_CMD"; then
+	break
+      fi
+    done
+  fi
+  # Announce our result
+  if test -z "$LINUX_SYMTAB_CMD"; then
+    LINUX_SYMTAB_CMD="true"
+    echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6
+    cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 # scripts and configure runs, see configure's option --config-cache.
@@ -22425,746 +26577,296 @@
       # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n \
 	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-      { { echo "$as_me:$LINENO: error: static linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&5
-echo "$as_me: error: static linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-
-# Check for atfork handling
-
-for ac_func in __register_atfork
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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 "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# Check for pthread_attr_setstacksize
-SAVE_LIBS="$LIBS"
-LIBS="-lpthread $LIBS"
-
-for ac_func in pthread_attr_setstacksize
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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 "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+rm -f confcache
+    if test -n "$cr_stripped_maps"; then
+      { echo "$as_me:$LINENO: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&5
+echo "$as_me: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&2;}
+      { { echo "$as_me:$LINENO: error: Failed to locate kernel symbol table.  Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." >&5
+echo "$as_me: error: Failed to locate kernel symbol table.  Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." >&2;}
+   { (exit 1); exit 1; }; }
+    else
+      { { echo "$as_me:$LINENO: error: Failed to locate kernel symbol table.  Try using --with-system-map or --with-vmlinux." >&5
+echo "$as_me: error: Failed to locate kernel symbol table.  Try using --with-system-map or --with-vmlinux." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    echo "$as_me:$LINENO: result: $LINUX_SYMTAB_FILE" >&5
+echo "${ECHO_T}$LINUX_SYMTAB_FILE" >&6
+    test -n "$LINUX_SYSTEM_MAP" && cr_cv_var_LINUX_SYSTEM_MAP="$LINUX_SYSTEM_MAP"
+    test -n "$LINUX_VMLINUX" && cr_cv_var_LINUX_VMLINUX="$LINUX_VMLINUX"
 
-fi
-done
+   if test -z "$cache_file" || \
+    test "$cache_file" = /dev/null || \
+    cmp "${LINUX_SYMTAB_FILE}" .cached_ksymtab >/dev/null 2>/dev/null; then
+   : # OK - either not caching or cached version still matches
+ else
+   if test -f .cached_ksymtab; then
+     { echo "$as_me:$LINENO: WARNING: kernel symbol table has changed... discarding cached results." >&5
+echo "$as_me: WARNING: kernel symbol table has changed... discarding cached results." >&2;}
+     rm -f .cached_ksymtab
+   fi
+   for cr_var in cr_cv_ksymtab__NON_EMPTY_HACK `(set) | grep "^cr_cv_ksymtab_" | cut -d= -f1`; do
+     unset $cr_var
+   done
+   cp "${LINUX_SYMTAB_FILE}" .cached_ksymtab
+ fi
 
-LIBS="$SAVE_LIBS"
+  fi
 
-# Look for prctl(PR_SET_PDEATHSIG, ...)
-echo "$as_me:$LINENO: checking for pctrl()" >&5
-echo $ECHO_N "checking for pctrl()... $ECHO_C" >&6
-if test "${cr_cv_prctl+set}" = set; then
+
+# Setup CR_KARCH to enable 32-bit user-space on 64-bit kernels
+CR_KARCH=$CR_ARCH
+if test $cr_wordsize = 4; then
+  # Count pointer hex digits in the System.map to id a 64-bit kernel
+  # Based on logic provided by Alan Woodland
+  echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-    #include <sys/prctl.h>
+  echo "$as_me:$LINENO: checking if kernel and user-space wordsize match" >&5
+echo $ECHO_N "checking if kernel and user-space wordsize match... $ECHO_C" >&6
+  if eval $LINUX_SYMTAB_CMD | head | $EGREP '^[a-f0-9]{16}' >/dev/null 2>&1;then
+    echo "$as_me:$LINENO: result: no (32-bit user-space with 64-bit kernel)" >&5
+echo "${ECHO_T}no (32-bit user-space with 64-bit kernel)" >&6
+    case $CR_KARCH in
+      i386)  CR_KARCH=x86_64;;
+      ppc)   CR_KARCH=ppc64;;
+      sparc) CR_KARCH=sparc64;;
+    esac
+  else
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  fi
+fi
 
-int
-main ()
-{
 
-    int rc = prctl(PR_SET_PDEATHSIG, 0);
+# Configure automake/kbuild glue
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  cr_cv_prctl=yes
+
+  echo "$as_me:$LINENO: checking for parameters to interface GNU automake with Linux kbuild" >&5
+echo $ECHO_N "checking for parameters to interface GNU automake with Linux kbuild... $ECHO_C" >&6
+if test "${cr_cv_KBUILD_MAKE_ARGS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-cr_cv_prctl=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+    if grep KBUILD_EXTMOD ${LINUX_SRC}/Makefile >/dev/null 2>/dev/null; then
+      cr_cv_KBUILD_MAKE_ARGS='KBUILD_EXTMOD=$(builddir)'
+    else
+      cr_cv_KBUILD_MAKE_ARGS='SUBDIRS=$(builddir) modules'
+    fi
+    if test "${LINUX_OBJ}" != "${LINUX_SRC}"; then
+      cr_cv_KBUILD_MAKE_ARGS="${cr_cv_KBUILD_MAKE_ARGS} O=${LINUX_OBJ}"
+    fi
+    if test x$enable_kbuild_verbose = xyes; then
+      cr_cv_KBUILD_MAKE_ARGS="${cr_cv_KBUILD_MAKE_ARGS} V=1"
+    fi
+    if test x$cross_compiling = xyes; then
+      cr_cv_KBUILD_MAKE_ARGS="$cr_cv_KBUILD_MAKE_ARGS ARCH=$CR_KARCH CROSS_COMPILE=$host_alias-"
+    fi
 
 fi
-echo "$as_me:$LINENO: result: $cr_cv_prctl" >&5
-echo "${ECHO_T}$cr_cv_prctl" >&6
-
-  if test x$cr_cv_prctl = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PRCTL 1
-_ACEOF
-
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PRCTL 0
-_ACEOF
-
-  fi
-
+echo "$as_me:$LINENO: result: $cr_cv_KBUILD_MAKE_ARGS" >&5
+echo "${ECHO_T}$cr_cv_KBUILD_MAKE_ARGS" >&6
+  KBUILD_MAKE_ARGS="$cr_cv_KBUILD_MAKE_ARGS"
+    # Note: we'll actually try the result in CR_SET_KCFLAGS
 
 
+# Configure module compile flags and perform a sanity check
 
-# Check various constants needed for asm
-SAVE_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I${TOP_SRCDIR}/include"
+  case "$CR_KARCH" in
+    ppc64)
+      CR_KSYM_PATTERN_DATA='[bBdDgGrRsStTvV] '
+      CR_KSYM_PATTERN_CODE='[dD] '         ;;
+    *)
+      CR_KSYM_PATTERN_DATA='[bBdDgGrRsStTvV] '
+      CR_KSYM_PATTERN_CODE='[tT] '
+      ;;
+  esac
 
-    CR_ASM_OP_HAND_CHKPT=""
 
-    echo "$as_me:$LINENO: checking for value of CR_ASM_OP_HAND_CHKPT" >&5
-echo $ECHO_N "checking for value of CR_ASM_OP_HAND_CHKPT... $ECHO_C" >&6
-if test "${cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+CR_KSYM_IMPORT_DECLS="${TOP_BUILDDIR}/.import_decls"
 
-    cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=""
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
-int
-main ()
-{
-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) >= 0)];
-test_array [0] = 0
+echo '/* This file is autogenerated - do not edit or remove */' > $CR_KSYM_IMPORT_DECLS
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
-int
-main ()
-{
-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) <= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+CR_KSYM_IMPORT_CALLS="${TOP_BUILDDIR}/.import_calls"
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
-int
-main ()
-{
-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) < 0)];
-test_array [0] = 0
+echo '/* This file is autogenerated - do not edit or remove */' > $CR_KSYM_IMPORT_CALLS
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
-int
-main ()
-{
-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) >= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
-int
-main ()
-{
-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) <= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  ac_hi=$ac_mid
+  echo "$as_me:$LINENO: checking for flags to compile Linux kernel probes" >&5
+echo $ECHO_N "checking for flags to compile Linux kernel probes... $ECHO_C" >&6
+if test "${cr_cv_kconfig_kcflags+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=$ac_lo;;
-'')  ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  rm -rf conftestdir
+  mkdir conftestdir
+  echo '#include <linux/sched.h>' > conftestdir/conftest.c
+  echo 'int foo = 0;' >> conftestdir/conftest.c
+  echo 'obj-m := conftest.o' >conftestdir/Makefile
+  unset cr_tmp
+  echo "make -C ${LINUX_SRC} builddir=\"`pwd`/conftestdir\" ${KBUILD_MAKE_ARGS} CC=\"${KCC}\" V=1" >&5
+  make -C ${LINUX_SRC} builddir="`pwd`/conftestdir" ${KBUILD_MAKE_ARGS} CC="${KCC}" V=1 >conftestdir/output 2>&1 </dev/null
+  if test $? = 0; then cr_tmp=`grep -m1 conftest\\.c conftestdir/output | sed -e "s:^[ 	]*${KCC}::"`; fi
+  cat conftestdir/output >&5
+  if test "${cr_tmp:+OK}" != OK; then
+      echo "$as_me:$LINENO: result: FAILED" >&5
+echo "${ECHO_T}FAILED" >&6
+      cat conftestdir/output
+      if $EGREP 'include/(asm|linux)/[a-zA-Z0-9_-]+\.h:' conftestdir/output >/dev/null 2>&1; then
+        { echo "$as_me:$LINENO: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&5
+echo "$as_me: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&2;}
+	ver=`$KCC --version | head -1`
+        { echo "$as_me:$LINENO: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&5
+echo "$as_me: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&2;}
+	if test $cr_wordsize -gt $ac_cv_sizeof_void_p; then
+	  echo "$KCC" | grep -e '-m64' >/dev/null 2>/dev/null
+	  if test $? != 0; then
+            { echo "$as_me:$LINENO: WARNING: You might try setting KCC='$KCC -m64'" >&5
+echo "$as_me: WARNING: You might try setting KCC='$KCC -m64'" >&2;}
+          fi
+        fi
+      fi
+      if grep -i 'permission denied' conftestdir/output >/dev/null 2>&1; then
+        { echo "$as_me:$LINENO: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&5
+echo "$as_me: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&2;}
+      fi
+      rm -rf conftestdir
+      { { echo "$as_me:$LINENO: error: Failed test run of kernel make/kbuild failed (see above)" >&5
+echo "$as_me: error: Failed test run of kernel make/kbuild failed (see above)" >&2;}
    { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
-long longval () { return CR_OP_HAND_CHKPT; }
-unsigned long ulongval () { return CR_OP_HAND_CHKPT; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((CR_OP_HAND_CHKPT) < 0)
-    {
-      long i = longval ();
-      if (i != (CR_OP_HAND_CHKPT))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
+  fi
+  rm -rf conftestdir
+  cr_cv_kconfig_kcflags=''
+  prev_del=''
+  prev_inc=''
+  for arg in ${cr_tmp}; do
+    if test -n "$prev_del"; then # skip this arg at request of prev arg
+      prev_del=''
+      continue
+    fi
+    arg=`echo $arg | tr -d "\"'"` # remove quote marks
+    if test -n "$prev_inc"; then # prev arg says this arg is an -include
+      prev_inc=''
+      case "$arg" in
+	*include/linux/modversions.h) continue;;
+	/*) arg="-include $arg";;
+	*) arg="-include ${LINUX_OBJ}/$arg";;
+      esac
+    else
+      case "$arg" in
+	-o) prev_del=1; continue;;
+	-include) prev_inc=1; continue;;
+	-c) continue;;
+	conftest.c) continue;;
+	/*/conftest.c) continue;;
+	-Wp,-MD,*) continue;;
+	-Wp,-MMD,*) continue;;
+	-O[1-9]) continue;;
+	-I/*) ;;
+	-I*) arg=`echo $arg | sed -e "s:-I:-I${LINUX_OBJ}/:"`;;
+      esac
+    fi
+    cr_cv_kconfig_kcflags="$cr_cv_kconfig_kcflags $arg"
+  done
+fi
+echo "$as_me:$LINENO: result: $cr_cv_kconfig_kcflags" >&5
+echo "${ECHO_T}$cr_cv_kconfig_kcflags" >&6
+  KCFLAGS="$cr_cv_kconfig_kcflags"
+    echo "$as_me:$LINENO: checking if autoconf.h is included implicitly" >&5
+echo $ECHO_N "checking if autoconf.h is included implicitly... $ECHO_C" >&6
+  if echo "$KCFLAGS" | grep 'include [^ ]*/autoconf\.h' >/dev/null 2>&1; then
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6;
   else
-    {
-      unsigned long i = ulongval ();
-      if (i != (CR_OP_HAND_CHKPT))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6;
+    cat >>confdefs.h <<\_ACEOF
+#define CR_NEED_AUTOCONF_H 1
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./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
-  cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&5
-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&6
-  if test -n "$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"; then
-    CR_ASM_OP_HAND_CHKPT="$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"
-  fi
 
-  if test -n "$CR_ASM_OP_HAND_CHKPT"; then
-    cat >>confdefs.h <<_ACEOF
-#define CR_ASM_OP_HAND_CHKPT $CR_ASM_OP_HAND_CHKPT
-_ACEOF
+  fi
+  # Do these init steps early, in case first CR_FIND_KSYM is a conditional call
 
 
 
-  fi
 
+# Now we can check if SYMTAB matches the kernel
 
-    CR_ASM_CHECKPOINT_STUB=""
+  echo "$as_me:$LINENO: checking for SMP kernel source" >&5
+echo $ECHO_N "checking for SMP kernel source... $ECHO_C" >&6
 
-    echo "$as_me:$LINENO: checking for value of CR_ASM_CHECKPOINT_STUB" >&5
-echo $ECHO_N "checking for value of CR_ASM_CHECKPOINT_STUB... $ECHO_C" >&6
-if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB+set}" = set; then
+    if test "${cr_cv_kconfig_smp_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=""
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "blcr_common.h.in"
-int
-main ()
-{
-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) >= 0)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include "blcr_common.h.in"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+	#ifdef CR_NEED_AUTOCONF_H
+	  #include <linux/autoconf.h>
+	#endif
+	#ifndef CONFIG_SMP
+	    choke me
+	#endif
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) <= $ac_mid)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -23192,142 +26894,106 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_smp_source=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_smp_source=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "blcr_common.h.in"
-int
-main ()
-{
-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) < 0)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "blcr_common.h.in"
-int
-main ()
-{
-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) >= $ac_mid)];
-test_array [0] = 0
+fi
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  cr_result=$cr_cv_kconfig_smp_source
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+  if test $cr_result = yes; then
+    :
+  else
+    :
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6;
+  cr_kernel_smp=$cr_result
+  echo "$as_me:$LINENO: checking for SMP kernel symbol table" >&5
+echo $ECHO_N "checking for SMP kernel symbol table... $ECHO_C" >&6
+  cr_symtab_smp=no
+  if test -n "`eval $LINUX_SYMTAB_CMD | grep del_timer_sync 2>/dev/null | grep -v try_to_del_`"; then
+    cr_symtab_smp=yes
+  fi
+  echo "$as_me:$LINENO: result: $cr_symtab_smp" >&5
+echo "${ECHO_T}$cr_symtab_smp" >&6;
+  if test "$cr_kernel_smp" != "$cr_symtab_smp"; then
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+    if test "$cr_kernel_smp" = yes; then
+      { { echo "$as_me:$LINENO: error: Kernel source is configured SMP but the kernel symbol table is not.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." >&5
+echo "$as_me: error: Kernel source is configured SMP but the kernel symbol table is not.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." >&2;}
+   { (exit 1); exit 1; }; }
+    else
+      { { echo "$as_me:$LINENO: error: Kernel source is configured uni-processor but the kernel symbol table is SMP.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." >&5
+echo "$as_me: error: Kernel source is configured uni-processor but the kernel symbol table is SMP.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+
+
+## Check for optional kernel headers...
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for linux/syscalls.h" >&5
+echo $ECHO_N "checking kernel for linux/syscalls.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include "blcr_common.h.in"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <linux/syscalls.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) <= $ac_mid)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -23355,129 +27021,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=$ac_lo;;
-'')  ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "blcr_common.h.in"
-long longval () { return _CR_CHECKPOINT_STUB; }
-unsigned long ulongval () { return _CR_CHECKPOINT_STUB; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((_CR_CHECKPOINT_STUB) < 0)
-    {
-      long i = longval ();
-      if (i != (_CR_CHECKPOINT_STUB))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (_CR_CHECKPOINT_STUB))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
 
-  ;
-  return 0;
-}
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_SYSCALLS_H 1
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./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
-  cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+     HAVE_LINUX_SYSCALLS_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_SYSCALLS_H 0
+_ACEOF
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&5
-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&6
-  if test -n "$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"; then
-    CR_ASM_CHECKPOINT_STUB="$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"
+     HAVE_LINUX_SYSCALLS_H=''
   fi
 
-  if test -n "$CR_ASM_CHECKPOINT_STUB"; then
-    cat >>confdefs.h <<_ACEOF
-#define CR_ASM_CHECKPOINT_STUB $CR_ASM_CHECKPOINT_STUB
-_ACEOF
 
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-  fi
-    # ICK!
 
-    CR_ASM_OP_HAND_ABORT=""
 
-    echo "$as_me:$LINENO: checking for value of CR_ASM_OP_HAND_ABORT" >&5
-echo $ECHO_N "checking for value of CR_ASM_OP_HAND_ABORT... $ECHO_C" >&6
-if test "${cr_cv_compute_int_CR_ASM_OP_HAND_ABORT+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for linux/pspace.h" >&5
+echo $ECHO_N "checking kernel for linux/pspace.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_LINUX_PSPACE_H+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=""
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <linux/pspace.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) >= 0)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -23505,21 +27125,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_PSPACE_H=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_PSPACE_H=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_LINUX_PSPACE_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_PSPACE_H 1
+_ACEOF
+
+     HAVE_LINUX_PSPACE_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_PSPACE_H 0
+_ACEOF
+
+     HAVE_LINUX_PSPACE_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for linux/pid_namespace.h" >&5
+echo $ECHO_N "checking kernel for linux/pid_namespace.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <linux/pid_namespace.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) <= $ac_mid)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -23547,37 +27229,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_PID_NAMESPACE_H 1
+_ACEOF
+
+     HAVE_LINUX_PID_NAMESPACE_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_PID_NAMESPACE_H 0
+_ACEOF
+
+     HAVE_LINUX_PID_NAMESPACE_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for linux/lockdep.h" >&5
+echo $ECHO_N "checking kernel for linux/lockdep.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <linux/lockdep.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) < 0)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -23605,21 +27333,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_LOCKDEP_H 1
+_ACEOF
+
+     HAVE_LINUX_LOCKDEP_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_LOCKDEP_H 0
+_ACEOF
+
+     HAVE_LINUX_LOCKDEP_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for linux/compile.h" >&5
+echo $ECHO_N "checking kernel for linux/compile.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_LINUX_COMPILE_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <linux/compile.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) >= $ac_mid)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -23647,45 +27437,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_COMPILE_H=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_COMPILE_H=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+
+  cr_result=$cr_cv_kconfig_HAVE_LINUX_COMPILE_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_COMPILE_H 1
+_ACEOF
+
+     HAVE_LINUX_COMPILE_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_COMPILE_H 0
+_ACEOF
+
+     HAVE_LINUX_COMPILE_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for linux/fdtable.h" >&5
+echo $ECHO_N "checking kernel for linux/fdtable.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_LINUX_FDTABLE_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <linux/fdtable.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) <= $ac_mid)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -23713,129 +27541,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_FDTABLE_H=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_FDTABLE_H=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=$ac_lo;;
-'')  ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/ioctl.h>
-	 #include "blcr_ioctl.h"
-long longval () { return CR_OP_HAND_ABORT; }
-unsigned long ulongval () { return CR_OP_HAND_ABORT; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((CR_OP_HAND_ABORT) < 0)
-    {
-      long i = longval ();
-      if (i != (CR_OP_HAND_ABORT))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (CR_OP_HAND_ABORT))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
 
-  ;
-  return 0;
-}
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_LINUX_FDTABLE_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_FDTABLE_H 1
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./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
-  cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+     HAVE_LINUX_FDTABLE_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_FDTABLE_H 0
+_ACEOF
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&5
-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&6
-  if test -n "$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"; then
-    CR_ASM_OP_HAND_ABORT="$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"
+     HAVE_LINUX_FDTABLE_H=''
   fi
 
-  if test -n "$CR_ASM_OP_HAND_ABORT"; then
-    cat >>confdefs.h <<_ACEOF
-#define CR_ASM_OP_HAND_ABORT $CR_ASM_OP_HAND_ABORT
-_ACEOF
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
 
-  fi
 
 
-    CR_ASM_CHECKPOINT_OMIT=""
 
-    echo "$as_me:$LINENO: checking for value of CR_ASM_CHECKPOINT_OMIT" >&5
-echo $ECHO_N "checking for value of CR_ASM_CHECKPOINT_OMIT... $ECHO_C" >&6
-if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for linux/utrace.h" >&5
+echo $ECHO_N "checking kernel for linux/utrace.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_LINUX_UTRACE_H+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=""
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include "blcr_common.h.in"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <linux/utrace.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) >= 0)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -23863,20 +27645,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_UTRACE_H=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_UTRACE_H=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_LINUX_UTRACE_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_UTRACE_H 1
+_ACEOF
+
+     HAVE_LINUX_UTRACE_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_UTRACE_H 0
+_ACEOF
+
+     HAVE_LINUX_UTRACE_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for linux/perf_event.h" >&5
+echo $ECHO_N "checking kernel for linux/perf_event.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include "blcr_common.h.in"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <linux/perf_event.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) <= $ac_mid)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -23904,36 +27749,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_PERF_EVENT_H 1
+_ACEOF
+
+     HAVE_LINUX_PERF_EVENT_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_PERF_EVENT_H 0
+_ACEOF
+
+     HAVE_LINUX_PERF_EVENT_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for linux/audit.h" >&5
+echo $ECHO_N "checking kernel for linux/audit.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_LINUX_AUDIT_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include "blcr_common.h.in"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <linux/audit.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) < 0)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -23961,20 +27853,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_AUDIT_H=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_AUDIT_H=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_LINUX_AUDIT_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_AUDIT_H 1
+_ACEOF
+
+     HAVE_LINUX_AUDIT_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_AUDIT_H 0
+_ACEOF
+
+     HAVE_LINUX_AUDIT_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for asm/elf.h" >&5
+echo $ECHO_N "checking kernel for asm/elf.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_ASM_ELF_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include "blcr_common.h.in"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <asm/elf.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) >= $ac_mid)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -24002,44 +27957,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_ASM_ELF_H=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_ASM_ELF_H=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+
+  cr_result=$cr_cv_kconfig_HAVE_ASM_ELF_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ASM_ELF_H 1
+_ACEOF
+
+     HAVE_ASM_ELF_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ASM_ELF_H 0
+_ACEOF
+
+     HAVE_ASM_ELF_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for asm/desc.h" >&5
+echo $ECHO_N "checking kernel for asm/desc.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_ASM_DESC_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include "blcr_common.h.in"
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+   #include <linux/sched.h>
+   #include <asm/desc.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) <= $ac_mid)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -24067,131 +28061,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_ASM_DESC_H=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_ASM_DESC_H=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=$ac_lo;;
-'')  ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "blcr_common.h.in"
-long longval () { return CR_CHECKPOINT_OMIT; }
-unsigned long ulongval () { return CR_CHECKPOINT_OMIT; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((CR_CHECKPOINT_OMIT) < 0)
-    {
-      long i = longval ();
-      if (i != (CR_CHECKPOINT_OMIT))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (CR_CHECKPOINT_OMIT))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
 
-  ;
-  return 0;
-}
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_ASM_DESC_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ASM_DESC_H 1
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./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
-  cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+     HAVE_ASM_DESC_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ASM_DESC_H 0
+_ACEOF
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&5
-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&6
-  if test -n "$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"; then
-    CR_ASM_CHECKPOINT_OMIT="$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"
+     HAVE_ASM_DESC_H=''
   fi
 
-  if test -n "$CR_ASM_CHECKPOINT_OMIT"; then
-    cat >>confdefs.h <<_ACEOF
-#define CR_ASM_CHECKPOINT_OMIT $CR_ASM_CHECKPOINT_OMIT
-_ACEOF
 
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-  fi
-    # ICK!
 
-    CR_ASM_SI_PID_OFFSET=""
 
-    echo "$as_me:$LINENO: checking for value of CR_ASM_SI_PID_OFFSET" >&5
-echo $ECHO_N "checking for value of CR_ASM_SI_PID_OFFSET... $ECHO_C" >&6
-if test "${cr_cv_compute_int_CR_ASM_SI_PID_OFFSET+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for asm/vsyscall32.h" >&5
+echo $ECHO_N "checking kernel for asm/vsyscall32.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=""
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <signal.h>
-	 #ifndef offsetof
-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-	 #endif
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <asm/vsyscall32.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) >= 0)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -24219,23 +28165,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ASM_VSYSCALL32_H 1
+_ACEOF
+
+     HAVE_ASM_VSYSCALL32_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ASM_VSYSCALL32_H 0
+_ACEOF
+
+     HAVE_ASM_VSYSCALL32_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for asm/i387.h" >&5
+echo $ECHO_N "checking kernel for asm/i387.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_ASM_I387_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <signal.h>
-	 #ifndef offsetof
-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-	 #endif
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <asm/i387.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) <= $ac_mid)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -24263,39 +28269,84 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_ASM_I387_H=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_ASM_I387_H=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_ASM_I387_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ASM_I387_H 1
+_ACEOF
+
+     HAVE_ASM_I387_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ASM_I387_H 0
+_ACEOF
+
+     HAVE_ASM_I387_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for linux/utsrelease.h" >&5
+echo $ECHO_N "checking kernel for linux/utsrelease.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <signal.h>
-	 #ifndef offsetof
-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-	 #endif
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <linux/utsrelease.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) < 0)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -24323,23 +28374,83 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_UTSRELEASE_H 1
+_ACEOF
+
+     HAVE_LINUX_UTSRELEASE_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_UTSRELEASE_H 0
+_ACEOF
+
+     HAVE_LINUX_UTSRELEASE_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for generated/utsrelease.h" >&5
+echo $ECHO_N "checking kernel for generated/utsrelease.h... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <signal.h>
-	 #ifndef offsetof
-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-	 #endif
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+
+   #include <generated/utsrelease.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) >= $ac_mid)];
-test_array [0] = 0
 
   ;
   return 0;
@@ -24367,48 +28478,91 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+
+  cr_result=$cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_GENERATED_UTSRELEASE_H 1
+_ACEOF
+
+     HAVE_GENERATED_UTSRELEASE_H=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_GENERATED_UTSRELEASE_H 0
+_ACEOF
+
+     HAVE_GENERATED_UTSRELEASE_H=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+## Now we check for specific kernel features...
+
+
+
+  echo "$as_me:$LINENO: checking kernel symbol table for timeval_to_jiffies" >&5
+echo $ECHO_N "checking kernel symbol table for timeval_to_jiffies... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_timeval_to_jiffies+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_cv_ksymtab_timeval_to_jiffies=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}timeval_to_jiffies$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_timeval_to_jiffies"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_timeval_to_jiffies\$" >/dev/null ; then
+        cr_cv_ksymtab_timeval_to_jiffies=0
+      fi
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <signal.h>
-	 #ifndef offsetof
-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-	 #endif
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) <= $ac_mid)];
-test_array [0] = 0
-
+int x = sizeof(&timeval_to_jiffies);
   ;
   return 0;
 }
@@ -24435,133 +28589,94 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_timeval_to_jiffies="Y$cr_cv_ksymtab_timeval_to_jiffies"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_timeval_to_jiffies="N$cr_cv_ksymtab_timeval_to_jiffies"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=$ac_lo;;
-'')  ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <signal.h>
-	 #ifndef offsetof
-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-	 #endif
-long longval () { return offsetof(struct siginfo, si_pid); }
-unsigned long ulongval () { return offsetof(struct siginfo, si_pid); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((offsetof(struct siginfo, si_pid)) < 0)
-    {
-      long i = longval ();
-      if (i != (offsetof(struct siginfo, si_pid)))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (offsetof(struct siginfo, si_pid)))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./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
-  cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+    fi
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&5
-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&6
-  if test -n "$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"; then
-    CR_ASM_SI_PID_OFFSET="$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"
-  fi
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_timeval_to_jiffies"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_timeval_to_jiffies" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol timeval_to_jiffies but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol timeval_to_jiffies but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_timeval_to_jiffies | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(timeval_to_jiffies, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-  if test -n "$CR_ASM_SI_PID_OFFSET"; then
-    cat >>confdefs.h <<_ACEOF
-#define CR_ASM_SI_PID_OFFSET $CR_ASM_SI_PID_OFFSET
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_timeval_to_jiffies $cr_addr
 _ACEOF
 
-
-
   fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-    CR_ASM_NR_ioctl=""
 
-    echo "$as_me:$LINENO: checking for value of CR_ASM_NR_ioctl" >&5
-echo $ECHO_N "checking for value of CR_ASM_NR_ioctl... $ECHO_C" >&6
-if test "${cr_cv_compute_int_CR_ASM_NR_ioctl+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for jiffies_to_timeval" >&5
+echo $ECHO_N "checking kernel symbol table for jiffies_to_timeval... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_jiffies_to_timeval+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_compute_int_CR_ASM_NR_ioctl=""
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
+    cr_cv_ksymtab_jiffies_to_timeval=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}jiffies_to_timeval$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_jiffies_to_timeval"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_jiffies_to_timeval\$" >/dev/null ; then
+        cr_cv_ksymtab_jiffies_to_timeval=0
+      fi
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((__NR_ioctl) >= 0)];
-test_array [0] = 0
-
+int x = sizeof(&jiffies_to_timeval);
   ;
   return 0;
 }
@@ -24588,21 +28703,96 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_jiffies_to_timeval="Y$cr_cv_ksymtab_jiffies_to_timeval"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_jiffies_to_timeval="N$cr_cv_ksymtab_jiffies_to_timeval"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    fi
+
+fi
+
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_jiffies_to_timeval"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_jiffies_to_timeval" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol jiffies_to_timeval but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol jiffies_to_timeval but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_jiffies_to_timeval | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(jiffies_to_timeval, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_jiffies_to_timeval $cr_addr
+_ACEOF
+
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for struct fdtable" >&5
+echo $ECHO_N "checking kernel for struct fdtable... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_STRUCT_FDTABLE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+    #include <linux/sched.h>
+    #include <linux/file.h>
+    #if HAVE_LINUX_FDTABLE_H
+      #include <linux/fdtable.h>
+    #endif
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((__NR_ioctl) <= $ac_mid)];
-test_array [0] = 0
+
+     struct fdtable y;
+     int x = sizeof(y);
 
   ;
   return 0;
@@ -24630,38 +28820,90 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_STRUCT_FDTABLE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_STRUCT_FDTABLE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_STRUCT_FDTABLE
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_FDTABLE 1
+_ACEOF
+
+     HAVE_STRUCT_FDTABLE=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_FDTABLE 0
+_ACEOF
+
+     HAVE_STRUCT_FDTABLE=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+# OK if missing
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for files_struct.next_fd" >&5
+echo $ECHO_N "checking kernel for files_struct.next_fd... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+    #include <linux/sched.h>
+    #include <linux/file.h>
+    #if HAVE_LINUX_FDTABLE_H
+      #include <linux/fdtable.h>
+    #endif
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((__NR_ioctl) < 0)];
-test_array [0] = 0
-
+struct files_struct x;
+          int tc_1 = x.next_fd;
   ;
   return 0;
 }
@@ -24688,22 +28930,88 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FILES_STRUCT_NEXT_FD 1
+_ACEOF
+
+     HAVE_FILES_STRUCT_NEXT_FD=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FILES_STRUCT_NEXT_FD 0
+_ACEOF
+
+     HAVE_FILES_STRUCT_NEXT_FD=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for fdtable.next_fd" >&5
+echo $ECHO_N "checking kernel for fdtable.next_fd... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
+/* end confdefs.h.  */
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+    #include <linux/sched.h>
+    #include <linux/file.h>
+    #if HAVE_LINUX_FDTABLE_H
+      #include <linux/fdtable.h>
+    #endif
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((__NR_ioctl) >= $ac_mid)];
-test_array [0] = 0
-
+struct fdtable x;
+          int tc_1 = x.next_fd;
   ;
   return 0;
 }
@@ -24730,46 +29038,161 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+  cr_result=$cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FDTABLE_NEXT_FD 1
+_ACEOF
+
+     HAVE_FDTABLE_NEXT_FD=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FDTABLE_NEXT_FD 0
+_ACEOF
+
+     HAVE_FDTABLE_NEXT_FD=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+# Allow only exactly one match
+if test "${HAVE_FILES_STRUCT_NEXT_FD}${HAVE_FDTABLE_NEXT_FD}" != "1"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for files_struct.max_fdset" >&5
+echo $ECHO_N "checking kernel for files_struct.max_fdset... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+    #include <linux/sched.h>
+    #include <linux/file.h>
+    #if HAVE_LINUX_FDTABLE_H
+      #include <linux/fdtable.h>
+    #endif
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((__NR_ioctl) <= $ac_mid)];
-test_array [0] = 0
-
+struct files_struct x;
+          int tc_1 = x.max_fdset;
   ;
   return 0;
 }
@@ -24796,130 +29219,84 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) cr_cv_compute_int_CR_ASM_NR_ioctl=$ac_lo;;
-'')  ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
-long longval () { return __NR_ioctl; }
-unsigned long ulongval () { return __NR_ioctl; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((__NR_ioctl) < 0)
-    {
-      long i = longval ();
-      if (i != (__NR_ioctl))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (__NR_ioctl))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
 
-  ;
-  return 0;
-}
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FILES_STRUCT_MAX_FDSET 1
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./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
-  cr_cv_compute_int_CR_ASM_NR_ioctl=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+     HAVE_FILES_STRUCT_MAX_FDSET=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FILES_STRUCT_MAX_FDSET 0
+_ACEOF
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_NR_ioctl" >&5
-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_NR_ioctl" >&6
-  if test -n "$cr_cv_compute_int_CR_ASM_NR_ioctl"; then
-    CR_ASM_NR_ioctl="$cr_cv_compute_int_CR_ASM_NR_ioctl"
+     HAVE_FILES_STRUCT_MAX_FDSET=''
   fi
 
-  if test -n "$CR_ASM_NR_ioctl"; then
-    cat >>confdefs.h <<_ACEOF
-#define CR_ASM_NR_ioctl $CR_ASM_NR_ioctl
-_ACEOF
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
 
-  fi
 
 
-    CR_ASM_NR_rt_sigreturn=""
 
-    echo "$as_me:$LINENO: checking for value of CR_ASM_NR_rt_sigreturn" >&5
-echo $ECHO_N "checking for value of CR_ASM_NR_rt_sigreturn... $ECHO_C" >&6
-if test "${cr_cv_compute_int_CR_ASM_NR_rt_sigreturn+set}" = set; then
+
+  echo "$as_me:$LINENO: checking kernel for struct path" >&5
+echo $ECHO_N "checking kernel for struct path... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_STRUCT_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=""
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/fs.h>
 int
 main ()
 {
-static int test_array [1 - 2 * !((__NR_rt_sigreturn) >= 0)];
-test_array [0] = 0
+
+     struct path y;
+     int x = sizeof(y);
 
   ;
   return 0;
@@ -24947,21 +29324,97 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_STRUCT_PATH=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_STRUCT_PATH=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_STRUCT_PATH
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_PATH 1
+_ACEOF
+
+     HAVE_STRUCT_PATH=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_PATH 0
+_ACEOF
+
+     HAVE_STRUCT_PATH=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for nameidata.path" >&5
+echo $ECHO_N "checking kernel for nameidata.path... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_NAMEIDATA_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+    #include <linux/sched.h>
+    #include <linux/fs.h>
+    #include <linux/dcache.h>
+    #include <linux/namei.h>
+    #include <linux/fs_struct.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((__NR_rt_sigreturn) <= $ac_mid)];
-test_array [0] = 0
+
+    /* Expect "struct path pwd" in fs_struct */
+    struct fs_struct s1;
+    struct path t1 = s1.pwd;
+
+    /* Expect "struct path path" used in nameidata */
+    struct nameidata s2;
+    struct path t2 = s2.path;
+
+    /* Expect d_path() and set_fs_pwd() to pass path */
+    (void)d_path(&t1, NULL, 0);
+    (void)set_fs_pwd(&s1, &t2);
 
   ;
   return 0;
@@ -24989,79 +29442,96 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_NAMEIDATA_PATH=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_NAMEIDATA_PATH=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_NAMEIDATA_PATH
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_NAMEIDATA_PATH 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((__NR_rt_sigreturn) < 0)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
+     HAVE_NAMEIDATA_PATH=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_NAMEIDATA_PATH 0
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+
+     HAVE_NAMEIDATA_PATH=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for nameidata.dentry" >&5
+echo $ECHO_N "checking kernel for nameidata.dentry... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+    #include <linux/sched.h>
+    #include <linux/fs.h>
+    #include <linux/dcache.h>
+    #include <linux/namei.h>
+    #include <linux/fs_struct.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !((__NR_rt_sigreturn) >= $ac_mid)];
-test_array [0] = 0
+
+    /* Expect "struct dentry *pwd" in fs_struct */
+    struct fs_struct s1;
+    struct dentry t1 = *s1.pwd;
+
+    /* Expect "struct dentry *dentry" in nameidata */
+    struct nameidata s2;
+    struct dentry t2 = *s2.dentry;
+
+    /* Expect d_path() and set_fs_pwd() to pass dentry */
+    (void)d_path(&t1, NULL, NULL, 0);
+    (void)set_fs_pwd(&s1, NULL, &t2);
 
   ;
   return 0;
@@ -25089,45 +29559,158 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+  cr_result=$cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_NAMEIDATA_DENTRY 1
+_ACEOF
+
+     HAVE_NAMEIDATA_DENTRY=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_NAMEIDATA_DENTRY 0
+_ACEOF
+
+     HAVE_NAMEIDATA_DENTRY=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+if test "${HAVE_NAMEIDATA_PATH}${HAVE_NAMEIDATA_DENTRY}" != "1"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for __putname" >&5
+echo $ECHO_N "checking kernel for __putname... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE___PUTNAME+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/fs.h>
 int
 main ()
 {
-static int test_array [1 - 2 * !((__NR_rt_sigreturn) <= $ac_mid)];
-test_array [0] = 0
+
+   #ifdef __putname
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&__putname);
+   #endif
 
   ;
   return 0;
@@ -25155,129 +29738,65 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE___PUTNAME=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE___PUTNAME=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=$ac_lo;;
-'')  ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <asm/unistd.h>
-	 #include <linux/unistd.h>
-long longval () { return __NR_rt_sigreturn; }
-unsigned long ulongval () { return __NR_rt_sigreturn; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((__NR_rt_sigreturn) < 0)
-    {
-      long i = longval ();
-      if (i != (__NR_rt_sigreturn))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (__NR_rt_sigreturn))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
 
-  ;
-  return 0;
-}
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE___PUTNAME
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE___PUTNAME 1
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./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
-  cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+     HAVE___PUTNAME=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE___PUTNAME 0
+_ACEOF
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&5
-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&6
-  if test -n "$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn"; then
-    CR_ASM_NR_rt_sigreturn="$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn"
+     HAVE___PUTNAME=''
   fi
 
-  if test -n "$CR_ASM_NR_rt_sigreturn"; then
-    cat >>confdefs.h <<_ACEOF
-#define CR_ASM_NR_rt_sigreturn $CR_ASM_NR_rt_sigreturn
-_ACEOF
 
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-  fi
 
-CFLAGS="$SAVE_CFLAGS"
 
-# Probe for direction of stack growth
 
-    echo "$as_me:$LINENO: checking for direction of stack growth" >&5
-echo $ECHO_N "checking for direction of stack growth... $ECHO_C" >&6
-if test "${cr_cv_check_stack_direction+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for struct delayed_work" >&5
+echo $ECHO_N "checking kernel for struct delayed_work... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-   if test "$cross_compiling" = yes; then
 
-  if test "${cross_stack_direction-unset}" = unset; then
-    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_stack_direction must be set." >&5
-echo "$as_me: error: When cross-compiling, variable cross_stack_direction must be set." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
 
-	 if test $cross_stack_direction = 1; then
-	   cr_cv_check_stack_direction=up
-	 else
-	   cr_cv_check_stack_direction=down
-	 fi
-else
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25285,91 +29804,125 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-    int find_stack_direction (void) {
-      static char *addr = 0;
-      auto char dummy;
-      if (addr == 0) {
-        addr = &dummy;
-        return find_stack_direction();
-      } else {
-        return (&dummy > addr) ? 0 : 1;
-      }
-    }
-    int main(void) {
-      return find_stack_direction();
-    }
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/workqueue.h>
+int
+main ()
+{
+
+     struct delayed_work y;
+     int x = sizeof(y);
+
+  ;
+  return 0;
+}
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+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='./conftest$ac_exeext'
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (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
-  cr_cv_check_stack_direction=up
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-cr_cv_check_stack_direction=down
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK=no
 fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 
 fi
-echo "$as_me:$LINENO: result: $cr_cv_check_stack_direction" >&5
-echo "${ECHO_T}$cr_cv_check_stack_direction" >&6
-  if test $cr_cv_check_stack_direction = up; then
-    cr_stack_direction=1
+
+  cr_result=$cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_DELAYED_WORK 1
+_ACEOF
+
+     HAVE_STRUCT_DELAYED_WORK=1
   else
-    cr_stack_direction=-1
-  fi
-  cat >>confdefs.h <<_ACEOF
-#define CR_STACK_GROWTH $cr_stack_direction
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_DELAYED_WORK 0
 _ACEOF
 
+     HAVE_STRUCT_DELAYED_WORK=''
+  fi
 
 
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-# Look for FTB header and libs
- cr_have_ftb=no
- if test x"$FTB_HOME" != xno; then
-  cr_have_ftb=yes
-  SAVE_CPPFLAGS="$CPPFLAGS"
-  SAVE_LDFLAGS="$LDFLAGS"
-  SAVE_LIBS="$LIBS"
-  CR_FTB_INCLUDES=""
-  CR_FTB_LDFLAGS=""
-  echo "$as_me:$LINENO: checking for FTB headers" >&5
-echo $ECHO_N "checking for FTB headers... $ECHO_C" >&6
-if test "${cr_cv_ftb_incdir+set}" = set; then
+
+# Order for "best" match
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for do_each_pid_task" >&5
+echo $ECHO_N "checking kernel for do_each_pid_task... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_DO_EACH_PID_TASK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_result=no
-    for cr_tmp in "" "${FTB_HOME}/include"; do
-      CPPFLAGS="$SAVE_CPPFLAGS${cr_tmp:+ -I$cr_tmp}"
-      cat >conftest.$ac_ext <<_ACEOF
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-        #include <libftb.h>
-
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
 
-        FTB_client_t x;
+   #ifndef do_each_pid_task
+     choke me
+   #endif
 
   ;
   return 0;
@@ -25397,61 +29950,92 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cr_result="$cr_tmp"; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_DO_EACH_PID_TASK=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_DO_EACH_PID_TASK=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-    done
-    if test -z "$cr_result"; then
-      cr_cv_ftb_incdir="default"
-    else
-      cr_cv_ftb_incdir="$cr_result"
-    fi
+
 
 fi
-echo "$as_me:$LINENO: result: $cr_cv_ftb_incdir" >&5
-echo "${ECHO_T}$cr_cv_ftb_incdir" >&6
-  if test x"$cr_cv_ftb_incdir" = xno; then
-    cr_have_ftb=no
-  elif test x"$cr_cv_ftb_incdir" != "xdefault"; then
-    CR_FTB_INCLUDES="-I$cr_cv_ftb_incdir"
+
+  cr_result=$cr_cv_kconfig_HAVE_DO_EACH_PID_TASK
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_DO_EACH_PID_TASK 1
+_ACEOF
+
+     HAVE_DO_EACH_PID_TASK=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_DO_EACH_PID_TASK 0
+_ACEOF
+
+     HAVE_DO_EACH_PID_TASK=''
   fi
-  echo "$as_me:$LINENO: checking for FTB libs" >&5
-echo $ECHO_N "checking for FTB libs... $ECHO_C" >&6
-if test "${cr_cv_ftb_libdir+set}" = set; then
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for do_each_task_pid" >&5
+echo $ECHO_N "checking kernel for do_each_task_pid... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_DO_EACH_TASK_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    CPPFLAGS="$SAVE_CPPFLAGS $CR_FTB_INCLUDES"
-    LIBS="-lftb -lpthread $SAVE_LIBS"
-    cr_result=no
-    for cr_tmp in "" "${FTB_HOME}/lib64" "${FTB_HOME}/lib32" "${FTB_HOME}/lib"; do
-      LDFLAGS="$SAVE_LDFLAGS${cr_tmp:+-L$cr_tmp}"
-      cat >conftest.$ac_ext <<_ACEOF
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-        #include <libftb.h>
-
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
 
-        return FTB_Connect(NULL, NULL);
+   #ifndef do_each_task_pid
+     choke me
+   #endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -25465,168 +30049,92 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cr_result="$cr_tmp"; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_DO_EACH_TASK_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_DO_EACH_TASK_PID=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-    done
-    if test -z "$cr_result"; then
-      cr_cv_ftb_libdir="default"
-    else
-      cr_cv_ftb_libdir="$cr_result"
-    fi
-
-fi
-echo "$as_me:$LINENO: result: $cr_cv_ftb_libdir" >&5
-echo "${ECHO_T}$cr_cv_ftb_libdir" >&6
-  if test x"$cr_cv_ftb_libdir" = xno; then
-    cr_have_ftb=no
-  elif test x"$cr_cv_ftb_libdir" != "xdefault"; then
-    CR_FTB_LDFLAGS="-L$cr_cv_ftb_libdir"
-    CR_FTB_LDADD="-lftb"
-  fi
-  LIBS="$SAVE_LIBS"
-  LDFLAGS="$SAVE_LDFLAGS"
-  CPPFLAGS="$SAVE_CPPFLAGS"
-  if test x"$cr_have_ftb$cr_force_ftb" = xnoyes; then
-    { { echo "$as_me:$LINENO: error: Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" >&5
-echo "$as_me: error: Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
+fi
 
- fi
+  cr_result=$cr_cv_kconfig_HAVE_DO_EACH_TASK_PID
 
-  if test x$cr_have_ftb = xyes; then
+  if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FTB 1
+#define HAVE_DO_EACH_TASK_PID 1
 _ACEOF
 
+     HAVE_DO_EACH_TASK_PID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FTB 0
+#define HAVE_DO_EACH_TASK_PID 0
 _ACEOF
 
+     HAVE_DO_EACH_TASK_PID=''
   fi
 
 
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-fi # cr_build_libcr
-
-# Probe libc for the RT signal number to use
+if test -z "${HAVE_DO_EACH_TASK_PID}"; then
 
-    echo "$as_me:$LINENO: checking for value of CR_SIGNUM" >&5
-echo $ECHO_N "checking for value of CR_SIGNUM... $ECHO_C" >&6
-if test "${cr_cv_check_cr_signum+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
-    cr_cv_check_cr_signum="failed"
-    SAVE_LIBS="$LIBS"
-    LIBS="-ldl -lpthread $LIBS"
-    if test "$cross_compiling" = yes; then
 
-  if test "${cross_signum-unset}" = unset; then
-    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_signum must be set." >&5
-echo "$as_me: error: When cross-compiling, variable cross_signum must be set." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
 
-	 cr_cv_check_cr_signum=$cross_signum
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-	#include <dlfcn.h>
+  echo "$as_me:$LINENO: checking kernel for for_each_task_pid" >&5
+echo $ECHO_N "checking kernel for for_each_task_pid... $ECHO_C" >&6
 
-	extern int __libc_allocate_rtsig(int);
-	int main()
-	{
-	  int s = -1;
-	  FILE *f=fopen("conftestval", "w");
-	  void *dlhandle = dlopen(NULL, RTLD_LAZY);
-	  if (dlhandle) {
-	    int *tmp = (int *)dlsym(dlhandle, "cri_signum");
-	    dlclose(dlhandle);
-	    if (tmp) s = *tmp;
-	  }
-	  if (s <= 0) {
-	    s=__libc_allocate_rtsig(0);
-	  }
-	  if (!f || s<=0) return(1);
-	  fprintf(f, "%d\n", s);
-	  return(0);
-	}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./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
-  cr_cv_check_cr_signum=`cat conftestval`
+    if test "${cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: Failed to probe CR_SIGNUM" >&5
-echo "$as_me: error: Failed to probe CR_SIGNUM" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-    LIBS="$SAVE_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $cr_cv_check_cr_signum" >&5
-echo "${ECHO_T}$cr_cv_check_cr_signum" >&6
-  CR_SIGNUM=$cr_cv_check_cr_signum
 
 
 
-# Check for 32- or 64-bit architecture
-echo "$as_me:$LINENO: checking for void *" >&5
-echo $ECHO_N "checking for void *... $ECHO_C" >&6
-if test "${ac_cv_type_void_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-if ((void * *) 0)
-  return 0;
-if (sizeof (void *))
-  return 0;
+
+   #ifndef for_each_task_pid
+     choke me
+   #endif
+
   ;
   return 0;
 }
@@ -25653,43 +30161,156 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_void_p=yes
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_void_p=no
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
-echo "${ECHO_T}$ac_cv_type_void_p" >&6
 
-echo "$as_me:$LINENO: checking size of void *" >&5
-echo $ECHO_N "checking size of void *... $ECHO_C" >&6
-if test "${ac_cv_sizeof_void_p+set}" = set; then
+  cr_result=$cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FOR_EACH_TASK_PID 1
+_ACEOF
+
+     HAVE_FOR_EACH_TASK_PID=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FOR_EACH_TASK_PID 0
+_ACEOF
+
+     HAVE_FOR_EACH_TASK_PID=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+fi
+# Require 1 or more match
+if test -z "${HAVE_DO_EACH_PID_TASK}${HAVE_DO_EACH_TASK_PID}${HAVE_FOR_EACH_TASK_PID}"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to find a task iterator" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to find a task iterator" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 2.6.0 task ids" >&5
+echo $ECHO_N "checking kernel for 2.6.0 task ids... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_6_0_TASK_IDS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_void_p" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)];
-test_array [0] = 0
-
+struct task_struct x;
+          int tc_1 = x.__pgrp;
   ;
   return 0;
 }
@@ -25716,21 +30337,82 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_2_6_0_TASK_IDS=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_2_6_0_TASK_IDS=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_2_6_0_TASK_IDS
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_0_TASK_IDS 1
+_ACEOF
+
+     HAVE_2_6_0_TASK_IDS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_0_TASK_IDS 0
+_ACEOF
+
+     HAVE_2_6_0_TASK_IDS=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 2.6.6 task ids" >&5
+echo $ECHO_N "checking kernel for 2.6.6 task ids... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_6_6_TASK_IDS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
-test_array [0] = 0
-
+struct task_struct x;
+          int tc_1 = x.signal->session;
   ;
   return 0;
 }
@@ -25757,78 +30439,85 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_2_6_6_TASK_IDS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_2_6_6_TASK_IDS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_2_6_6_TASK_IDS
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_6_TASK_IDS 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
+     HAVE_2_6_6_TASK_IDS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_6_TASK_IDS 0
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+
+     HAVE_2_6_6_TASK_IDS=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 2.6.20 task ids" >&5
+echo $ECHO_N "checking kernel for 2.6.20 task ids... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_6_20_TASK_IDS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)];
-test_array [0] = 0
 
+	#ifndef process_session /* Must be macro or have a decl */
+	  int x = sizeof(&process_session);
+	#endif
+	    int tc_1 = process_session(NULL);
   ;
   return 0;
 }
@@ -25855,45 +30544,85 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_2_6_20_TASK_IDS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_2_6_20_TASK_IDS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+
+  cr_result=$cr_cv_kconfig_HAVE_2_6_20_TASK_IDS
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_20_TASK_IDS 1
+_ACEOF
+
+     HAVE_2_6_20_TASK_IDS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_20_TASK_IDS 0
+_ACEOF
+
+     HAVE_2_6_20_TASK_IDS=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 2.6.24 task ids" >&5
+echo $ECHO_N "checking kernel for 2.6.24 task ids... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_6_24_TASK_IDS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
-test_array [0] = 0
 
+	#ifndef task_session_vnr /* Must be macro or have a decl */
+	  int x = sizeof(&task_session_vnr);
+	#endif
+	    int tc_1 = task_session_vnr(NULL);
   ;
   return 0;
 }
@@ -25920,1072 +30649,760 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_2_6_24_TASK_IDS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_2_6_24_TASK_IDS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_void_p=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void *), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_2_6_24_TASK_IDS
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_24_TASK_IDS 1
+_ACEOF
+
+     HAVE_2_6_24_TASK_IDS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_24_TASK_IDS 0
+_ACEOF
+
+     HAVE_2_6_24_TASK_IDS=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+# Should allow only exactly one match, except that 2.6.6 and 2.6.20/24 overlap during transitional period
+case "${HAVE_2_6_0_TASK_IDS}X${HAVE_2_6_6_TASK_IDS}X${HAVE_2_6_20_TASK_IDS}${HAVE_2_6_24_TASK_IDS}" in
+    1XX|X1X|X1X1|XX1) # OK
+	;;
+    *)
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" >&2;}
    { (exit 1); exit 1; }; }
+
+	;;
+esac
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for set_task_pgrp" >&5
+echo $ECHO_N "checking kernel for set_task_pgrp... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_SET_TASK_PGRP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
+
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (void *)); }
-unsigned long ulongval () { return (long) (sizeof (void *)); }
-#include <stdio.h>
-#include <stdlib.h>
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (void *))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (void *))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (void *))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
+   #ifdef set_task_pgrp
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&set_task_pgrp);
+   #endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+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='./conftest$ac_exeext'
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_sizeof_void_p=`cat conftest.val`
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_SET_TASK_PGRP=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void *), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_void_p=0
-fi
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_SET_TASK_PGRP=no
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
-_ACEOF
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-CR_LIBARCH=$CR_ARCH
-if test $ac_cv_sizeof_void_p != $cr_wordsize; then
-  if test $cr_wordsize = 8; then
-    CR_LIBARCH=$CR_ARCH32
-  else
-    { { echo "$as_me:$LINENO: error: CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" >&5
-echo "$as_me: error: CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
 fi
 
+  cr_result=$cr_cv_kconfig_HAVE_SET_TASK_PGRP
 
-################################################################################
-# Sub-configure for 32-bit libs on 64-bit platforms
-################################################################################
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_SET_TASK_PGRP 1
+_ACEOF
 
-cr_build_libcr32=no
-if test x"$enable_multilib" = xyes; then
-  if test x"$cr_build_libcr" != xyes; then
-    { { echo "$as_me:$LINENO: error: --enable-multilib requested but not building libcr" >&5
-echo "$as_me: error: --enable-multilib requested but not building libcr" >&2;}
-   { (exit 1); exit 1; }; }
-  elif test -f "${TOP_BUILDDIR}/configure.ac"; then # More robust than TOP_BUILDDIR == TOP_SRCDIR
-    { { echo "$as_me:$LINENO: error: When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" >&5
-echo "$as_me: error: When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" >&2;}
-   { (exit 1); exit 1; }; }
-  elif test -z "$CR_ARCH32"; then
-    { { echo "$as_me:$LINENO: error: --enable-multilib not supported on architecture $CR_ARCH" >&5
-echo "$as_me: error: --enable-multilib not supported on architecture $CR_ARCH" >&2;}
-   { (exit 1); exit 1; }; }
-  elif test $ac_cv_sizeof_void_p = 4; then
-    { { echo "$as_me:$LINENO: error: --enable-multilib requested but CC='$CC' generates 32-bit objects.  Perhaps try configuring with CC='$CC -m64' or similar." >&5
-echo "$as_me: error: --enable-multilib requested but CC='$CC' generates 32-bit objects.  Perhaps try configuring with CC='$CC -m64' or similar." >&2;}
-   { (exit 1); exit 1; }; }
-  elif test \! -d /lib64; then
-    { { echo "$as_me:$LINENO: error: --enable-multilib requested but /lib64 does not exist" >&5
-echo "$as_me: error: --enable-multilib requested but /lib64 does not exist" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  if test -z "$libdir32"; then
-    if expr "$libdir" : '.*/lib64$' >/dev/null; then
-      libdir32=`echo $libdir | sed -e 's/64$//'`
-    elif test "$libdir" = '${exec_prefix}/lib'; then
-      libdir32='${exec_prefix}/lib'
-      libdir='${exec_prefix}/lib64'
-    else
-      { { echo "$as_me:$LINENO: error: --enable-multilib requested but libdir='$libdir' does not end in 'lib64'" >&5
-echo "$as_me: error: --enable-multilib requested but libdir='$libdir' does not end in 'lib64'" >&2;}
-   { (exit 1); exit 1; }; };
-    fi
-  fi
-  SUBCMD="${TOP_SRCDIR}/configure '--srcdir=${TOP_SRCDIR}' '--build=${CR_ARCH32}-linux' '--libdir=${libdir32}' --with-components=libcr,tests,examples"
-  eval set -- $ac_configure_args
-  for x in "$@"; do
-    case "$x" in
-      --host=*|--build=*|--target=*|host_alias=*|build_alias=*|target_alias=*|--libdir=*|--srcdir=*|--with-components=*|--enable-multilib|--enable-testsuite|CFLAGS=*|CXXFLAGS=*)
-	# skip
-	;;
-      *)
-	# keep as-is
-	SUBCMD="$SUBCMD '$x'"
-	;;
-    esac
-  done
-  # Strip -m64 out of CFLAGS and CXXFLAGS, if present
-  if test -n "$CFLAGS32"; then
-    SUBCMD="$SUBCMD 'CFLAGS=$CFLAGS32'"
-  elif test -n "$CFLAGS"; then
-    set --
-    for x in $CFLAGS; do test x"$x" = "x-m64" || set -- "$@" "$x"; done
-    SUBCMD="$SUBCMD 'CFLAGS=$@'"
-  fi
-  if test -n "$CXXFLAGS32"; then
-    SUBCMD="$SUBCMD 'CXXFLAGS=$CXXFLAGS32'"
-  elif test -n "$CXXFLAGS"; then
-    set --
-    for x in $CXXFLAGS; do test x"$x" = "x-m64" || set -- "$@" "$x"; done
-    SUBCMD="$SUBCMD 'CXXFLAGS=$@'"
-  fi
-  # Strip -m64 from definitions of CC and CXX, adding -m32
-  if test -n "$CC32"; then
-    SUBCMD="$SUBCMD 'CC=$CC32'"
-  else
-    set --
-    for x in $CC; do test x"$x" = "x-m64" || set -- "$@" "$x"; done
-    SUBCMD="$SUBCMD 'CC=$@ -m32'"
-  fi
-  if test -n "$CXX32"; then
-    SUBCMD="$SUBCMD 'CXX=$CXX32'"
-  elif test -n "$CXX" -a "$CXX" != no; then
-    set --
-    for x in $CXX; do test x"$x" = "x-m64" || set -- "$@" "$x"; done
-    SUBCMD="$SUBCMD 'CXX=$@ -m32'"
-  fi
-  # Look for 32-bit versions of remaining bin tools
-  if test -n "$CPP32"; then
-    SUBCMD="$SUBCMD 'CPP=$CPP32'"
-  fi
-  if test -n "$LD32"; then
-    SUBCMD="$SUBCMD 'LD=$LD32'"
-  fi
-  if test -n "$AR32"; then
-    SUBCMD="$SUBCMD 'AR=$AR32'"
-  fi
-  if test -n "$NM32"; then
-    SUBCMD="$SUBCMD 'NM=$NM32'"
-  fi
-  if test -n "$RANLIB32"; then
-    SUBCMD="$SUBCMD 'RANLIB=$RANLIB32'"
-  fi
-  # Others?
-  { echo "$as_me:$LINENO: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&5
-echo "$as_me: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&6;}
-  { echo "$as_me:$LINENO: ${SUBCMD}" >&5
-echo "$as_me: ${SUBCMD}" >&6;}
-  ( mkdir -p libcr32 && cd libcr32 && ln -sf ../util util && eval "${SUBCMD}" )
-  if test "$?" = 0; then
-    { echo "$as_me:$LINENO: <<<< END sub-configure for 32-bit libs <<<<" >&5
-echo "$as_me: <<<< END sub-configure for 32-bit libs <<<<" >&6;}
-    cr_build_libcr32=yes
+     HAVE_SET_TASK_PGRP=1
   else
-    rm -rf libcr32
-    { { echo "$as_me:$LINENO: error: --enable-multilib requested but FAILED sub-configure for 32-bit libs" >&5
-echo "$as_me: error: --enable-multilib requested but FAILED sub-configure for 32-bit libs" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-
-if test x$cr_build_libcr32 = xyes; then
-  CR_BUILD_LIBCR32_TRUE=
-  CR_BUILD_LIBCR32_FALSE='#'
-else
-  CR_BUILD_LIBCR32_TRUE='#'
-  CR_BUILD_LIBCR32_FALSE=
-fi
-
-
-################################################################################
-# Check kernel (source location, symbol table, features, etc.)
-################################################################################
-
-if test x"$cr_build_modules" = xyes; then
-
-# Compiler to build kernel modules
-echo "$as_me:$LINENO: checking compiler to build kernel modules" >&5
-echo $ECHO_N "checking compiler to build kernel modules... $ECHO_C" >&6
-if test -n "${KCC}"; then
-  echo "$as_me:$LINENO: result: $KCC (user setting)" >&5
-echo "${ECHO_T}$KCC (user setting)" >&6
-else
-  KCC=$CC
-  echo "$as_me:$LINENO: result: $KCC (default)" >&5
-echo "${ECHO_T}$KCC (default)" >&6
-fi
-
-
-# Find BSD-compatible NM command
-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
-	  break
-	  ;;
-	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	  ;;
-	esac
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6
-NM="$lt_cv_path_NM"
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_SET_TASK_PGRP 0
+_ACEOF
 
-NM=$NM
+     HAVE_SET_TASK_PGRP=''
+  fi
 
 
-# First deal with user-specified kernel type (UP, SMP, BIGMEM, etc.) if any.
-case x"$with_kernel_type" in
-  x|xyes|xno) ;;
-  *)
-  cr_kernel_type=`echo "$with_kernel_type" | tr 'a-z' 'A-Z'`
-  cr_header="/boot/kernel.h"
-  echo "$as_me:$LINENO: checking for $cr_header" >&5
-echo $ECHO_N "checking for $cr_header... $ECHO_C" >&6;
-  cr_result=ok
-  if test \! -e "$cr_header"; then
-    cr_result='missing'
-  elif test \! -r "$cr_header"; then
-    cr_result='not readable'
-  fi
   echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
-  if test "$cr_result" != "ok"; then
-    { { echo "$as_me:$LINENO: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." >&5
-echo "$as_me: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  cr_kernel_var="__BOOT_KERNEL_$cr_kernel_type"
-  if test -z "`grep \"$cr_kernel_var\" $cr_header 2>/dev/null`"; then
-    { { echo "$as_me:$LINENO: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." >&5
-echo "$as_me: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  # The following sed command transforms all the #ifndef lines from kernel.h into
-  # corresponding preprocessor flags (on one line) which select the desired kernel type.
-  # Note use of [] for m4 quoting of a sed command containing [ and ]
-  CR_KTYPE_CPPFLAGS=`sed -n -e '/^#ifndef \('$cr_kernel_var'\)$/ {s//-D\1=1 /;H;}' \
-			     -e '/^#ifndef \(__BOOT_KERNEL_[A-Z]*\)$/ {s//-D\1=0 /;H;}' \
-			     -e '$ {x;s/[ \t\n]\+/ /g;s/^ //;s/ $//;p;}' \
-			     $cr_header`
 
-esac
-# Checks for required kernel src/obj dirs and fail if they are not found
 
 
 
 
 
+  echo "$as_me:$LINENO: checking kernel for set_task_session" >&5
+echo $ECHO_N "checking kernel for set_task_session... $ECHO_C" >&6
 
+    if test "${cr_cv_kconfig_HAVE_SET_TASK_SESSION+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
 
-    if test "${LINUX_OBJ_ARG+set}${cr_cv_var_LINUX_OBJ_ARG+set}" = setset; then
-    if test "$LINUX_OBJ_ARG" != "$cr_cv_var_LINUX_OBJ_ARG"; then
-      { { echo "$as_me:$LINENO: error: Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG).  Remove '$cache_file' before re-running configure." >&5
-echo "$as_me: error: Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG).  Remove '$cache_file' before re-running configure." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  elif test "${cr_cv_var_LINUX_OBJ_ARG+set}" = set; then
-    LINUX_OBJ_ARG="$cr_cv_var_LINUX_OBJ_ARG"
-  fi
 
-  if expr X"$LINUX_OBJ_ARG" : X/ >/dev/null; then
-    # User provided a path
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-  echo "$as_me:$LINENO: checking for Linux kernel build in ${LINUX_OBJ_ARG}" >&5
-echo $ECHO_N "checking for Linux kernel build in ${LINUX_OBJ_ARG}... $ECHO_C" >&6
-  cr_cvname=cr_cv_kernel_obj_`echo "${LINUX_OBJ_ARG}" | $as_tr_sh`
-  if eval "test \"\${${cr_cvname}+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
+int
+main ()
+{
+
+   #ifdef set_task_session
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&set_task_session);
+   #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_SET_TASK_SESSION=yes
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    if test -d "${LINUX_OBJ_ARG}"; then
-      # Check for version.h
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_SET_TASK_SESSION=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  if test -r ${LINUX_OBJ_ARG}/include/linux/version.h; then
-    cr_tmp=`  $PERL -- - "${LINUX_OBJ_ARG}" "$KCC -E -I${LINUX_OBJ_ARG}/include -D__KERNEL__ -DMODULE $CR_KTYPE_CPPFLAGS $CPPFLAGS" <<'_EOF_'
 
-    my ($srcdir, $cpp_cmd) = @ARGV;
-    my $stamp = time;
-    $cpp_cmd =~ s/([#()])/\\${LINUX_OBJ_ARG}/g; # quote problematic shell metachars
-    FILE: foreach my $file qw/version.h utsrelease.h/ {
-      my $path = "$srcdir/include/linux/$file";
-      next FILE unless (-f $path);
-      open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
-      LINE: while (<F>) {
-        next LINE if(/^#/);
-        if ((my $uts) = /=${stamp}->"(2\.[46]\.[0-9].*)"<-/o) {
-          print "$uts\n";
-          exit 0;
-        }
-      }
-      close(F) || exit 1;
-    }
-    exit 1;
+fi
 
-_EOF_
-`
-    test $? = 0 || cr_tmp='no UTS_RELEASE could be extracted'
+  cr_result=$cr_cv_kconfig_HAVE_SET_TASK_SESSION
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_SET_TASK_SESSION 1
+_ACEOF
+
+     HAVE_SET_TASK_SESSION=1
   else
-    cr_tmp='include/linux/version.h missing'
-  fi
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_SET_TASK_SESSION 0
+_ACEOF
 
-      # Check for .config if required
-      if expr "$cr_tmp" : '2\.[46]\.' >/dev/null; then
-        test -r "${LINUX_OBJ_ARG}/.config" || cr_tmp='.config missing'
-      fi
-    else
-      cr_tmp='not found'
-    fi
-    eval "$cr_cvname='$cr_tmp'"
-    unset cr_tmp
+     HAVE_SET_TASK_SESSION=''
+  fi
 
-fi
 
-  eval "cr_result=\$$cr_cvname"
-  unset cr_cvname
-  if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
-    echo "$as_me:$LINENO: result: found version $cr_result" >&5
-echo "${ECHO_T}found version $cr_result" >&6
-  else
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
-  fi
-  # Check that version appears acceptible
 
-  if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
-    cr_linux_obj_ver="$cr_result"
-  else
-    cr_linux_obj_ver=''
-  fi
 
 
 
-  if test -z "$cr_linux_obj_ver"; then
-    { { echo "$as_me:$LINENO: error: Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" >&5
-echo "$as_me: error: Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    :
-  fi
 
-    LINUX_OBJ="${LINUX_OBJ_ARG}"
-  else
-    if test -z "$LINUX_OBJ_ARG"; then
-      cr_tmp_ver=`uname -r`
-    elif expr "$LINUX_OBJ_ARG" : '2\.[46]\.' >/dev/null; then
-      cr_tmp_ver="$LINUX_OBJ_ARG"
-    else
-      { { echo "$as_me:$LINENO: error: --with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" >&5
-echo "$as_me: error: --with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_ver_patt="`echo $cr_tmp_ver | sed -e 's/\./\\\\./g;'`\$"
-    # Search standard locations
-    for cr_linux_dir in \
-			/lib/modules/${cr_tmp_ver}/build \
-			/usr/src/linux-${cr_tmp_ver}-obj \
-			/usr/src/linux-${cr_tmp_ver} \
-	     		/usr/src/kernels/${cr_tmp_ver} \
-			; do
 
-  echo "$as_me:$LINENO: checking for Linux kernel build in ${cr_linux_dir}" >&5
-echo $ECHO_N "checking for Linux kernel build in ${cr_linux_dir}... $ECHO_C" >&6
-  cr_cvname=cr_cv_kernel_obj_`echo "${cr_linux_dir}" | $as_tr_sh`
-  if eval "test \"\${${cr_cvname}+set}\" = set"; then
+
+  echo "$as_me:$LINENO: checking kernel for valid_signal" >&5
+echo $ECHO_N "checking kernel for valid_signal... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_VALID_SIGNAL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    if test -d "${cr_linux_dir}"; then
-      # Check for version.h
 
-  if test -r ${cr_linux_dir}/include/linux/version.h; then
-    cr_tmp=`  $PERL -- - "${cr_linux_dir}" "$KCC -E -I${cr_linux_dir}/include -D__KERNEL__ -DMODULE $CR_KTYPE_CPPFLAGS $CPPFLAGS" <<'_EOF_'
 
-    my ($srcdir, $cpp_cmd) = @ARGV;
-    my $stamp = time;
-    $cpp_cmd =~ s/([#()])/\\${cr_linux_dir}/g; # quote problematic shell metachars
-    FILE: foreach my $file qw/version.h utsrelease.h/ {
-      my $path = "$srcdir/include/linux/$file";
-      next FILE unless (-f $path);
-      open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
-      LINE: while (<F>) {
-        next LINE if(/^#/);
-        if ((my $uts) = /=${stamp}->"(2\.[46]\.[0-9].*)"<-/o) {
-          print "$uts\n";
-          exit 0;
-        }
-      }
-      close(F) || exit 1;
-    }
-    exit 1;
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-_EOF_
-`
-    test $? = 0 || cr_tmp='no UTS_RELEASE could be extracted'
-  else
-    cr_tmp='include/linux/version.h missing'
-  fi
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
+int
+main ()
+{
 
-      # Check for .config if required
-      if expr "$cr_tmp" : '2\.[46]\.' >/dev/null; then
-        test -r "${cr_linux_dir}/.config" || cr_tmp='.config missing'
-      fi
-    else
-      cr_tmp='not found'
-    fi
-    eval "$cr_cvname='$cr_tmp'"
-    unset cr_tmp
+   #ifdef valid_signal
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&valid_signal);
+   #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_VALID_SIGNAL=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_VALID_SIGNAL=no
 fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  eval "cr_result=\$$cr_cvname"
-  unset cr_cvname
-  if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
-    echo "$as_me:$LINENO: result: found version $cr_result" >&5
-echo "${ECHO_T}found version $cr_result" >&6
-  else
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-  fi
-  # Check that version appears acceptible
 
-  if expr "$cr_result" : ${cr_ver_patt} >/dev/null; then
-    cr_linux_obj_ver="$cr_result"
-  else
-    cr_linux_obj_ver=''
-  fi
+fi
 
+  cr_result=$cr_cv_kconfig_HAVE_VALID_SIGNAL
 
-      if test -n "$cr_linux_obj_ver"; then
-        LINUX_OBJ="${cr_linux_dir}"
-        break
-      fi
-    done
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_VALID_SIGNAL 1
+_ACEOF
 
-  if test -z "$cr_linux_obj_ver"; then
-    { { echo "$as_me:$LINENO: error: Could not find a directory containing a Linux kernel ${cr_tmp_ver} build.  Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" >&5
-echo "$as_me: error: Could not find a directory containing a Linux kernel ${cr_tmp_ver} build.  Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" >&2;}
-   { (exit 1); exit 1; }; }
+     HAVE_VALID_SIGNAL=1
   else
-    :
-  fi
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_VALID_SIGNAL 0
+_ACEOF
 
-    unset cr_tmp_ver
+     HAVE_VALID_SIGNAL=''
   fi
 
 
-  if test -n "$cr_linux_obj_ver"; then
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
-  cr_linux_src_ver=''
 
-    if test "${LINUX_SRC_ARG+set}${cr_cv_var_LINUX_SRC_ARG+set}" = setset; then
-    if test "$LINUX_SRC_ARG" != "$cr_cv_var_LINUX_SRC_ARG"; then
-      { { echo "$as_me:$LINENO: error: Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG).  Remove '$cache_file' before re-running configure." >&5
-echo "$as_me: error: Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG).  Remove '$cache_file' before re-running configure." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  elif test "${cr_cv_var_LINUX_SRC_ARG+set}" = set; then
-    LINUX_SRC_ARG="$cr_cv_var_LINUX_SRC_ARG"
-  fi
 
-  if expr X"$LINUX_SRC_ARG" : X/ >/dev/null; then
-    cr_list="$LINUX_SRC_ARG"
-  elif test -n "$LINUX_SRC_ARG"; then
-    { { echo "$as_me:$LINENO: error: --with-linux-src argument '$LINUX_SRC_ARG' is not a full path" >&5
-echo "$as_me: error: --with-linux-src argument '$LINUX_SRC_ARG' is not a full path" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    # Search standard locations
-    cr_list="${LINUX_OBJ} \
-	     /lib/modules/$cr_linux_obj_ver/source \
-	     /usr/src/linux-$cr_linux_obj_ver \
-	     /usr/src/kernels/$cr_linux_obj_ver"
-  fi
-  for cr_linux_dir in $cr_list; do
 
-  echo "$as_me:$LINENO: checking for Linux kernel source in $cr_linux_dir" >&5
-echo $ECHO_N "checking for Linux kernel source in $cr_linux_dir... $ECHO_C" >&6
-  cr_cvname=cr_cv_kernel_src_`echo "$cr_linux_dir" | $as_tr_sh`
-  if eval "test \"\${${cr_cvname}+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
-    cr_tmp=''
-    if test -e "$cr_linux_dir/Makefile"; then
-      # First try "asking" the Makefile
-      # If a .config does not exist, then make may complain if/when the main Makefile
-      # tries to include it.  The -k and 2>/dev/null take care of that.
-      cr_tmp=`(make -k echo_kver --no-print-directory -C $cr_linux_dir -f - 2>/dev/null | grep '^2\.[46]\.') <<'_EOF_'
-echo_kver:
-	@echo '$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)'
 
-include Makefile
-_EOF_`
-      expr "$cr_tmp" : '2\.[46]\.' >/dev/null || cr_tmp='' # Reject if not matched to pattern
 
-      # Second try grepping the Makefile
-      if test -z "$cr_tmp"; then
-        # Note the use of [] for m4 quoting, since the pattern contains [ and ]
-        cr_linux_ver1=`sed -n -e '/^VERSION[ \t]*=[ \t]*\([0-9]\+\).*$/ {s//\1/p;q;}' "$cr_linux_dir/Makefile"`
-        cr_linux_ver2=`sed -n -e '/^PATCHLEVEL[ \t]*=[ \t]*\([0-9]\+\).*$/ {s//\1/p;q;}' "$cr_linux_dir/Makefile"`
-        cr_linux_ver3=`sed -n -e '/^SUBLEVEL[ \t]*=[ \t]*\([0-9]\+\).*$/ {s//\1/p;q;}' "$cr_linux_dir/Makefile"`
-        cr_tmp="${cr_linux_ver1}.${cr_linux_ver2}.${cr_linux_ver3}"
-        expr "$cr_tmp" : '2\.[46]\.' >/dev/null || cr_tmp='' # Reject if not matched to pattern
-      fi
+  echo "$as_me:$LINENO: checking kernel for REMOVE_LINKS" >&5
+echo $ECHO_N "checking kernel for REMOVE_LINKS... $ECHO_C" >&6
 
-      # ONLY if we found something but without SUBLEVEL, then use version.h to get it.
-      if expr "$cr_tmp" : '2\.[46]\.$' >/dev/null; then
+    if test "${cr_cv_kconfig_HAVE_REMOVE_LINKS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-  if test -r $cr_linux_dir/include/linux/version.h; then
-    cr_tmp=`  $PERL -- - "$cr_linux_dir" "$KCC -E -I$cr_linux_dir/include -D__KERNEL__ -DMODULE $CR_KTYPE_CPPFLAGS $CPPFLAGS" <<'_EOF_'
 
-    my ($srcdir, $cpp_cmd) = @ARGV;
-    my $stamp = time;
-    $cpp_cmd =~ s/([#()])/\\$cr_linux_dir/g; # quote problematic shell metachars
-    FILE: foreach my $file qw/version.h utsrelease.h/ {
-      my $path = "$srcdir/include/linux/$file";
-      next FILE unless (-f $path);
-      open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
-      LINE: while (<F>) {
-        next LINE if(/^#/);
-        if ((my $uts) = /=${stamp}->"(2\.[46]\.[0-9].*)"<-/o) {
-          print "$uts\n";
-          exit 0;
-        }
-      }
-      close(F) || exit 1;
-    }
-    exit 1;
 
-_EOF_
-`
-    test $? = 0 || cr_tmp='no UTS_RELEASE could be extracted'
-  else
-    cr_tmp='include/linux/version.h missing'
-  fi
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-        # Now trim EXTRAVERSION, or yield empty if no pattern match
-        cr_tmp=`echo $cr_tmp | sed -n -e '/^\(2\.[46]\.[0-9]\+\).*$/ {s//\1/p;q;}'`
-      fi
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
+int
+main ()
+{
 
-      test -n "$cr_tmp" || cr_tmp='not found'
-    elif test -d "$cr_linux_dir"; then
-      cr_tmp='Makefile missing'
-    else
-      cr_tmp='not found'
-    fi
-    eval "$cr_cvname='$cr_tmp'"
-    unset cr_tmp
+   #ifndef REMOVE_LINKS
+     choke me
+   #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_REMOVE_LINKS=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_REMOVE_LINKS=no
 fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  eval "cr_result=\$$cr_cvname"
-  unset cr_cvname
-  if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
-    echo "$as_me:$LINENO: result: found version $cr_result" >&5
-echo "${ECHO_T}found version $cr_result" >&6
-  else
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-  fi
-  # Check that version is acceptible (exact match, or a prefix with the next char non-numeric)
-  case "$cr_linux_obj_ver" in
-    ${cr_result}|${cr_result}[^0-9]*)      # the outer [] is m4 quoting
-        cr_linux_src_ver="$cr_result";;
-    *)  cr_linux_src_ver='';;
-  esac
 
-      if test -n "$cr_linux_src_ver"; then
-	LINUX_SRC="$cr_linux_dir"
-	break
-      fi
-  done
+fi
 
-  if test -z "$cr_linux_src_ver"; then
-    { { echo "$as_me:$LINENO: error: Could not locate source directory corresponding to build directory '${LINUX_OBJ}'.  Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" >&5
-echo "$as_me: error: Could not locate source directory corresponding to build directory '${LINUX_OBJ}'.  Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    :
-  fi
+  cr_result=$cr_cv_kconfig_HAVE_REMOVE_LINKS
 
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_REMOVE_LINKS 1
+_ACEOF
 
+     HAVE_REMOVE_LINKS=1
   else
-    :
-  fi
-
-
-  if test -n "$cr_linux_src_ver" -a -n "$cr_linux_obj_ver"; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_REMOVE_LINKS 0
+_ACEOF
 
-    case "$cr_linux_obj_ver" in
-      2.6.*) HAVE_LINUX_2_6=yes;;
-    esac
-    LINUX_VER="$cr_linux_obj_ver"
-    CR_KERNEL=`echo $cr_linux_obj_ver | tr - _`
-    CR_KERNEL_BASE=`echo $CR_KERNEL | sed -e 's:smp\|enterprise\|bigmem\|hugemem::g'`
-    test -n "$LINUX_SRC_ARG" && cr_cv_var_LINUX_SRC_ARG="$LINUX_SRC_ARG"
-    test -n "$LINUX_OBJ_ARG" && cr_cv_var_LINUX_OBJ_ARG="$LINUX_OBJ_ARG"
+     HAVE_REMOVE_LINKS=''
+  fi
 
-   if test -z "$cache_file" || \
-    test "$cache_file" = /dev/null || \
-    cmp "${LINUX_OBJ}/.config" .cached_kconfig >/dev/null 2>/dev/null; then
-   : # OK - either not caching or cached version still matches
- else
-   if test -f .cached_kconfig; then
-     { echo "$as_me:$LINENO: WARNING: kernel configuration has changed... discarding cached results." >&5
-echo "$as_me: WARNING: kernel configuration has changed... discarding cached results." >&2;}
-     rm -f .cached_kconfig
-   fi
-   for cr_var in cr_cv_kconfig__NON_EMPTY_HACK `(set) | grep "^cr_cv_kconfig_" | cut -d= -f1`; do
-     unset $cr_var
-   done
-   cp "${LINUX_OBJ}/.config" .cached_kconfig
- fi
 
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
-  else
-    :
-  fi
 
 
-if test -z "${HAVE_LINUX_2_6}"; then
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
 
-_ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-   { { echo "$as_me:$LINENO: error: required Linux 2.6.x kernel headers and/or build not found." >&5
-echo "$as_me: error: required Linux 2.6.x kernel headers and/or build not found." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 
-# Module install dir
+  echo "$as_me:$LINENO: checking kernel for task.pids pid_link" >&5
+echo $ECHO_N "checking kernel for task.pids pid_link... $ECHO_C" >&6
 
-echo "$as_me:$LINENO: checking directory to install kernel modules" >&5
-echo $ECHO_N "checking directory to install kernel modules... $ECHO_C" >&6
-if test -n "${CR_MODULE_DIR}"; then
-  cr_why='passed via --with-kmod-dir'
-elif test ${sysconfdir} = /etc; then
-  CR_MODULE_DIR="/lib/modules/${LINUX_VER}/extra"
-  cr_why='default when sysconfdir=/etc'
+    if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  CR_MODULE_DIR="${libdir}/${PACKAGE}/${LINUX_VER}"
-  cr_why='default'
-fi
-echo "$as_me:$LINENO: result: ${CR_MODULE_DIR} ($cr_why)" >&5
-echo "${ECHO_T}${CR_MODULE_DIR} ($cr_why)" >&6
 
-# Configure automake/kbuild glue
 
 
-  echo "$as_me:$LINENO: checking for parameters to interface GNU automake with Linux kbuild" >&5
-echo $ECHO_N "checking for parameters to interface GNU automake with Linux kbuild... $ECHO_C" >&6
-if test "${cr_cv_KBUILD_MAKE_ARGS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-    if grep KBUILD_EXTMOD ${LINUX_SRC}/Makefile >/dev/null 2>/dev/null; then
-      cr_cv_KBUILD_MAKE_ARGS='KBUILD_EXTMOD=$(builddir)'
-    else
-      cr_cv_KBUILD_MAKE_ARGS='SUBDIRS=$(builddir) modules'
-    fi
-    if test "${LINUX_OBJ}" != "${LINUX_SRC}"; then
-      cr_cv_KBUILD_MAKE_ARGS="${cr_cv_KBUILD_MAKE_ARGS} O=${LINUX_OBJ}"
-    fi
-    if test x$enable_kbuild_verbose = xyes; then
-      cr_cv_KBUILD_MAKE_ARGS="${cr_cv_KBUILD_MAKE_ARGS} V=1"
-    fi
-    if test x$cross_compiling = xyes; then
-      cr_cv_KBUILD_MAKE_ARGS="$cr_cv_KBUILD_MAKE_ARGS ARCH=$CR_ARCH CROSS_COMPILE=$host_alias-"
-    fi
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
+int
+main ()
+{
+struct task_struct x;
+          struct pid_link tc_1 = x.pids[0];
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK=no
 fi
-echo "$as_me:$LINENO: result: $cr_cv_KBUILD_MAKE_ARGS" >&5
-echo "${ECHO_T}$cr_cv_KBUILD_MAKE_ARGS" >&6
-  KBUILD_MAKE_ARGS="$cr_cv_KBUILD_MAKE_ARGS"
-    # Note: we'll actually try the result in CR_SET_KCFLAGS
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-# Configure module compile flags and perform a sanity check
+fi
 
-  case "$CR_ARCH" in
-    ppc64)
-      CR_KSYM_PATTERN_DATA='[bBdDrRtT] '
-      CR_KSYM_PATTERN_CODE='[dD] '         ;;
-    *)
-      CR_KSYM_PATTERN_DATA='[bBdDrRtT] '
-      CR_KSYM_PATTERN_CODE='[tT] '
-      ;;
-  esac
+  cr_result=$cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK
 
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_PIDS_PID_LINK 1
+_ACEOF
 
-CR_KSYM_IMPORT_DECLS="${TOP_BUILDDIR}/.import_decls"
+     HAVE_TASK_PIDS_PID_LINK=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_PIDS_PID_LINK 0
+_ACEOF
 
-echo '/* This file is autogenerated - do not edit or remove */' > $CR_KSYM_IMPORT_DECLS
+     HAVE_TASK_PIDS_PID_LINK=''
+  fi
 
 
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
-CR_KSYM_IMPORT_CALLS="${TOP_BUILDDIR}/.import_calls"
 
-echo '/* This file is autogenerated - do not edit or remove */' > $CR_KSYM_IMPORT_CALLS
 
 
 
 
+  echo "$as_me:$LINENO: checking kernel for task.pids pid" >&5
+echo $ECHO_N "checking kernel for task.pids pid... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking for flags to compile Linux kernel probes" >&5
-echo $ECHO_N "checking for flags to compile Linux kernel probes... $ECHO_C" >&6
-if test "${cr_cv_kconfig_kcflags+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  rm -rf conftestdir
-  mkdir conftestdir
-  echo '#include <linux/sched.h>' > conftestdir/conftest.c
-  echo 'int foo = 0;' >> conftestdir/conftest.c
-  echo 'obj-m := conftest.o' >conftestdir/Makefile
-  unset cr_tmp
-  echo "make -C ${LINUX_SRC} builddir=\"`pwd`/conftestdir\" ${KBUILD_MAKE_ARGS} CC=\"${KCC}\" V=1" >&5
-  make -C ${LINUX_SRC} builddir="`pwd`/conftestdir" ${KBUILD_MAKE_ARGS} CC="${KCC}" V=1 >conftestdir/output 2>&1 </dev/null
-  if test $? = 0; then cr_tmp=`grep -m1 conftest\\.c conftestdir/output | sed -e "s:^[ 	]*${KCC}::"`; fi
-  cat conftestdir/output >&5
-  if test "${cr_tmp:+OK}" != OK; then
-      echo "$as_me:$LINENO: result: FAILED" >&5
-echo "${ECHO_T}FAILED" >&6
-      cat conftestdir/output
-      if $EGREP 'include/(asm|linux)/[a-zA-Z0-9_-]+\.h:' conftestdir/output >/dev/null 2>&1; then
-        { echo "$as_me:$LINENO: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&5
-echo "$as_me: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&2;}
-	ver=`$KCC --version | head -1`
-        { echo "$as_me:$LINENO: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&5
-echo "$as_me: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&2;}
-	if test $cr_wordsize -gt $ac_cv_sizeof_void_p; then
-	  echo "$KCC" | grep -e '-m64' >/dev/null 2>/dev/null
-	  if test $? != 0; then
-            { echo "$as_me:$LINENO: WARNING: You might try setting KCC='$KCC -m64'" >&5
-echo "$as_me: WARNING: You might try setting KCC='$KCC -m64'" >&2;}
-          fi
-        fi
-      fi
-      if grep -i 'permission denied' conftestdir/output >/dev/null 2>&1; then
-        { echo "$as_me:$LINENO: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&5
-echo "$as_me: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&2;}
-      fi
-      rm -rf conftestdir
-      { { echo "$as_me:$LINENO: error: Failed test run of kernel make/kbuild failed (see above)" >&5
-echo "$as_me: error: Failed test run of kernel make/kbuild failed (see above)" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  rm -rf conftestdir
-  cr_cv_kconfig_kcflags=''
-  prev_del=''
-  prev_inc=''
-  for arg in ${cr_tmp}; do
-    if test -n "$prev_del"; then # skip this arg at request of prev arg
-      prev_del=''
-      continue
-    fi
-    arg=`echo $arg | tr -d "\"'"` # remove quote marks
-    if test -n "$prev_inc"; then # prev arg says this arg is an -include
-      prev_inc=''
-      case "$arg" in
-	*include/linux/modversions.h) continue;;
-	/*) arg="-include $arg";;
-	*) arg="-include ${LINUX_OBJ}/$arg";;
-      esac
-    else
-      case "$arg" in
-	-o) prev_del=1; continue;;
-	-include) prev_inc=1; continue;;
-	-c) continue;;
-	conftest.c) continue;;
-	/*/conftest.c) continue;;
-	-Wp,-MD,*) continue;;
-	-Wp,-MMD,*) continue;;
-	-O[1-9]) continue;;
-	-I/*) ;;
-	-I*) arg=`echo $arg | sed -e "s:-I:-I${LINUX_OBJ}/:"`;;
-      esac
-    fi
-    cr_cv_kconfig_kcflags="$cr_cv_kconfig_kcflags $arg"
-  done
-fi
-echo "$as_me:$LINENO: result: $cr_cv_kconfig_kcflags" >&5
-echo "${ECHO_T}$cr_cv_kconfig_kcflags" >&6
-  KCFLAGS="$cr_cv_kconfig_kcflags"
-    # Do these init steps early, in case first CR_FIND_KSYM is a conditional call
-
-
-
-
-# Checks for matching (we hope) symbol table
-
-
-  echo "$as_me:$LINENO: checking for Linux kernel symbol table" >&5
-echo $ECHO_N "checking for Linux kernel symbol table... $ECHO_C" >&6
-
 
 
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-    if test "${LINUX_SYSTEM_MAP+set}${cr_cv_var_LINUX_SYSTEM_MAP+set}" = setset; then
-    if test "$LINUX_SYSTEM_MAP" != "$cr_cv_var_LINUX_SYSTEM_MAP"; then
-      { { echo "$as_me:$LINENO: error: Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP).  Remove '$cache_file' before re-running configure." >&5
-echo "$as_me: error: Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP).  Remove '$cache_file' before re-running configure." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  elif test "${cr_cv_var_LINUX_SYSTEM_MAP+set}" = set; then
-    LINUX_SYSTEM_MAP="$cr_cv_var_LINUX_SYSTEM_MAP"
-  fi
-
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
+int
+main ()
+{
+struct task_struct x;
+          struct pid tc_1 = x.pids[0];
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_TASK_PIDS_PID=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    if test "${LINUX_VMLINUX+set}${cr_cv_var_LINUX_VMLINUX+set}" = setset; then
-    if test "$LINUX_VMLINUX" != "$cr_cv_var_LINUX_VMLINUX"; then
-      { { echo "$as_me:$LINENO: error: Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX).  Remove '$cache_file' before re-running configure." >&5
-echo "$as_me: error: Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX).  Remove '$cache_file' before re-running configure." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  elif test "${cr_cv_var_LINUX_VMLINUX+set}" = set; then
-    LINUX_VMLINUX="$cr_cv_var_LINUX_VMLINUX"
-  fi
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_TASK_PIDS_PID=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  LINUX_SYMTAB_CMD=""
-  # First try validating the user's (or cached) selection
-  if test -n "$LINUX_SYSTEM_MAP" ; then
 
-  if test -n ""$LINUX_SYSTEM_MAP"" -a -r ""$LINUX_SYSTEM_MAP"" && grep ' [AB] _end' <""$LINUX_SYSTEM_MAP"" >/dev/null 2>/dev/null; then
-    if grep -B1 '[AB] _end' <""$LINUX_SYSTEM_MAP"" | grep _stext >/dev/null 2>/dev/null; then
-      # Reject "stripped" files (such as in FC2)
-      # Recognized (poorly) by _stext and _end as last two entries.
-      cr_stripped_maps="$cr_stripped_maps "$LINUX_SYSTEM_MAP""
-    else
-      LINUX_SYSTEM_MAP=""$LINUX_SYSTEM_MAP""
-      LINUX_SYMTAB_FILE=""$LINUX_SYSTEM_MAP""
-      LINUX_SYMTAB_CMD="cat "$LINUX_SYSTEM_MAP" 2>/dev/null"
-    fi
-  fi
+fi
 
-    if test -z "$LINUX_SYMTAB_CMD"; then
-      # The user specified a file, but we can't use it.  Abort.
-      echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
-      { { echo "$as_me:$LINENO: error: Failed to validate \"$LINUX_SYSTEM_MAP\"" >&5
-echo "$as_me: error: Failed to validate \"$LINUX_SYSTEM_MAP\"" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-  if test -z "$LINUX_SYMTAB_CMD" -a -n "$LINUX_VMLINUX" ; then
+  cr_result=$cr_cv_kconfig_HAVE_TASK_PIDS_PID
 
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_PIDS_PID 1
+_ACEOF
 
-  if test -n ""$LINUX_VMLINUX"" -a -r ""$LINUX_VMLINUX"" && ($NM ""$LINUX_VMLINUX"" | grep ' [AB] _end') >/dev/null 2>/dev/null; then
-    LINUX_VMLINUX=""$LINUX_VMLINUX""
-    LINUX_SYMTAB_FILE=""$LINUX_VMLINUX""
-    LINUX_SYMTAB_CMD="$NM "$LINUX_VMLINUX" 2>/dev/null"
-  fi
+     HAVE_TASK_PIDS_PID=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_PIDS_PID 0
+_ACEOF
 
-    if test -z "$LINUX_SYMTAB_CMD"; then
-      # The user specified a file, but we can't use it.  Abort.
-      echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
-      { { echo "$as_me:$LINENO: error: Failed to validate \"$LINUX_VMLINUX\"" >&5
-echo "$as_me: error: Failed to validate \"$LINUX_VMLINUX\"" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
+     HAVE_TASK_PIDS_PID=''
   fi
-  # Next try searching for System.map or vmlinux in standard locations
-  # Note we use the kernel version found in the headers, not `uname -r`
-  if test -z "$LINUX_SYMTAB_CMD" ; then
-    for cr_file_pattern in "$LINUX_OBJ/@-$LINUX_VER" \
-			   "/boot/@-$LINUX_VER"      \
-			   "/@-$LINUX_VER"           \
-			   "$LINUX_OBJ/@"            \
-			   "/usr/lib/debug/boot/@-$LINUX_VER" \
-			   "/usr/lib/debug/lib/modules/$LINUX_VER/@" \
-			; do
-      # Try System.map in the given location
-      cr_file=`echo $cr_file_pattern | sed -e 's|@|System.map|'`
 
-  if test -n "$cr_file" -a -r "$cr_file" && grep ' [AB] _end' <"$cr_file" >/dev/null 2>/dev/null; then
-    if grep -B1 '[AB] _end' <"$cr_file" | grep _stext >/dev/null 2>/dev/null; then
-      # Reject "stripped" files (such as in FC2)
-      # Recognized (poorly) by _stext and _end as last two entries.
-      cr_stripped_maps="$cr_stripped_maps $cr_file"
-    else
-      LINUX_SYSTEM_MAP="$cr_file"
-      LINUX_SYMTAB_FILE="$cr_file"
-      LINUX_SYMTAB_CMD="cat $cr_file 2>/dev/null"
-    fi
-  fi
 
-      if test -n "$LINUX_SYMTAB_CMD"; then
-	break
-      fi
-      # Try vmlinux in the given location
-      cr_file=`echo $cr_file_pattern | sed -e 's|@|vmlinux|'`
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-  if test -n "$cr_file" -a -r "$cr_file" && ($NM "$cr_file" | grep ' [AB] _end') >/dev/null 2>/dev/null; then
-    LINUX_VMLINUX="$cr_file"
-    LINUX_SYMTAB_FILE="$cr_file"
-    LINUX_SYMTAB_CMD="$NM $cr_file 2>/dev/null"
-  fi
+# Allow zero or one match
+if test "${HAVE_TASK_PIDS_PID_LINK}${HAVE_TASK_PIDS_PID}" = "11"; then
 
-      if test -n "$LINUX_SYMTAB_CMD"; then
-	break
-      fi
-    done
-  fi
-  # Announce our result
-  if test -z "$LINUX_SYMTAB_CMD"; then
-    LINUX_SYMTAB_CMD="true"
-    echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
-    cat >confcache <<\_ACEOF
+  cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 # scripts and configure runs, see configure's option --config-cache.
@@ -27039,49 +31456,38 @@
   fi
 fi
 rm -f confcache
-    if test -n "$cr_stripped_maps"; then
-      { echo "$as_me:$LINENO: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&5
-echo "$as_me: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&2;}
-      { { echo "$as_me:$LINENO: error: Failed to locate kernel symbol table.  Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." >&5
-echo "$as_me: error: Failed to locate kernel symbol table.  Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." >&2;}
-   { (exit 1); exit 1; }; }
-    else
-      { { echo "$as_me:$LINENO: error: Failed to locate kernel symbol table.  Try using --with-system-map or --with-vmlinux." >&5
-echo "$as_me: error: Failed to locate kernel symbol table.  Try using --with-system-map or --with-vmlinux." >&2;}
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" >&2;}
    { (exit 1); exit 1; }; }
-    fi
-  else
-    echo "$as_me:$LINENO: result: $LINUX_SYMTAB_FILE" >&5
-echo "${ECHO_T}$LINUX_SYMTAB_FILE" >&6
-    test -n "$LINUX_SYSTEM_MAP" && cr_cv_var_LINUX_SYSTEM_MAP="$LINUX_SYSTEM_MAP"
-    test -n "$LINUX_VMLINUX" && cr_cv_var_LINUX_VMLINUX="$LINUX_VMLINUX"
 
-   if test -z "$cache_file" || \
-    test "$cache_file" = /dev/null || \
-    cmp "${LINUX_SYMTAB_FILE}" .cached_ksymtab >/dev/null 2>/dev/null; then
-   : # OK - either not caching or cached version still matches
- else
-   if test -f .cached_ksymtab; then
-     { echo "$as_me:$LINENO: WARNING: kernel symbol table has changed... discarding cached results." >&5
-echo "$as_me: WARNING: kernel symbol table has changed... discarding cached results." >&2;}
-     rm -f .cached_ksymtab
-   fi
-   for cr_var in cr_cv_ksymtab__NON_EMPTY_HACK `(set) | grep "^cr_cv_ksymtab_" | cut -d= -f1`; do
-     unset $cr_var
-   done
-   cp "${LINUX_SYMTAB_FILE}" .cached_ksymtab
- fi
+fi
 
-  fi
-  # Now check for consistency w/ the kernel source
-  # XXX: Currently just check SMPness. Can this be more aggressive?
-  echo "$as_me:$LINENO: checking for SMP kernel source" >&5
-echo $ECHO_N "checking for SMP kernel source... $ECHO_C" >&6
+# put_task_struct() requires one of these:
 
-    if test "${cr_cv_kconfig_smp_source+set}" = set; then
+
+  echo "$as_me:$LINENO: checking kernel symbol table for __put_task_struct" >&5
+echo $ECHO_N "checking kernel symbol table for __put_task_struct... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab___put_task_struct+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab___put_task_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__put_task_struct$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab___put_task_struct"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab___put_task_struct\$" >/dev/null ; then
+        cr_cv_ksymtab___put_task_struct=0
+      fi
 
 
   SAVE_CC=$CC
@@ -27103,15 +31509,13 @@
 		 #endif
 		 #include <linux/types.h>
 
-	#include <linux/autoconf.h>
-	#ifndef CONFIG_SMP
-	    choke me
-	#endif
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
 
 int
 main ()
 {
-
+int x = sizeof(&__put_task_struct);
   ;
   return 0;
 }
@@ -27141,7 +31545,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_smp_source=yes
+	 cr_cv_ksymtab___put_task_struct="Y$cr_cv_ksymtab___put_task_struct"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -27149,65 +31553,164 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_smp_source=no
+	 cr_cv_ksymtab___put_task_struct="N$cr_cv_ksymtab___put_task_struct"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_smp_source
-
-  if test $cr_result = yes; then
-    :
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab___put_task_struct"; then
+    cr_result='not found'
   else
-    :
-  fi
+    if expr "$cr_cv_ksymtab___put_task_struct" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern void __put_task_struct(struct task_struct *);
+_EOF
 
+    fi
+    cr_result=`echo $cr_cv_ksymtab___put_task_struct | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(__put_task_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE___put_task_struct $cr_addr
+_ACEOF
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6;
-  cr_kernel_smp=$cr_result
-  echo "$as_me:$LINENO: checking for SMP kernel symbol table" >&5
-echo $ECHO_N "checking for SMP kernel symbol table... $ECHO_C" >&6
-  cr_symtab_smp=no
-  if test -n "`eval $LINUX_SYMTAB_CMD | grep del_timer_sync 2>/dev/null`"; then
-    cr_symtab_smp=yes
   fi
-  echo "$as_me:$LINENO: result: $cr_symtab_smp" >&5
-echo "${ECHO_T}$cr_symtab_smp" >&6;
-  if test "$cr_kernel_smp" != "$cr_symtab_smp"; then
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
 
-    if test "$cr_kernel_smp" = yes; then
-      { { echo "$as_me:$LINENO: error: Kernel source is configured SMP but the kernel symbol table is not.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." >&5
-echo "$as_me: error: Kernel source is configured SMP but the kernel symbol table is not.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." >&2;}
+
+  echo "$as_me:$LINENO: checking kernel symbol table for __put_task_struct_cb" >&5
+echo $ECHO_N "checking kernel symbol table for __put_task_struct_cb... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab___put_task_struct_cb+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_cv_ksymtab___put_task_struct_cb=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__put_task_struct_cb$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab___put_task_struct_cb"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab___put_task_struct_cb\$" >/dev/null ; then
+        cr_cv_ksymtab___put_task_struct_cb=0
+      fi
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
+int
+main ()
+{
+int x = sizeof(&__put_task_struct_cb);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab___put_task_struct_cb="Y$cr_cv_ksymtab___put_task_struct_cb"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab___put_task_struct_cb="N$cr_cv_ksymtab___put_task_struct_cb"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    fi
+
+fi
+
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab___put_task_struct_cb"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab___put_task_struct_cb" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol __put_task_struct_cb but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol __put_task_struct_cb but no declaration -- please file a bug report." >&2;}
    { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab___put_task_struct_cb | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
     else
-      { { echo "$as_me:$LINENO: error: Kernel source is configured uni-processor but the kernel symbol table is SMP.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." >&5
-echo "$as_me: error: Kernel source is configured uni-processor but the kernel symbol table is SMP.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." >&2;}
-   { (exit 1); exit 1; }; }
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(__put_task_struct_cb, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE___put_task_struct_cb $cr_addr
+_ACEOF
+
   fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-## Check for optional kernel headers...
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for linux/syscalls.h" >&5
-echo $ECHO_N "checking kernel for linux/syscalls.h... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for mm.task_size" >&5
+echo $ECHO_N "checking kernel for mm.task_size... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_MM_TASK_SIZE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -27231,14 +31734,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-
-   #include <linux/syscalls.h>
-
+		 #include <linux/sched.h>
 int
 main ()
 {
-
+struct mm_struct x;
+          unsigned long tc_1 = x.task_size;
   ;
   return 0;
 }
@@ -27268,7 +31769,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H=yes
+	 cr_cv_kconfig_HAVE_MM_TASK_SIZE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -27276,27 +31777,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H=no
+	 cr_cv_kconfig_HAVE_MM_TASK_SIZE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H
+  cr_result=$cr_cv_kconfig_HAVE_MM_TASK_SIZE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_SYSCALLS_H 1
+#define HAVE_MM_TASK_SIZE 1
 _ACEOF
 
-     HAVE_LINUX_SYSCALLS_H=1
+     HAVE_MM_TASK_SIZE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_SYSCALLS_H 0
+#define HAVE_MM_TASK_SIZE 0
 _ACEOF
 
-     HAVE_LINUX_SYSCALLS_H=''
+     HAVE_MM_TASK_SIZE=''
   fi
 
 
@@ -27308,10 +31809,11 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for linux/pspace.h" >&5
-echo $ECHO_N "checking kernel for linux/pspace.h... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_LINUX_PSPACE_H+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for PageAnon" >&5
+echo $ECHO_N "checking kernel for PageAnon... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_PAGEANON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -27335,14 +31837,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-
-   #include <linux/pspace.h>
-
+		 #include <linux/mm.h>
 int
 main ()
 {
 
+   #ifdef PageAnon
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&PageAnon);
+   #endif
+
   ;
   return 0;
 }
@@ -27372,7 +31878,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_PSPACE_H=yes
+	 cr_cv_kconfig_HAVE_PAGEANON=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -27380,27 +31886,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_PSPACE_H=no
+	 cr_cv_kconfig_HAVE_PAGEANON=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_LINUX_PSPACE_H
+  cr_result=$cr_cv_kconfig_HAVE_PAGEANON
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_PSPACE_H 1
+#define HAVE_PAGEANON 1
 _ACEOF
 
-     HAVE_LINUX_PSPACE_H=1
+     HAVE_PAGEANON=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_PSPACE_H 0
+#define HAVE_PAGEANON 0
 _ACEOF
 
-     HAVE_LINUX_PSPACE_H=''
+     HAVE_PAGEANON=''
   fi
 
 
@@ -27409,13 +31915,15 @@
 
 
 
+# Look for various VDSO-related bits (arch and version dependent)
 
 
 
-  echo "$as_me:$LINENO: checking kernel for linux/pid_namespace.h" >&5
-echo $ECHO_N "checking kernel for linux/pid_namespace.h... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for thread.vdso_base" >&5
+echo $ECHO_N "checking kernel for thread.vdso_base... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_THREAD_VDSO_BASE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -27439,14 +31947,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-
-   #include <linux/pid_namespace.h>
-
+		 #include <asm/processor.h>
 int
 main ()
 {
-
+struct thread_struct x;
+          unsigned long tc_1 = x.vdso_base;
   ;
   return 0;
 }
@@ -27476,7 +31982,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H=yes
+	 cr_cv_kconfig_HAVE_THREAD_VDSO_BASE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -27484,27 +31990,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H=no
+	 cr_cv_kconfig_HAVE_THREAD_VDSO_BASE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_VDSO_BASE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_PID_NAMESPACE_H 1
+#define HAVE_THREAD_VDSO_BASE 1
 _ACEOF
 
-     HAVE_LINUX_PID_NAMESPACE_H=1
+     HAVE_THREAD_VDSO_BASE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_PID_NAMESPACE_H 0
+#define HAVE_THREAD_VDSO_BASE 0
 _ACEOF
 
-     HAVE_LINUX_PID_NAMESPACE_H=''
+     HAVE_THREAD_VDSO_BASE=''
   fi
 
 
@@ -27516,10 +32022,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for linux/lockdep.h" >&5
-echo $ECHO_N "checking kernel for linux/lockdep.h... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for mm.context.vdso_base" >&5
+echo $ECHO_N "checking kernel for mm.context.vdso_base... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -27543,14 +32049,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-
-   #include <linux/lockdep.h>
-
+		 #include <linux/sched.h>
 int
 main ()
 {
-
+mm_context_t x;
+          unsigned long tc_1 = x.vdso_base;
   ;
   return 0;
 }
@@ -27580,7 +32084,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H=yes
+	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -27588,27 +32092,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H=no
+	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H
+  cr_result=$cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_LOCKDEP_H 1
+#define HAVE_MM_CONTEXT_VDSO_BASE 1
 _ACEOF
 
-     HAVE_LINUX_LOCKDEP_H=1
+     HAVE_MM_CONTEXT_VDSO_BASE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_LOCKDEP_H 0
+#define HAVE_MM_CONTEXT_VDSO_BASE 0
 _ACEOF
 
-     HAVE_LINUX_LOCKDEP_H=''
+     HAVE_MM_CONTEXT_VDSO_BASE=''
   fi
 
 
@@ -27620,10 +32124,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for linux/compile.h" >&5
-echo $ECHO_N "checking kernel for linux/compile.h... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for mm.context.vdso" >&5
+echo $ECHO_N "checking kernel for mm.context.vdso... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_LINUX_COMPILE_H+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -27647,14 +32151,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-
-   #include <linux/compile.h>
-
+		 #include <linux/sched.h>
 int
 main ()
 {
-
+mm_context_t x;
+          unsigned long tc_1 = x.vdso;
   ;
   return 0;
 }
@@ -27684,7 +32186,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_COMPILE_H=yes
+	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -27692,27 +32194,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_COMPILE_H=no
+	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_LINUX_COMPILE_H
+  cr_result=$cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_COMPILE_H 1
+#define HAVE_MM_CONTEXT_VDSO 1
 _ACEOF
 
-     HAVE_LINUX_COMPILE_H=1
+     HAVE_MM_CONTEXT_VDSO=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_COMPILE_H 0
+#define HAVE_MM_CONTEXT_VDSO 0
 _ACEOF
 
-     HAVE_LINUX_COMPILE_H=''
+     HAVE_MM_CONTEXT_VDSO=''
   fi
 
 
@@ -27724,10 +32226,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for linux/fdtable.h" >&5
-echo $ECHO_N "checking kernel for linux/fdtable.h... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for thread_info.sysenter_return" >&5
+echo $ECHO_N "checking kernel for thread_info.sysenter_return... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_LINUX_FDTABLE_H+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -27751,14 +32253,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-
-   #include <linux/fdtable.h>
-
+		 #include <linux/thread_info.h>
 int
 main ()
 {
-
+struct thread_info x;
+          void * tc_1 = x.sysenter_return;
   ;
   return 0;
 }
@@ -27788,7 +32288,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_FDTABLE_H=yes
+	 cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -27796,27 +32296,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_FDTABLE_H=no
+	 cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_LINUX_FDTABLE_H
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_FDTABLE_H 1
+#define HAVE_THREAD_INFO_SYSENTER_RETURN 1
 _ACEOF
 
-     HAVE_LINUX_FDTABLE_H=1
+     HAVE_THREAD_INFO_SYSENTER_RETURN=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_FDTABLE_H 0
+#define HAVE_THREAD_INFO_SYSENTER_RETURN 0
 _ACEOF
 
-     HAVE_LINUX_FDTABLE_H=''
+     HAVE_THREAD_INFO_SYSENTER_RETURN=''
   fi
 
 
@@ -27824,14 +32324,15 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test $CR_KARCH = arm; then
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for linux/utrace.h" >&5
-echo $ECHO_N "checking kernel for linux/utrace.h... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for thread_info.tp_value" >&5
+echo $ECHO_N "checking kernel for thread_info.tp_value... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_LINUX_UTRACE_H+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -27855,14 +32356,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-
-   #include <linux/utrace.h>
-
+		 #include <linux/thread_info.h>
 int
 main ()
 {
-
+struct thread_info x;
+          unsigned long tc_1 = x.tp_value;
   ;
   return 0;
 }
@@ -27892,7 +32391,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_UTRACE_H=yes
+	 cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -27900,27 +32399,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_LINUX_UTRACE_H=no
+	 cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_LINUX_UTRACE_H
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_UTRACE_H 1
+#define HAVE_THREAD_INFO_TP_VALUE 1
 _ACEOF
 
-     HAVE_LINUX_UTRACE_H=1
+     HAVE_THREAD_INFO_TP_VALUE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_UTRACE_H 0
+#define HAVE_THREAD_INFO_TP_VALUE 0
 _ACEOF
 
-     HAVE_LINUX_UTRACE_H=''
+     HAVE_THREAD_INFO_TP_VALUE=''
   fi
 
 
@@ -27930,15 +32429,19 @@
 
 
 
-
-
-  echo "$as_me:$LINENO: checking kernel for asm/elf.h" >&5
-echo $ECHO_N "checking kernel for asm/elf.h... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_ASM_ELF_H+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for __kuser_helper_start" >&5
+echo $ECHO_N "checking kernel symbol table for __kuser_helper_start... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab___kuser_helper_start+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab___kuser_helper_start=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__kuser_helper_start$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab___kuser_helper_start"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab___kuser_helper_start\$" >/dev/null ; then
+        cr_cv_ksymtab___kuser_helper_start=0
+      fi
 
 
   SAVE_CC=$CC
@@ -27960,13 +32463,13 @@
 		 #endif
 		 #include <linux/types.h>
 
-
-   #include <asm/elf.h>
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
 
 int
 main ()
 {
-
+int x = sizeof(&__kuser_helper_start);
   ;
   return 0;
 }
@@ -27996,7 +32499,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_ASM_ELF_H=yes
+	 cr_cv_ksymtab___kuser_helper_start="Y$cr_cv_ksymtab___kuser_helper_start"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -28004,45 +32507,56 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_ASM_ELF_H=no
+	 cr_cv_ksymtab___kuser_helper_start="N$cr_cv_ksymtab___kuser_helper_start"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_ASM_ELF_H
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab___kuser_helper_start"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab___kuser_helper_start" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int __kuser_helper_start(void);
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ASM_ELF_H 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab___kuser_helper_start | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(__kuser_helper_start, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_ASM_ELF_H=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ASM_ELF_H 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE___kuser_helper_start $cr_addr
 _ACEOF
 
-     HAVE_ASM_ELF_H=''
   fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for asm/desc.h" >&5
-echo $ECHO_N "checking kernel for asm/desc.h... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_ASM_DESC_H+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for __kuser_cmpxchg" >&5
+echo $ECHO_N "checking kernel symbol table for __kuser_cmpxchg... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab___kuser_cmpxchg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab___kuser_cmpxchg=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__kuser_cmpxchg$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab___kuser_cmpxchg"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab___kuser_cmpxchg\$" >/dev/null ; then
+        cr_cv_ksymtab___kuser_cmpxchg=0
+      fi
 
 
   SAVE_CC=$CC
@@ -28064,13 +32578,13 @@
 		 #endif
 		 #include <linux/types.h>
 
-   #include <linux/sched.h>
-   #include <asm/desc.h>
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
 
 int
 main ()
 {
-
+int x = sizeof(&__kuser_cmpxchg);
   ;
   return 0;
 }
@@ -28100,7 +32614,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_ASM_DESC_H=yes
+	 cr_cv_ksymtab___kuser_cmpxchg="Y$cr_cv_ksymtab___kuser_cmpxchg"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -28108,42 +32622,50 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_ASM_DESC_H=no
+	 cr_cv_ksymtab___kuser_cmpxchg="N$cr_cv_ksymtab___kuser_cmpxchg"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_ASM_DESC_H
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab___kuser_cmpxchg"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab___kuser_cmpxchg" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int __kuser_cmpxchg(void);
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ASM_DESC_H 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab___kuser_cmpxchg | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(__kuser_cmpxchg, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_ASM_DESC_H=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ASM_DESC_H 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE___kuser_cmpxchg $cr_addr
 _ACEOF
 
-     HAVE_ASM_DESC_H=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+fi
 
 
 
 
+  echo "$as_me:$LINENO: checking kernel for VSYSCALL_BASE" >&5
+echo $ECHO_N "checking kernel for VSYSCALL_BASE... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel for asm/vsyscall32.h" >&5
-echo $ECHO_N "checking kernel for asm/vsyscall32.h... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_VSYSCALL_BASE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -28167,14 +32689,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-
-   #include <asm/vsyscall32.h>
-
+		 #include <asm/elf.h>
 int
 main ()
 {
 
+     typeof(VSYSCALL_BASE) y;
+     int x = sizeof(y);
+
   ;
   return 0;
 }
@@ -28204,7 +32726,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=yes
+	 cr_cv_kconfig_HAVE_VSYSCALL_BASE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -28212,27 +32734,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=no
+	 cr_cv_kconfig_HAVE_VSYSCALL_BASE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H
+  cr_result=$cr_cv_kconfig_HAVE_VSYSCALL_BASE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_ASM_VSYSCALL32_H 1
+#define HAVE_VSYSCALL_BASE 1
 _ACEOF
 
-     HAVE_ASM_VSYSCALL32_H=1
+     HAVE_VSYSCALL_BASE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_ASM_VSYSCALL32_H 0
+#define HAVE_VSYSCALL_BASE 0
 _ACEOF
 
-     HAVE_ASM_VSYSCALL32_H=''
+     HAVE_VSYSCALL_BASE=''
   fi
 
 
@@ -28244,10 +32766,13 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for asm/i387.h" >&5
-echo $ECHO_N "checking kernel for asm/i387.h... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_ASM_I387_H+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for 2-arg arch_setup_additional_pages" >&5
+echo $ECHO_N "checking kernel for 2-arg arch_setup_additional_pages... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -28272,13 +32797,17 @@
 		 #endif
 		 #include <linux/types.h>
 
-
-   #include <asm/i387.h>
+    #include <linux/sched.h>
+    #include <asm/elf.h>
 
 int
 main ()
 {
 
+	#ifndef arch_setup_additional_pages /* Must be macro or have a decl */
+	  int x = sizeof(&arch_setup_additional_pages);
+	#endif
+	    arch_setup_additional_pages(NULL,0);
   ;
   return 0;
 }
@@ -28308,7 +32837,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_ASM_I387_H=yes
+	 cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -28316,27 +32845,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_ASM_I387_H=no
+	 cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_ASM_I387_H
+  cr_result=$cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_ASM_I387_H 1
+#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1
 _ACEOF
 
-     HAVE_ASM_I387_H=1
+     HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_ASM_I387_H 0
+#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0
 _ACEOF
 
-     HAVE_ASM_I387_H=''
+     HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=''
   fi
 
 
@@ -28345,23 +32874,20 @@
 
 
 
-## Now we check for specific kernel features...
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for timeval_to_jiffies" >&5
-echo $ECHO_N "checking kernel symbol table for timeval_to_jiffies... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_timeval_to_jiffies+set}" = set; then
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 4-arg arch_setup_additional_pages" >&5
+echo $ECHO_N "checking kernel for 4-arg arch_setup_additional_pages... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_timeval_to_jiffies=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}timeval_to_jiffies$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_timeval_to_jiffies"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_timeval_to_jiffies\$" >/dev/null ; then
-        cr_cv_ksymtab_timeval_to_jiffies=0
-      fi
 
 
   SAVE_CC=$CC
@@ -28383,13 +32909,17 @@
 		 #endif
 		 #include <linux/types.h>
 
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+    #include <linux/sched.h>
+    #include <asm/elf.h>
 
 int
 main ()
 {
-int x = sizeof(&timeval_to_jiffies);
+
+	#ifndef arch_setup_additional_pages /* Must be macro or have a decl */
+	  int x = sizeof(&arch_setup_additional_pages);
+	#endif
+	    arch_setup_additional_pages(NULL,0,0,0);
   ;
   return 0;
 }
@@ -28419,7 +32949,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_timeval_to_jiffies="Y$cr_cv_ksymtab_timeval_to_jiffies"
+	 cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -28427,54 +32957,51 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_timeval_to_jiffies="N$cr_cv_ksymtab_timeval_to_jiffies"
+	 cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_timeval_to_jiffies"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_timeval_to_jiffies" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol timeval_to_jiffies but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol timeval_to_jiffies but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_timeval_to_jiffies | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(timeval_to_jiffies, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_timeval_to_jiffies $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1
 _ACEOF
 
+     HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0
+_ACEOF
+
+     HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for jiffies_to_timeval" >&5
-echo $ECHO_N "checking kernel symbol table for jiffies_to_timeval... $ECHO_C" >&6
+
+if test -n "${HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES}${HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES}"; then
+
+
+  echo "$as_me:$LINENO: checking kernel symbol table for arch_setup_additional_pages" >&5
+echo $ECHO_N "checking kernel symbol table for arch_setup_additional_pages... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_jiffies_to_timeval+set}" = set; then
+    if test "${cr_cv_ksymtab_arch_setup_additional_pages+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_jiffies_to_timeval=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}jiffies_to_timeval$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_jiffies_to_timeval"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_jiffies_to_timeval\$" >/dev/null ; then
-        cr_cv_ksymtab_jiffies_to_timeval=0
+    cr_cv_ksymtab_arch_setup_additional_pages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_setup_additional_pages$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_arch_setup_additional_pages"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_arch_setup_additional_pages\$" >/dev/null ; then
+        cr_cv_ksymtab_arch_setup_additional_pages=0
       fi
 
 
@@ -28503,7 +33030,7 @@
 int
 main ()
 {
-int x = sizeof(&jiffies_to_timeval);
+int x = sizeof(&arch_setup_additional_pages);
   ;
   return 0;
 }
@@ -28533,7 +33060,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_jiffies_to_timeval="Y$cr_cv_ksymtab_jiffies_to_timeval"
+	 cr_cv_ksymtab_arch_setup_additional_pages="Y$cr_cv_ksymtab_arch_setup_additional_pages"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -28541,7 +33068,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_jiffies_to_timeval="N$cr_cv_ksymtab_jiffies_to_timeval"
+	 cr_cv_ksymtab_arch_setup_additional_pages="N$cr_cv_ksymtab_arch_setup_additional_pages"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -28550,40 +33077,40 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_jiffies_to_timeval"; then
+  if test -z "$cr_cv_ksymtab_arch_setup_additional_pages"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_jiffies_to_timeval" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol jiffies_to_timeval but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol jiffies_to_timeval but no declaration -- please file a bug report." >&2;}
+    if expr "$cr_cv_ksymtab_arch_setup_additional_pages" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." >&2;}
    { (exit 1); exit 1; }; }
     fi
-    cr_result=`echo $cr_cv_ksymtab_jiffies_to_timeval | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_arch_setup_additional_pages | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(jiffies_to_timeval, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(arch_setup_additional_pages, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_jiffies_to_timeval $cr_addr
+#define CR_KCODE_arch_setup_additional_pages $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+fi
 
 
 
 
+  echo "$as_me:$LINENO: checking kernel for map_vsyscall" >&5
+echo $ECHO_N "checking kernel for map_vsyscall... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel for struct fdtable" >&5
-echo $ECHO_N "checking kernel for struct fdtable... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_STRUCT_FDTABLE+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_MAP_VSYSCALL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -28609,128 +33136,21 @@
 		 #include <linux/types.h>
 
     #include <linux/sched.h>
-    #include <linux/file.h>
-    #if HAVE_LINUX_FDTABLE_H
-      #include <linux/fdtable.h>
+    #include <asm/elf.h>
+    #ifndef __HAVE_ARCH_VSYSCALL
+      choke me
     #endif
-
 int
 main ()
 {
 
-     struct fdtable y;
-     int x = sizeof(y);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_STRUCT_FDTABLE=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_STRUCT_FDTABLE=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_STRUCT_FDTABLE
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_FDTABLE 1
-_ACEOF
-
-     HAVE_STRUCT_FDTABLE=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_FDTABLE 0
-_ACEOF
-
-     HAVE_STRUCT_FDTABLE=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-# OK if missing
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for files_struct.next_fd" >&5
-echo $ECHO_N "checking kernel for files_struct.next_fd... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-    #include <linux/sched.h>
-    #include <linux/file.h>
-    #if HAVE_LINUX_FDTABLE_H
-      #include <linux/fdtable.h>
-    #endif
+   #ifdef map_vsyscall
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&map_vsyscall);
+   #endif
 
-int
-main ()
-{
-struct files_struct x;
-          int tc_1 = x.next_fd;
   ;
   return 0;
 }
@@ -28760,7 +33180,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD=yes
+	 cr_cv_kconfig_HAVE_MAP_VSYSCALL=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -28768,27 +33188,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD=no
+	 cr_cv_kconfig_HAVE_MAP_VSYSCALL=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD
+  cr_result=$cr_cv_kconfig_HAVE_MAP_VSYSCALL
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FILES_STRUCT_NEXT_FD 1
+#define HAVE_MAP_VSYSCALL 1
 _ACEOF
 
-     HAVE_FILES_STRUCT_NEXT_FD=1
+     HAVE_MAP_VSYSCALL=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FILES_STRUCT_NEXT_FD 0
+#define HAVE_MAP_VSYSCALL 0
 _ACEOF
 
-     HAVE_FILES_STRUCT_NEXT_FD=''
+     HAVE_MAP_VSYSCALL=''
   fi
 
 
@@ -28796,17 +33216,22 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test -n "${HAVE_MAP_VSYSCALL}"; then
 
 
-
-
-  echo "$as_me:$LINENO: checking kernel for fdtable.next_fd" >&5
-echo $ECHO_N "checking kernel for fdtable.next_fd... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for map_vsyscall" >&5
+echo $ECHO_N "checking kernel symbol table for map_vsyscall... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_map_vsyscall+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_map_vsyscall=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}map_vsyscall$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_map_vsyscall"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_map_vsyscall\$" >/dev/null ; then
+        cr_cv_ksymtab_map_vsyscall=0
+      fi
 
 
   SAVE_CC=$CC
@@ -28828,17 +33253,13 @@
 		 #endif
 		 #include <linux/types.h>
 
-    #include <linux/sched.h>
-    #include <linux/file.h>
-    #if HAVE_LINUX_FDTABLE_H
-      #include <linux/fdtable.h>
-    #endif
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
 
 int
 main ()
 {
-struct fdtable x;
-          int tc_1 = x.next_fd;
+int x = sizeof(&map_vsyscall);
   ;
   return 0;
 }
@@ -28868,7 +33289,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD=yes
+	 cr_cv_ksymtab_map_vsyscall="Y$cr_cv_ksymtab_map_vsyscall"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -28876,118 +33297,57 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD=no
+	 cr_cv_ksymtab_map_vsyscall="N$cr_cv_ksymtab_map_vsyscall"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FDTABLE_NEXT_FD 1
-_ACEOF
-
-     HAVE_FDTABLE_NEXT_FD=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FDTABLE_NEXT_FD 0
-_ACEOF
-
-     HAVE_FDTABLE_NEXT_FD=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-# Allow only exactly one match
-if test "${HAVE_FILES_STRUCT_NEXT_FD}${HAVE_FDTABLE_NEXT_FD}" != "1"; then
-
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_map_vsyscall"; then
+    cr_result='not found'
   else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" >&2;}
+    if expr "$cr_cv_ksymtab_map_vsyscall" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol map_vsyscall but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol map_vsyscall but no declaration -- please file a bug report." >&2;}
    { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_map_vsyscall | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(map_vsyscall, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-fi
-
-
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_map_vsyscall $cr_addr
+_ACEOF
 
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
+fi
+if test $CR_KARCH = x86_64; then
 
-  echo "$as_me:$LINENO: checking kernel for files_struct.max_fdset" >&5
-echo $ECHO_N "checking kernel for files_struct.max_fdset... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for syscall32_setup_pages" >&5
+echo $ECHO_N "checking kernel symbol table for syscall32_setup_pages... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_syscall32_setup_pages+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_syscall32_setup_pages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}syscall32_setup_pages$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_syscall32_setup_pages"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_syscall32_setup_pages\$" >/dev/null ; then
+        cr_cv_ksymtab_syscall32_setup_pages=0
+      fi
 
 
   SAVE_CC=$CC
@@ -29009,17 +33369,13 @@
 		 #endif
 		 #include <linux/types.h>
 
-    #include <linux/sched.h>
-    #include <linux/file.h>
-    #if HAVE_LINUX_FDTABLE_H
-      #include <linux/fdtable.h>
-    #endif
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
 
 int
 main ()
 {
-struct files_struct x;
-          int tc_1 = x.max_fdset;
+int x = sizeof(&syscall32_setup_pages);
   ;
   return 0;
 }
@@ -29049,7 +33405,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET=yes
+	 cr_cv_ksymtab_syscall32_setup_pages="Y$cr_cv_ksymtab_syscall32_setup_pages"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -29057,46 +33413,58 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET=no
+	 cr_cv_ksymtab_syscall32_setup_pages="N$cr_cv_ksymtab_syscall32_setup_pages"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_syscall32_setup_pages"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_syscall32_setup_pages" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int syscall32_setup_pages(void *, int);
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FILES_STRUCT_MAX_FDSET 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_syscall32_setup_pages | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(syscall32_setup_pages, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_FILES_STRUCT_MAX_FDSET=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FILES_STRUCT_MAX_FDSET 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_syscall32_setup_pages $cr_addr
 _ACEOF
 
-     HAVE_FILES_STRUCT_MAX_FDSET=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+fi
+if test $CR_KARCH = arm; then
 
 
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for struct path" >&5
-echo $ECHO_N "checking kernel for struct path... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_STRUCT_PATH+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for vectors_user_mapping" >&5
+echo $ECHO_N "checking kernel symbol table for vectors_user_mapping... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_vectors_user_mapping+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_vectors_user_mapping=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}vectors_user_mapping$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_vectors_user_mapping"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_vectors_user_mapping\$" >/dev/null ; then
+        cr_cv_ksymtab_vectors_user_mapping=0
+      fi
 
 
   SAVE_CC=$CC
@@ -29117,14 +33485,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-     struct path y;
-     int x = sizeof(y);
-
+int x = sizeof(&vectors_user_mapping);
   ;
   return 0;
 }
@@ -29154,7 +33522,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_STRUCT_PATH=yes
+	 cr_cv_ksymtab_vectors_user_mapping="Y$cr_cv_ksymtab_vectors_user_mapping"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -29162,44 +33530,58 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_STRUCT_PATH=no
+	 cr_cv_ksymtab_vectors_user_mapping="N$cr_cv_ksymtab_vectors_user_mapping"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_STRUCT_PATH
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_vectors_user_mapping"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_vectors_user_mapping" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int vectors_user_mapping(void);
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_PATH 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_vectors_user_mapping | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(vectors_user_mapping, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_STRUCT_PATH=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_PATH 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_vectors_user_mapping $cr_addr
 _ACEOF
 
-     HAVE_STRUCT_PATH=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+fi
 
 
 
-
-  echo "$as_me:$LINENO: checking kernel for nameidata.path" >&5
-echo $ECHO_N "checking kernel for nameidata.path... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_NAMEIDATA_PATH+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for arch_pick_mmap_layout" >&5
+echo $ECHO_N "checking kernel symbol table for arch_pick_mmap_layout... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_arch_pick_mmap_layout+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_arch_pick_mmap_layout=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_pick_mmap_layout$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_arch_pick_mmap_layout"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_arch_pick_mmap_layout\$" >/dev/null ; then
+        cr_cv_ksymtab_arch_pick_mmap_layout=0
+      fi
 
 
   SAVE_CC=$CC
@@ -29221,28 +33603,13 @@
 		 #endif
 		 #include <linux/types.h>
 
-    #include <linux/sched.h>
-    #include <linux/fs.h>
-    #include <linux/dcache.h>
-    #include <linux/namei.h>
-    #include <linux/fs_struct.h>
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
 
 int
 main ()
 {
-
-    /* Expect "struct path pwd" in fs_struct */
-    struct fs_struct s1;
-    struct path t1 = s1.pwd;
-
-    /* Expect "struct path path" used in nameidata */
-    struct nameidata s2;
-    struct path t2 = s2.path;
-
-    /* Expect d_path() and set_fs_pwd() to pass path */
-    (void)d_path(&t1, NULL, 0);
-    (void)set_fs_pwd(&s1, &t2);
-
+int x = sizeof(&arch_pick_mmap_layout);
   ;
   return 0;
 }
@@ -29272,7 +33639,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_NAMEIDATA_PATH=yes
+	 cr_cv_ksymtab_arch_pick_mmap_layout="Y$cr_cv_ksymtab_arch_pick_mmap_layout"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -29280,43 +33647,55 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_NAMEIDATA_PATH=no
+	 cr_cv_ksymtab_arch_pick_mmap_layout="N$cr_cv_ksymtab_arch_pick_mmap_layout"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_NAMEIDATA_PATH
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_NAMEIDATA_PATH 1
-_ACEOF
-
-     HAVE_NAMEIDATA_PATH=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_arch_pick_mmap_layout"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_NAMEIDATA_PATH 0
+    if expr "$cr_cv_ksymtab_arch_pick_mmap_layout" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_arch_pick_mmap_layout | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(arch_pick_mmap_layout, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_arch_pick_mmap_layout $cr_addr
 _ACEOF
 
-     HAVE_NAMEIDATA_PATH=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-  echo "$as_me:$LINENO: checking kernel for nameidata.dentry" >&5
-echo $ECHO_N "checking kernel for nameidata.dentry... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for arch_get_unmaped_area" >&5
+echo $ECHO_N "checking kernel symbol table for arch_get_unmaped_area... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_arch_get_unmaped_area+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_arch_get_unmaped_area=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_get_unmaped_area$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_arch_get_unmaped_area"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_arch_get_unmaped_area\$" >/dev/null ; then
+        cr_cv_ksymtab_arch_get_unmaped_area=0
+      fi
 
 
   SAVE_CC=$CC
@@ -29338,28 +33717,13 @@
 		 #endif
 		 #include <linux/types.h>
 
-    #include <linux/sched.h>
-    #include <linux/fs.h>
-    #include <linux/dcache.h>
-    #include <linux/namei.h>
-    #include <linux/fs_struct.h>
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
 
 int
 main ()
 {
-
-    /* Expect "struct dentry *pwd" in fs_struct */
-    struct fs_struct s1;
-    struct dentry t1 = *s1.pwd;
-
-    /* Expect "struct dentry *dentry" in nameidata */
-    struct nameidata s2;
-    struct dentry t2 = *s2.dentry;
-
-    /* Expect d_path() and set_fs_pwd() to pass dentry */
-    (void)d_path(&t1, NULL, NULL, 0);
-    (void)set_fs_pwd(&s1, NULL, &t2);
-
+int x = sizeof(&arch_get_unmaped_area);
   ;
   return 0;
 }
@@ -29389,7 +33753,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY=yes
+	 cr_cv_ksymtab_arch_get_unmaped_area="Y$cr_cv_ksymtab_arch_get_unmaped_area"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -29397,113 +33761,162 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY=no
+	 cr_cv_ksymtab_arch_get_unmaped_area="N$cr_cv_ksymtab_arch_get_unmaped_area"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_NAMEIDATA_DENTRY 1
-_ACEOF
-
-     HAVE_NAMEIDATA_DENTRY=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_arch_get_unmaped_area"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_NAMEIDATA_DENTRY 0
+    if expr "$cr_cv_ksymtab_arch_get_unmaped_area" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_arch_get_unmaped_area | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(arch_get_unmaped_area, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_arch_get_unmaped_area $cr_addr
 _ACEOF
 
-     HAVE_NAMEIDATA_DENTRY=''
   fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
 
-if test "${HAVE_NAMEIDATA_PATH}${HAVE_NAMEIDATA_DENTRY}" != "1"; then
+  echo "$as_me:$LINENO: checking kernel symbol table for arch_unmap_area" >&5
+echo $ECHO_N "checking kernel symbol table for arch_unmap_area... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_arch_unmap_area+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_cv_ksymtab_arch_unmap_area=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_unmap_area$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_arch_unmap_area"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_arch_unmap_area\$" >/dev/null ; then
+        cr_cv_ksymtab_arch_unmap_area=0
+      fi
 
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
 
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
+int
+main ()
 {
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
+int x = sizeof(&arch_unmap_area);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_arch_unmap_area="Y$cr_cv_ksymtab_arch_unmap_area"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_arch_unmap_area="N$cr_cv_ksymtab_arch_unmap_area"
 fi
-rm -f confcache
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
+    fi
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" >&2;}
+fi
+
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_arch_unmap_area"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_arch_unmap_area" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol arch_unmap_area but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol arch_unmap_area but no declaration -- please file a bug report." >&2;}
    { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_arch_unmap_area | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(arch_unmap_area, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-fi
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_arch_unmap_area $cr_addr
+_ACEOF
 
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for __putname" >&5
-echo $ECHO_N "checking kernel for __putname... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE___PUTNAME+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for mm.mmap_base" >&5
+echo $ECHO_N "checking kernel for mm.mmap_base... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_MM_MMAP_BASE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -29527,18 +33940,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-
-   #ifdef __putname
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&__putname);
-   #endif
-
+struct mm_struct x;
+          unsigned long tc_1 = x.mmap_base;
   ;
   return 0;
 }
@@ -29568,7 +33975,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE___PUTNAME=yes
+	 cr_cv_kconfig_HAVE_MM_MMAP_BASE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -29576,27 +33983,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE___PUTNAME=no
+	 cr_cv_kconfig_HAVE_MM_MMAP_BASE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE___PUTNAME
+  cr_result=$cr_cv_kconfig_HAVE_MM_MMAP_BASE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE___PUTNAME 1
+#define HAVE_MM_MMAP_BASE 1
 _ACEOF
 
-     HAVE___PUTNAME=1
+     HAVE_MM_MMAP_BASE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE___PUTNAME 0
+#define HAVE_MM_MMAP_BASE 0
 _ACEOF
 
-     HAVE___PUTNAME=''
+     HAVE_MM_MMAP_BASE=''
   fi
 
 
@@ -29608,11 +34015,10 @@
 
 
 
+  echo "$as_me:$LINENO: checking kernel for mm.cached_hole_size" >&5
+echo $ECHO_N "checking kernel for mm.cached_hole_size... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel for struct delayed_work" >&5
-echo $ECHO_N "checking kernel for struct delayed_work... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -29636,14 +34042,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/workqueue.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-
-     struct delayed_work y;
-     int x = sizeof(y);
-
+struct mm_struct x;
+          unsigned long tc_1 = x.cached_hole_size;
   ;
   return 0;
 }
@@ -29673,7 +34077,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK=yes
+	 cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -29681,27 +34085,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK=no
+	 cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK
+  cr_result=$cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_DELAYED_WORK 1
+#define HAVE_MM_CACHED_HOLE_SIZE 1
 _ACEOF
 
-     HAVE_STRUCT_DELAYED_WORK=1
+     HAVE_MM_CACHED_HOLE_SIZE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_DELAYED_WORK 0
+#define HAVE_MM_CACHED_HOLE_SIZE 0
 _ACEOF
 
-     HAVE_STRUCT_DELAYED_WORK=''
+     HAVE_MM_CACHED_HOLE_SIZE=''
   fi
 
 
@@ -29710,15 +34114,14 @@
 
 
 
-# Order for "best" match
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for do_each_pid_task" >&5
-echo $ECHO_N "checking kernel for do_each_pid_task... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for CONFIG_HUGETLBFS" >&5
+echo $ECHO_N "checking kernel for CONFIG_HUGETLBFS... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_DO_EACH_PID_TASK+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -29742,12 +34145,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
 int
 main ()
 {
 
-   #ifndef do_each_pid_task
+   #ifndef CONFIG_HUGETLBFS
      choke me
    #endif
 
@@ -29780,7 +34183,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_DO_EACH_PID_TASK=yes
+	 cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -29788,27 +34191,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_DO_EACH_PID_TASK=no
+	 cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_DO_EACH_PID_TASK
+  cr_result=$cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_DO_EACH_PID_TASK 1
+#define HAVE_CONFIG_HUGETLBFS 1
 _ACEOF
 
-     HAVE_DO_EACH_PID_TASK=1
+     HAVE_CONFIG_HUGETLBFS=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_DO_EACH_PID_TASK 0
+#define HAVE_CONFIG_HUGETLBFS 0
 _ACEOF
 
-     HAVE_DO_EACH_PID_TASK=''
+     HAVE_CONFIG_HUGETLBFS=''
   fi
 
 
@@ -29816,17 +34219,22 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test -n "${HAVE_CONFIG_HUGETLBFS}"; then
 
 
-
-
-  echo "$as_me:$LINENO: checking kernel for do_each_task_pid" >&5
-echo $ECHO_N "checking kernel for do_each_task_pid... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_DO_EACH_TASK_PID+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for hugetlbfs_file_operations" >&5
+echo $ECHO_N "checking kernel symbol table for hugetlbfs_file_operations... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_hugetlbfs_file_operations+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_hugetlbfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}hugetlbfs_file_operations$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_hugetlbfs_file_operations"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_hugetlbfs_file_operations\$" >/dev/null ; then
+        cr_cv_ksymtab_hugetlbfs_file_operations=0
+      fi
 
 
   SAVE_CC=$CC
@@ -29847,15 +34255,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-   #ifndef do_each_task_pid
-     choke me
-   #endif
-
+int x = sizeof(&hugetlbfs_file_operations);
   ;
   return 0;
 }
@@ -29885,7 +34292,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_DO_EACH_TASK_PID=yes
+	 cr_cv_ksymtab_hugetlbfs_file_operations="Y$cr_cv_ksymtab_hugetlbfs_file_operations"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -29893,46 +34300,56 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_DO_EACH_TASK_PID=no
+	 cr_cv_ksymtab_hugetlbfs_file_operations="N$cr_cv_ksymtab_hugetlbfs_file_operations"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_DO_EACH_TASK_PID
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_hugetlbfs_file_operations"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_hugetlbfs_file_operations" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern const struct file_operations hugetlbfs_file_operations;
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_DO_EACH_TASK_PID 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_hugetlbfs_file_operations | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(hugetlbfs_file_operations, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_DO_EACH_TASK_PID=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_DO_EACH_TASK_PID 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_hugetlbfs_file_operations $cr_addr
 _ACEOF
 
-     HAVE_DO_EACH_TASK_PID=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test -z "${HAVE_DO_EACH_TASK_PID}"; then
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for for_each_task_pid" >&5
-echo $ECHO_N "checking kernel for for_each_task_pid... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for is_file_shm_hugepages" >&5
+echo $ECHO_N "checking kernel symbol table for is_file_shm_hugepages... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_is_file_shm_hugepages+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_is_file_shm_hugepages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}is_file_shm_hugepages$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_is_file_shm_hugepages"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_is_file_shm_hugepages\$" >/dev/null ; then
+        cr_cv_ksymtab_is_file_shm_hugepages=0
+      fi
 
 
   SAVE_CC=$CC
@@ -29953,15 +34370,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-   #ifndef for_each_task_pid
-     choke me
-   #endif
-
+int x = sizeof(&is_file_shm_hugepages);
   ;
   return 0;
 }
@@ -29991,7 +34407,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID=yes
+	 cr_cv_ksymtab_is_file_shm_hugepages="Y$cr_cv_ksymtab_is_file_shm_hugepages"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -29999,119 +34415,56 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID=no
+	 cr_cv_ksymtab_is_file_shm_hugepages="N$cr_cv_ksymtab_is_file_shm_hugepages"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FOR_EACH_TASK_PID 1
-_ACEOF
-
-     HAVE_FOR_EACH_TASK_PID=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_is_file_shm_hugepages"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FOR_EACH_TASK_PID 0
-_ACEOF
-
-     HAVE_FOR_EACH_TASK_PID=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-fi
-# Require 1 or more match
-if test -z "${HAVE_DO_EACH_PID_TASK}${HAVE_DO_EACH_TASK_PID}${HAVE_FOR_EACH_TASK_PID}"; then
+    if expr "$cr_cv_ksymtab_is_file_shm_hugepages" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int is_file_shm_hugepages(struct file *file);
+_EOF
 
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+    fi
+    cr_result=`echo $cr_cv_ksymtab_is_file_shm_hugepages | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(is_file_shm_hugepages, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_is_file_shm_hugepages $cr_addr
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
   fi
-fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to find a task iterator" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to find a task iterator" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
-
-
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-  echo "$as_me:$LINENO: checking kernel for 2.6.0 task ids" >&5
-echo $ECHO_N "checking kernel for 2.6.0 task ids... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_2_6_0_TASK_IDS+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for hugepage_vma" >&5
+echo $ECHO_N "checking kernel symbol table for hugepage_vma... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_hugepage_vma+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_hugepage_vma=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}hugepage_vma$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_hugepage_vma"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_hugepage_vma\$" >/dev/null ; then
+        cr_cv_ksymtab_hugepage_vma=0
+      fi
 
 
   SAVE_CC=$CC
@@ -30132,12 +34485,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct task_struct x;
-          int tc_1 = x.__pgrp;
+int x = sizeof(&hugepage_vma);
   ;
   return 0;
 }
@@ -30167,7 +34522,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_0_TASK_IDS=yes
+	 cr_cv_ksymtab_hugepage_vma="Y$cr_cv_ksymtab_hugepage_vma"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -30175,45 +34530,56 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_0_TASK_IDS=no
+	 cr_cv_ksymtab_hugepage_vma="N$cr_cv_ksymtab_hugepage_vma"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_6_0_TASK_IDS
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_hugepage_vma"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_hugepage_vma" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern struct vm_area_struct *hugepage_vma(struct mm_struct *, unsigned long);
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_0_TASK_IDS 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_hugepage_vma | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(hugepage_vma, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_2_6_0_TASK_IDS=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_0_TASK_IDS 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_hugepage_vma $cr_addr
 _ACEOF
 
-     HAVE_2_6_0_TASK_IDS=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 2.6.6 task ids" >&5
-echo $ECHO_N "checking kernel for 2.6.6 task ids... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_2_6_6_TASK_IDS+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for pmd_huge" >&5
+echo $ECHO_N "checking kernel symbol table for pmd_huge... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_pmd_huge+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_pmd_huge=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}pmd_huge$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_pmd_huge"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pmd_huge\$" >/dev/null ; then
+        cr_cv_ksymtab_pmd_huge=0
+      fi
 
 
   SAVE_CC=$CC
@@ -30234,12 +34600,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct task_struct x;
-          int tc_1 = x.signal->session;
+int x = sizeof(&pmd_huge);
   ;
   return 0;
 }
@@ -30269,7 +34637,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_6_TASK_IDS=yes
+	 cr_cv_ksymtab_pmd_huge="Y$cr_cv_ksymtab_pmd_huge"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -30277,45 +34645,56 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_6_TASK_IDS=no
+	 cr_cv_ksymtab_pmd_huge="N$cr_cv_ksymtab_pmd_huge"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_6_6_TASK_IDS
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_pmd_huge"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_pmd_huge" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int pmd_huge(pmd_t pmd);
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_6_TASK_IDS 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_pmd_huge | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(pmd_huge, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_2_6_6_TASK_IDS=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_6_TASK_IDS 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_pmd_huge $cr_addr
 _ACEOF
 
-     HAVE_2_6_6_TASK_IDS=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 2.6.20 task ids" >&5
-echo $ECHO_N "checking kernel for 2.6.20 task ids... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_2_6_20_TASK_IDS+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for follow_huge_pmd" >&5
+echo $ECHO_N "checking kernel symbol table for follow_huge_pmd... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_follow_huge_pmd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_follow_huge_pmd=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}follow_huge_pmd$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_follow_huge_pmd"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_follow_huge_pmd\$" >/dev/null ; then
+        cr_cv_ksymtab_follow_huge_pmd=0
+      fi
 
 
   SAVE_CC=$CC
@@ -30336,15 +34715,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-	#ifndef process_session /* Must be macro or have a decl */
-	  int x = sizeof(&process_session);
-	#endif
-	    int tc_1 = process_session(NULL);
+int x = sizeof(&follow_huge_pmd);
   ;
   return 0;
 }
@@ -30374,7 +34752,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_20_TASK_IDS=yes
+	 cr_cv_ksymtab_follow_huge_pmd="Y$cr_cv_ksymtab_follow_huge_pmd"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -30382,45 +34760,56 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_20_TASK_IDS=no
+	 cr_cv_ksymtab_follow_huge_pmd="N$cr_cv_ksymtab_follow_huge_pmd"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_6_20_TASK_IDS
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_follow_huge_pmd"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_follow_huge_pmd" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern struct page * follow_huge_pmd(struct mm_struct *, unsigned long  pmd_t *, int);
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_20_TASK_IDS 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_follow_huge_pmd | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(follow_huge_pmd, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_2_6_20_TASK_IDS=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_20_TASK_IDS 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_follow_huge_pmd $cr_addr
 _ACEOF
 
-     HAVE_2_6_20_TASK_IDS=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 2.6.24 task ids" >&5
-echo $ECHO_N "checking kernel for 2.6.24 task ids... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_2_6_24_TASK_IDS+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for follow_huge_addr" >&5
+echo $ECHO_N "checking kernel symbol table for follow_huge_addr... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_follow_huge_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_follow_huge_addr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}follow_huge_addr$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_follow_huge_addr"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_follow_huge_addr\$" >/dev/null ; then
+        cr_cv_ksymtab_follow_huge_addr=0
+      fi
 
 
   SAVE_CC=$CC
@@ -30441,15 +34830,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-	#ifndef task_session_vnr /* Must be macro or have a decl */
-	  int x = sizeof(&task_session_vnr);
-	#endif
-	    int tc_1 = task_session_vnr(NULL);
+int x = sizeof(&follow_huge_addr);
   ;
   return 0;
 }
@@ -30479,7 +34867,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_24_TASK_IDS=yes
+	 cr_cv_ksymtab_follow_huge_addr="Y$cr_cv_ksymtab_follow_huge_addr"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -30487,117 +34875,51 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_24_TASK_IDS=no
+	 cr_cv_ksymtab_follow_huge_addr="N$cr_cv_ksymtab_follow_huge_addr"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_6_24_TASK_IDS
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_24_TASK_IDS 1
-_ACEOF
-
-     HAVE_2_6_24_TASK_IDS=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_24_TASK_IDS 0
-_ACEOF
-
-     HAVE_2_6_24_TASK_IDS=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-# Should allow only exactly one match, except that 2.6.6 and 2.6.20/24 overlap during transitional period
-case "${HAVE_2_6_0_TASK_IDS}X${HAVE_2_6_6_TASK_IDS}X${HAVE_2_6_20_TASK_IDS}${HAVE_2_6_24_TASK_IDS}" in
-    1XX|X1X|X1X1|XX1) # OK
-	;;
-    *)
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_follow_huge_addr"; then
+    cr_result='not found'
   else
-    echo "not updating unwritable cache $cache_file"
+    if expr "$cr_cv_ksymtab_follow_huge_addr" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol follow_huge_addr but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol follow_huge_addr but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_follow_huge_addr | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(follow_huge_addr, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_follow_huge_addr $cr_addr
+_ACEOF
+
   fi
-fi
-rm -f confcache
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+ # Must have prototype, or NARGS probe will fail
 
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" >&2;}
-   { (exit 1); exit 1; }; }
 
-	;;
-esac
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for set_task_pgrp" >&5
-echo $ECHO_N "checking kernel for set_task_pgrp... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for 3-arg follow_huge_addr" >&5
+echo $ECHO_N "checking kernel for 3-arg follow_huge_addr... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_SET_TASK_PGRP+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -30621,18 +34943,16 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+		 #include <linux/mm.h>
+						 #include <linux/hugetlb.h>
 int
 main ()
 {
 
-   #ifdef set_task_pgrp
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&set_task_pgrp);
-   #endif
-
+	#ifndef follow_huge_addr /* Must be macro or have a decl */
+	  int x = sizeof(&follow_huge_addr);
+	#endif
+	    follow_huge_addr(NULL,0,0);
   ;
   return 0;
 }
@@ -30662,7 +34982,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SET_TASK_PGRP=yes
+	 cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -30670,27 +34990,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SET_TASK_PGRP=no
+	 cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_SET_TASK_PGRP
+  cr_result=$cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SET_TASK_PGRP 1
+#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 1
 _ACEOF
 
-     HAVE_SET_TASK_PGRP=1
+     HAVE_3_ARG_FOLLOW_HUGE_ADDR=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SET_TASK_PGRP 0
+#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 0
 _ACEOF
 
-     HAVE_SET_TASK_PGRP=''
+     HAVE_3_ARG_FOLLOW_HUGE_ADDR=''
   fi
 
 
@@ -30702,10 +35022,14 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for set_task_session" >&5
-echo $ECHO_N "checking kernel for set_task_session... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_SET_TASK_SESSION+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 4-arg follow_huge_addr" >&5
+echo $ECHO_N "checking kernel for 4-arg follow_huge_addr... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -30729,18 +35053,16 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+		 #include <linux/mm.h>
+						 #include <linux/hugetlb.h>
 int
 main ()
 {
 
-   #ifdef set_task_session
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&set_task_session);
-   #endif
-
+	#ifndef follow_huge_addr /* Must be macro or have a decl */
+	  int x = sizeof(&follow_huge_addr);
+	#endif
+	    follow_huge_addr(NULL,NULL,0,0);
   ;
   return 0;
 }
@@ -30770,7 +35092,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SET_TASK_SESSION=yes
+	 cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -30778,27 +35100,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SET_TASK_SESSION=no
+	 cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_SET_TASK_SESSION
+  cr_result=$cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SET_TASK_SESSION 1
+#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 1
 _ACEOF
 
-     HAVE_SET_TASK_SESSION=1
+     HAVE_4_ARG_FOLLOW_HUGE_ADDR=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SET_TASK_SESSION 0
+#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 0
 _ACEOF
 
-     HAVE_SET_TASK_SESSION=''
+     HAVE_4_ARG_FOLLOW_HUGE_ADDR=''
   fi
 
 
@@ -30808,16 +35130,100 @@
 
 
 
+  if test "${HAVE_3_ARG_FOLLOW_HUGE_ADDR}${HAVE_4_ARG_FOLLOW_HUGE_ADDR}" != "1"; then
 
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
+_ACEOF
 
-  echo "$as_me:$LINENO: checking kernel for valid_signal" >&5
-echo $ECHO_N "checking kernel for valid_signal... $ECHO_C" >&6
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
 
-    if test "${cr_cv_kconfig_HAVE_VALID_SIGNAL+set}" = set; then
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" >&2;}
+   { (exit 1); exit 1; }; }
+
+  fi
+fi
+
+# Import the correct symbol for arch-specific ZERO_PAGE(),
+# which must have a prototype in asm/pgtable.h (arch-specific)
+# If we support ia64 or mips in the future we'll need to add more cases here.
+# NOTE: don't try to factor the CR_FIND_KSYM() call; it requires a literal.
+case $CR_KARCH in
+  sparc*)
+
+
+  echo "$as_me:$LINENO: checking kernel symbol table for mem_map_zero" >&5
+echo $ECHO_N "checking kernel symbol table for mem_map_zero... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_mem_map_zero+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_mem_map_zero=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}mem_map_zero$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_mem_map_zero"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_mem_map_zero\$" >/dev/null ; then
+        cr_cv_ksymtab_mem_map_zero=0
+      fi
 
 
   SAVE_CC=$CC
@@ -30838,18 +35244,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-   #ifdef valid_signal
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&valid_signal);
-   #endif
-
+int x = sizeof(&mem_map_zero);
   ;
   return 0;
 }
@@ -30879,7 +35281,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_VALID_SIGNAL=yes
+	 cr_cv_ksymtab_mem_map_zero="Y$cr_cv_ksymtab_mem_map_zero"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -30887,46 +35289,58 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_VALID_SIGNAL=no
+	 cr_cv_ksymtab_mem_map_zero="N$cr_cv_ksymtab_mem_map_zero"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_VALID_SIGNAL
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_VALID_SIGNAL 1
-_ACEOF
-
-     HAVE_VALID_SIGNAL=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_mem_map_zero"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_VALID_SIGNAL 0
+    if expr "$cr_cv_ksymtab_mem_map_zero" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol mem_map_zero but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol mem_map_zero but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_mem_map_zero | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(mem_map_zero, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_mem_map_zero $cr_addr
 _ACEOF
 
-     HAVE_VALID_SIGNAL=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+    ZERO_PAGE_SYMBOL=mem_map_zero
+    ;;
+  *)
 
 
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for REMOVE_LINKS" >&5
-echo $ECHO_N "checking kernel for REMOVE_LINKS... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_REMOVE_LINKS+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for empty_zero_page" >&5
+echo $ECHO_N "checking kernel symbol table for empty_zero_page... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_empty_zero_page+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_empty_zero_page=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}empty_zero_page$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_empty_zero_page"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_empty_zero_page\$" >/dev/null ; then
+        cr_cv_ksymtab_empty_zero_page=0
+      fi
 
 
   SAVE_CC=$CC
@@ -30947,15 +35361,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-   #ifndef REMOVE_LINKS
-     choke me
-   #endif
-
+int x = sizeof(&empty_zero_page);
   ;
   return 0;
 }
@@ -30985,7 +35398,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_REMOVE_LINKS=yes
+	 cr_cv_ksymtab_empty_zero_page="Y$cr_cv_ksymtab_empty_zero_page"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -30993,43 +35406,58 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_REMOVE_LINKS=no
+	 cr_cv_ksymtab_empty_zero_page="N$cr_cv_ksymtab_empty_zero_page"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_REMOVE_LINKS
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_REMOVE_LINKS 1
-_ACEOF
-
-     HAVE_REMOVE_LINKS=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_empty_zero_page"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_REMOVE_LINKS 0
+    if expr "$cr_cv_ksymtab_empty_zero_page" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol empty_zero_page but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol empty_zero_page but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_empty_zero_page | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(empty_zero_page, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_empty_zero_page $cr_addr
 _ACEOF
 
-     HAVE_REMOVE_LINKS=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+    ZERO_PAGE_SYMBOL=empty_zero_page
+    ;;
+esac
+if test -z "$cr_addr"; then
+  { { echo "$as_me:$LINENO: error: failed to find symbol $ZERO_PAGE_SYMBOL" >&5
+echo "$as_me: error: failed to find symbol $ZERO_PAGE_SYMBOL" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
+# How to check for permission
 
 
 
 
+  echo "$as_me:$LINENO: checking kernel for inode_permission" >&5
+echo $ECHO_N "checking kernel for inode_permission... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel for task.pids pid_link" >&5
-echo $ECHO_N "checking kernel for task.pids pid_link... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_INODE_PERMISSION+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -31053,12 +35481,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+		 #include <linux/fs.h>
 int
 main ()
 {
-struct task_struct x;
-          struct pid_link tc_1 = x.pids[0];
+
+   #ifdef inode_permission
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&inode_permission);
+   #endif
+
   ;
   return 0;
 }
@@ -31088,7 +35522,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK=yes
+	 cr_cv_kconfig_HAVE_INODE_PERMISSION=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -31096,27 +35530,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK=no
+	 cr_cv_kconfig_HAVE_INODE_PERMISSION=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK
+  cr_result=$cr_cv_kconfig_HAVE_INODE_PERMISSION
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PIDS_PID_LINK 1
+#define HAVE_INODE_PERMISSION 1
 _ACEOF
 
-     HAVE_TASK_PIDS_PID_LINK=1
+     HAVE_INODE_PERMISSION=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PIDS_PID_LINK 0
+#define HAVE_INODE_PERMISSION 0
 _ACEOF
 
-     HAVE_TASK_PIDS_PID_LINK=''
+     HAVE_INODE_PERMISSION=''
   fi
 
 
@@ -31128,10 +35562,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for task.pids pid" >&5
-echo $ECHO_N "checking kernel for task.pids pid... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for permission" >&5
+echo $ECHO_N "checking kernel for permission... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_PERMISSION+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -31155,12 +35589,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+		 #include <linux/fs.h>
 int
 main ()
 {
-struct task_struct x;
-          struct pid tc_1 = x.pids[0];
+
+   #ifdef permission
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&permission);
+   #endif
+
   ;
   return 0;
 }
@@ -31190,7 +35630,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PIDS_PID=yes
+	 cr_cv_kconfig_HAVE_PERMISSION=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -31198,27 +35638,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PIDS_PID=no
+	 cr_cv_kconfig_HAVE_PERMISSION=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_TASK_PIDS_PID
+  cr_result=$cr_cv_kconfig_HAVE_PERMISSION
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PIDS_PID 1
+#define HAVE_PERMISSION 1
 _ACEOF
 
-     HAVE_TASK_PIDS_PID=1
+     HAVE_PERMISSION=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PIDS_PID 0
+#define HAVE_PERMISSION 0
 _ACEOF
 
-     HAVE_TASK_PIDS_PID=''
+     HAVE_PERMISSION=''
   fi
 
 
@@ -31226,8 +35666,7 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-# Allow zero or one match
-if test "${HAVE_TASK_PIDS_PID_LINK}${HAVE_TASK_PIDS_PID}" = "11"; then
+if test -z "${HAVE_INODE_PERMISSION}${HAVE_PERMISSION}"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -31293,27 +35732,142 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" >&2;}
-   { (exit 1); exit 1; }; }
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+# Bits for save/restore of pending signals
+
+
+  echo "$as_me:$LINENO: checking kernel symbol table for copy_siginfo_to_user" >&5
+echo $ECHO_N "checking kernel symbol table for copy_siginfo_to_user... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_copy_siginfo_to_user+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_cv_ksymtab_copy_siginfo_to_user=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_siginfo_to_user$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_copy_siginfo_to_user"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_copy_siginfo_to_user\$" >/dev/null ; then
+        cr_cv_ksymtab_copy_siginfo_to_user=0
+      fi
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
+int
+main ()
+{
+int x = sizeof(&copy_siginfo_to_user);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_copy_siginfo_to_user="Y$cr_cv_ksymtab_copy_siginfo_to_user"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_copy_siginfo_to_user="N$cr_cv_ksymtab_copy_siginfo_to_user"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    fi
+
+fi
+
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_copy_siginfo_to_user"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_copy_siginfo_to_user" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int copy_siginfo_to_user(siginfo_t *to, siginfo_t *from);
+_EOF
+
+    fi
+    cr_result=`echo $cr_cv_ksymtab_copy_siginfo_to_user | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(copy_siginfo_to_user, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_copy_siginfo_to_user $cr_addr
+_ACEOF
 
-fi
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
-# put_task_struct() requires one of these:
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for __put_task_struct" >&5
-echo $ECHO_N "checking kernel symbol table for __put_task_struct... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for group_send_sig_info" >&5
+echo $ECHO_N "checking kernel symbol table for group_send_sig_info... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab___put_task_struct+set}" = set; then
+    if test "${cr_cv_ksymtab_group_send_sig_info+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab___put_task_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__put_task_struct$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab___put_task_struct"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab___put_task_struct\$" >/dev/null ; then
-        cr_cv_ksymtab___put_task_struct=0
+    cr_cv_ksymtab_group_send_sig_info=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}group_send_sig_info$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_group_send_sig_info"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_group_send_sig_info\$" >/dev/null ; then
+        cr_cv_ksymtab_group_send_sig_info=0
       fi
 
 
@@ -31342,7 +35896,7 @@
 int
 main ()
 {
-int x = sizeof(&__put_task_struct);
+int x = sizeof(&group_send_sig_info);
   ;
   return 0;
 }
@@ -31372,7 +35926,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab___put_task_struct="Y$cr_cv_ksymtab___put_task_struct"
+	 cr_cv_ksymtab_group_send_sig_info="Y$cr_cv_ksymtab_group_send_sig_info"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -31380,7 +35934,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab___put_task_struct="N$cr_cv_ksymtab___put_task_struct"
+	 cr_cv_ksymtab_group_send_sig_info="N$cr_cv_ksymtab_group_send_sig_info"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -31389,25 +35943,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab___put_task_struct"; then
+  if test -z "$cr_cv_ksymtab_group_send_sig_info"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab___put_task_struct" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol __put_task_struct but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol __put_task_struct but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_group_send_sig_info" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int group_send_sig_info(int, struct siginfo *, struct task_struct *);
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab___put_task_struct | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_group_send_sig_info | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(__put_task_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(group_send_sig_info, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE___put_task_struct $cr_addr
+#define CR_KCODE_group_send_sig_info $cr_addr
 _ACEOF
 
   fi
@@ -31415,19 +35970,21 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+# For save/restore of sigaltstack
 
-  echo "$as_me:$LINENO: checking kernel symbol table for __put_task_struct_cb" >&5
-echo $ECHO_N "checking kernel symbol table for __put_task_struct_cb... $ECHO_C" >&6
+
+  echo "$as_me:$LINENO: checking kernel symbol table for do_sigaltstack" >&5
+echo $ECHO_N "checking kernel symbol table for do_sigaltstack... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab___put_task_struct_cb+set}" = set; then
+    if test "${cr_cv_ksymtab_do_sigaltstack+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab___put_task_struct_cb=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__put_task_struct_cb$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab___put_task_struct_cb"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab___put_task_struct_cb\$" >/dev/null ; then
-        cr_cv_ksymtab___put_task_struct_cb=0
+    cr_cv_ksymtab_do_sigaltstack=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_sigaltstack$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_do_sigaltstack"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_sigaltstack\$" >/dev/null ; then
+        cr_cv_ksymtab_do_sigaltstack=0
       fi
 
 
@@ -31456,7 +36013,7 @@
 int
 main ()
 {
-int x = sizeof(&__put_task_struct_cb);
+int x = sizeof(&do_sigaltstack);
   ;
   return 0;
 }
@@ -31486,7 +36043,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab___put_task_struct_cb="Y$cr_cv_ksymtab___put_task_struct_cb"
+	 cr_cv_ksymtab_do_sigaltstack="Y$cr_cv_ksymtab_do_sigaltstack"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -31494,7 +36051,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab___put_task_struct_cb="N$cr_cv_ksymtab___put_task_struct_cb"
+	 cr_cv_ksymtab_do_sigaltstack="N$cr_cv_ksymtab_do_sigaltstack"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -31503,25 +36060,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab___put_task_struct_cb"; then
+  if test -z "$cr_cv_ksymtab_do_sigaltstack"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab___put_task_struct_cb" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol __put_task_struct_cb but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol __put_task_struct_cb but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_do_sigaltstack" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int do_sigaltstack(const stack_t *, stack_t *, unsigned long);
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab___put_task_struct_cb | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_do_sigaltstack | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(__put_task_struct_cb, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(do_sigaltstack, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE___put_task_struct_cb $cr_addr
+#define CR_KCODE_do_sigaltstack $cr_addr
 _ACEOF
 
   fi
@@ -31529,14 +36087,15 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test $CR_KARCH = i386 -o $CR_KARCH = x86_64; then
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for mm.task_size" >&5
-echo $ECHO_N "checking kernel for mm.task_size... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for struct n_desc_struct" >&5
+echo $ECHO_N "checking kernel for struct n_desc_struct... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_MM_TASK_SIZE+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -31560,12 +36119,16 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+	#include <linux/sched.h>
+	#include <asm/desc.h>
 int
 main ()
 {
-struct mm_struct x;
-          unsigned long tc_1 = x.task_size;
+
+     struct n_desc_struct y;
+     int x = sizeof(y);
+
   ;
   return 0;
 }
@@ -31595,7 +36158,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_TASK_SIZE=yes
+	 cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -31603,27 +36166,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_TASK_SIZE=no
+	 cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_MM_TASK_SIZE
+  cr_result=$cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_TASK_SIZE 1
+#define HAVE_STRUCT_N_DESC_STRUCT 1
 _ACEOF
 
-     HAVE_MM_TASK_SIZE=1
+     HAVE_STRUCT_N_DESC_STRUCT=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_TASK_SIZE 0
+#define HAVE_STRUCT_N_DESC_STRUCT 0
 _ACEOF
 
-     HAVE_MM_TASK_SIZE=''
+     HAVE_STRUCT_N_DESC_STRUCT=''
   fi
 
 
@@ -31635,11 +36198,10 @@
 
 
 
+  echo "$as_me:$LINENO: checking kernel for cpu_gdt_descr" >&5
+echo $ECHO_N "checking kernel for cpu_gdt_descr... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel for PageAnon" >&5
-echo $ECHO_N "checking kernel for PageAnon... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_PAGEANON+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_CPU_GDT_DESCR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -31663,17 +36225,13 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/mm.h>
+		 #include <linux/sched.h>
+					  #include <asm/desc.h>
 int
 main ()
 {
 
-   #ifdef PageAnon
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&PageAnon);
-   #endif
+     int x = sizeof(&cpu_gdt_descr);
 
   ;
   return 0;
@@ -31704,7 +36262,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PAGEANON=yes
+	 cr_cv_kconfig_HAVE_CPU_GDT_DESCR=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -31712,27 +36270,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PAGEANON=no
+	 cr_cv_kconfig_HAVE_CPU_GDT_DESCR=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PAGEANON
+  cr_result=$cr_cv_kconfig_HAVE_CPU_GDT_DESCR
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PAGEANON 1
+#define HAVE_CPU_GDT_DESCR 1
 _ACEOF
 
-     HAVE_PAGEANON=1
+     HAVE_CPU_GDT_DESCR=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PAGEANON 0
+#define HAVE_CPU_GDT_DESCR 0
 _ACEOF
 
-     HAVE_PAGEANON=''
+     HAVE_CPU_GDT_DESCR=''
   fi
 
 
@@ -31740,19 +36298,22 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+  if test -n "${HAVE_CPU_GDT_DESCR}"; then
 
-# Look for various VDSO-related bits (arch and version dependent)
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for thread.vdso_base" >&5
-echo $ECHO_N "checking kernel for thread.vdso_base... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_THREAD_VDSO_BASE+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for cpu_gdt_descr" >&5
+echo $ECHO_N "checking kernel symbol table for cpu_gdt_descr... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_cpu_gdt_descr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_cpu_gdt_descr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}cpu_gdt_descr$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_cpu_gdt_descr"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_cpu_gdt_descr\$" >/dev/null ; then
+        cr_cv_ksymtab_cpu_gdt_descr=0
+      fi
 
 
   SAVE_CC=$CC
@@ -31773,12 +36334,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/processor.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct thread_struct x;
-          unsigned long tc_1 = x.vdso_base;
+int x = sizeof(&cpu_gdt_descr);
   ;
   return 0;
 }
@@ -31808,7 +36371,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_VDSO_BASE=yes
+	 cr_cv_ksymtab_cpu_gdt_descr="Y$cr_cv_ksymtab_cpu_gdt_descr"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -31816,45 +36379,170 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_VDSO_BASE=no
+	 cr_cv_ksymtab_cpu_gdt_descr="N$cr_cv_ksymtab_cpu_gdt_descr"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_VDSO_BASE
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_cpu_gdt_descr"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_cpu_gdt_descr" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol cpu_gdt_descr but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol cpu_gdt_descr but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_cpu_gdt_descr | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(cpu_gdt_descr, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_VDSO_BASE 1
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_cpu_gdt_descr $cr_addr
 _ACEOF
 
-     HAVE_THREAD_VDSO_BASE=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_VDSO_BASE 0
-_ACEOF
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
-     HAVE_THREAD_VDSO_BASE=''
   fi
 
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for cpu_gdt_table" >&5
+echo $ECHO_N "checking kernel symbol table for cpu_gdt_table... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_cpu_gdt_table+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
+    cr_cv_ksymtab_cpu_gdt_table=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}cpu_gdt_table$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_cpu_gdt_table"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_cpu_gdt_table\$" >/dev/null ; then
+        cr_cv_ksymtab_cpu_gdt_table=0
+      fi
 
 
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
 
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
 
-  echo "$as_me:$LINENO: checking kernel for mm.context.vdso_base" >&5
-echo $ECHO_N "checking kernel for mm.context.vdso_base... $ECHO_C" >&6
+int
+main ()
+{
+int x = sizeof(&cpu_gdt_table);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_cpu_gdt_table="Y$cr_cv_ksymtab_cpu_gdt_table"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE+set}" = set; then
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_cpu_gdt_table="N$cr_cv_ksymtab_cpu_gdt_table"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    fi
+
+fi
+
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_cpu_gdt_table"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_cpu_gdt_table" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol cpu_gdt_table but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol cpu_gdt_table but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_cpu_gdt_table | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(cpu_gdt_table, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_cpu_gdt_table $cr_addr
+_ACEOF
+
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+
+  echo "$as_me:$LINENO: checking kernel symbol table for per_cpu__cpu_gdt_descr" >&5
+echo $ECHO_N "checking kernel symbol table for per_cpu__cpu_gdt_descr... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_per_cpu__cpu_gdt_descr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_per_cpu__cpu_gdt_descr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}per_cpu__cpu_gdt_descr$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_per_cpu__cpu_gdt_descr\$" >/dev/null ; then
+        cr_cv_ksymtab_per_cpu__cpu_gdt_descr=0
+      fi
 
 
   SAVE_CC=$CC
@@ -31875,12 +36563,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-mm_context_t x;
-          unsigned long tc_1 = x.vdso_base;
+int x = sizeof(&per_cpu__cpu_gdt_descr);
   ;
   return 0;
 }
@@ -31910,7 +36600,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE=yes
+	 cr_cv_ksymtab_per_cpu__cpu_gdt_descr="Y$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -31918,31 +36608,38 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE=no
+	 cr_cv_ksymtab_per_cpu__cpu_gdt_descr="N$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_CONTEXT_VDSO_BASE 1
-_ACEOF
-
-     HAVE_MM_CONTEXT_VDSO_BASE=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_CONTEXT_VDSO_BASE 0
+    if expr "$cr_cv_ksymtab_per_cpu__cpu_gdt_descr" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_per_cpu__cpu_gdt_descr | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(per_cpu__cpu_gdt_descr, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_per_cpu__cpu_gdt_descr $cr_addr
 _ACEOF
 
-     HAVE_MM_CONTEXT_VDSO_BASE=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
@@ -31950,10 +36647,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for mm.context.vdso" >&5
-echo $ECHO_N "checking kernel for mm.context.vdso... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for thread.sp0" >&5
+echo $ECHO_N "checking kernel for thread.sp0... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_THREAD_SP0+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -31977,12 +36674,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+		 #include <asm/processor.h>
 int
 main ()
 {
-mm_context_t x;
-          unsigned long tc_1 = x.vdso;
+struct thread_struct x;
+          unsigned long tc_1 = x.sp0;
   ;
   return 0;
 }
@@ -32012,7 +36709,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO=yes
+	 cr_cv_kconfig_HAVE_THREAD_SP0=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -32020,27 +36717,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO=no
+	 cr_cv_kconfig_HAVE_THREAD_SP0=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_SP0
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_CONTEXT_VDSO 1
+#define HAVE_THREAD_SP0 1
 _ACEOF
 
-     HAVE_MM_CONTEXT_VDSO=1
+     HAVE_THREAD_SP0=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_CONTEXT_VDSO 0
+#define HAVE_THREAD_SP0 0
 _ACEOF
 
-     HAVE_MM_CONTEXT_VDSO=''
+     HAVE_THREAD_SP0=''
   fi
 
 
@@ -32052,10 +36749,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for thread_info.sysenter_return" >&5
-echo $ECHO_N "checking kernel for thread_info.sysenter_return... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for thread.esp0" >&5
+echo $ECHO_N "checking kernel for thread.esp0... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_THREAD_ESP0+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32079,12 +36776,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/thread_info.h>
+		 #include <asm/processor.h>
 int
 main ()
 {
-struct thread_info x;
-          void * tc_1 = x.sysenter_return;
+struct thread_struct x;
+          unsigned long tc_1 = x.esp0;
   ;
   return 0;
 }
@@ -32114,7 +36811,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN=yes
+	 cr_cv_kconfig_HAVE_THREAD_ESP0=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -32122,27 +36819,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN=no
+	 cr_cv_kconfig_HAVE_THREAD_ESP0=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_ESP0
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_INFO_SYSENTER_RETURN 1
+#define HAVE_THREAD_ESP0 1
 _ACEOF
 
-     HAVE_THREAD_INFO_SYSENTER_RETURN=1
+     HAVE_THREAD_ESP0=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_INFO_SYSENTER_RETURN 0
+#define HAVE_THREAD_ESP0 0
 _ACEOF
 
-     HAVE_THREAD_INFO_SYSENTER_RETURN=''
+     HAVE_THREAD_ESP0=''
   fi
 
 
@@ -32150,15 +36847,14 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test $CR_ARCH = arm; then
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for thread_info.tp_value" >&5
-echo $ECHO_N "checking kernel for thread_info.tp_value... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for thread.rsp0" >&5
+echo $ECHO_N "checking kernel for thread.rsp0... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_THREAD_RSP0+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32182,12 +36878,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/thread_info.h>
+		 #include <asm/processor.h>
 int
 main ()
 {
-struct thread_info x;
-          unsigned long tc_1 = x.tp_value;
+struct thread_struct x;
+          unsigned long tc_1 = x.rsp0;
   ;
   return 0;
 }
@@ -32217,7 +36913,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE=yes
+	 cr_cv_kconfig_HAVE_THREAD_RSP0=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -32225,27 +36921,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE=no
+	 cr_cv_kconfig_HAVE_THREAD_RSP0=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_RSP0
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_INFO_TP_VALUE 1
+#define HAVE_THREAD_RSP0 1
 _ACEOF
 
-     HAVE_THREAD_INFO_TP_VALUE=1
+     HAVE_THREAD_RSP0=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_INFO_TP_VALUE 0
+#define HAVE_THREAD_RSP0 0
 _ACEOF
 
-     HAVE_THREAD_INFO_TP_VALUE=''
+     HAVE_THREAD_RSP0=''
   fi
 
 
@@ -32255,19 +36951,15 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for __kuser_helper_start" >&5
-echo $ECHO_N "checking kernel symbol table for __kuser_helper_start... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab___kuser_helper_start+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for thread.usersp" >&5
+echo $ECHO_N "checking kernel for thread.usersp... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_THREAD_USERSP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab___kuser_helper_start=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__kuser_helper_start$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab___kuser_helper_start"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab___kuser_helper_start\$" >/dev/null ; then
-        cr_cv_ksymtab___kuser_helper_start=0
-      fi
 
 
   SAVE_CC=$CC
@@ -32288,14 +36980,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/processor.h>
 int
 main ()
 {
-int x = sizeof(&__kuser_helper_start);
+struct thread_struct x;
+          unsigned long tc_1 = x.usersp;
   ;
   return 0;
 }
@@ -32325,7 +37015,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab___kuser_helper_start="Y$cr_cv_ksymtab___kuser_helper_start"
+	 cr_cv_kconfig_HAVE_THREAD_USERSP=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -32333,56 +37023,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab___kuser_helper_start="N$cr_cv_ksymtab___kuser_helper_start"
+	 cr_cv_kconfig_HAVE_THREAD_USERSP=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab___kuser_helper_start"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab___kuser_helper_start" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int __kuser_helper_start(void);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_USERSP
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab___kuser_helper_start | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(__kuser_helper_start, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_THREAD_USERSP 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE___kuser_helper_start $cr_addr
+     HAVE_THREAD_USERSP=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_THREAD_USERSP 0
 _ACEOF
 
+     HAVE_THREAD_USERSP=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for __kuser_cmpxchg" >&5
-echo $ECHO_N "checking kernel symbol table for __kuser_cmpxchg... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab___kuser_cmpxchg+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for thread.userrsp" >&5
+echo $ECHO_N "checking kernel for thread.userrsp... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_THREAD_USERRSP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab___kuser_cmpxchg=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__kuser_cmpxchg$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab___kuser_cmpxchg"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab___kuser_cmpxchg\$" >/dev/null ; then
-        cr_cv_ksymtab___kuser_cmpxchg=0
-      fi
 
 
   SAVE_CC=$CC
@@ -32403,14 +37082,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/processor.h>
 int
 main ()
 {
-int x = sizeof(&__kuser_cmpxchg);
+struct thread_struct x;
+          unsigned long tc_1 = x.userrsp;
   ;
   return 0;
 }
@@ -32440,7 +37117,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab___kuser_cmpxchg="Y$cr_cv_ksymtab___kuser_cmpxchg"
+	 cr_cv_kconfig_HAVE_THREAD_USERRSP=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -32448,50 +37125,42 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab___kuser_cmpxchg="N$cr_cv_ksymtab___kuser_cmpxchg"
+	 cr_cv_kconfig_HAVE_THREAD_USERRSP=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab___kuser_cmpxchg"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab___kuser_cmpxchg" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int __kuser_cmpxchg(void);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_USERRSP
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab___kuser_cmpxchg | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(__kuser_cmpxchg, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_THREAD_USERRSP 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE___kuser_cmpxchg $cr_addr
+     HAVE_THREAD_USERRSP=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_THREAD_USERRSP 0
 _ACEOF
 
+     HAVE_THREAD_USERRSP=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-fi
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for VSYSCALL_BASE" >&5
-echo $ECHO_N "checking kernel for VSYSCALL_BASE... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_VSYSCALL_BASE+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for thread.debugreg0" >&5
+echo $ECHO_N "checking kernel for thread.debugreg0... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREG0+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32515,14 +37184,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/elf.h>
+		 #include <asm/processor.h>
 int
 main ()
 {
-
-     typeof(VSYSCALL_BASE) y;
-     int x = sizeof(y);
-
+struct thread_struct x;
+          unsigned long tc_1 = x.debugreg0;
   ;
   return 0;
 }
@@ -32552,7 +37219,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_VSYSCALL_BASE=yes
+	 cr_cv_kconfig_HAVE_THREAD_DEBUGREG0=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -32560,27 +37227,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_VSYSCALL_BASE=no
+	 cr_cv_kconfig_HAVE_THREAD_DEBUGREG0=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_VSYSCALL_BASE
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_DEBUGREG0
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_VSYSCALL_BASE 1
+#define HAVE_THREAD_DEBUGREG0 1
 _ACEOF
 
-     HAVE_VSYSCALL_BASE=1
+     HAVE_THREAD_DEBUGREG0=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_VSYSCALL_BASE 0
+#define HAVE_THREAD_DEBUGREG0 0
 _ACEOF
 
-     HAVE_VSYSCALL_BASE=''
+     HAVE_THREAD_DEBUGREG0=''
   fi
 
 
@@ -32592,13 +37259,10 @@
 
 
 
+  echo "$as_me:$LINENO: checking kernel for thread.debugregs" >&5
+echo $ECHO_N "checking kernel for thread.debugregs... $ECHO_C" >&6
 
-
-
-  echo "$as_me:$LINENO: checking kernel for 2-arg arch_setup_additional_pages" >&5
-echo $ECHO_N "checking kernel for 2-arg arch_setup_additional_pages... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32622,18 +37286,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-    #include <linux/sched.h>
-    #include <asm/elf.h>
-
+		 #include <asm/processor.h>
 int
 main ()
 {
-
-	#ifndef arch_setup_additional_pages /* Must be macro or have a decl */
-	  int x = sizeof(&arch_setup_additional_pages);
-	#endif
-	    arch_setup_additional_pages(NULL,0);
+struct thread_struct x;
+          unsigned long tc_1 = x.debugreg[1];
   ;
   return 0;
 }
@@ -32663,7 +37321,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=yes
+	 cr_cv_kconfig_HAVE_THREAD_DEBUGREGS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -32671,27 +37329,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=no
+	 cr_cv_kconfig_HAVE_THREAD_DEBUGREGS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_DEBUGREGS
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1
+#define HAVE_THREAD_DEBUGREGS 1
 _ACEOF
 
-     HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=1
+     HAVE_THREAD_DEBUGREGS=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0
+#define HAVE_THREAD_DEBUGREGS 0
 _ACEOF
 
-     HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=''
+     HAVE_THREAD_DEBUGREGS=''
   fi
 
 
@@ -32703,14 +37361,10 @@
 
 
 
+  echo "$as_me:$LINENO: checking kernel for thread.ptrace_bps" >&5
+echo $ECHO_N "checking kernel for thread.ptrace_bps... $ECHO_C" >&6
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 4-arg arch_setup_additional_pages" >&5
-echo $ECHO_N "checking kernel for 4-arg arch_setup_additional_pages... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32735,17 +37389,13 @@
 		 #endif
 		 #include <linux/types.h>
 
-    #include <linux/sched.h>
-    #include <asm/elf.h>
-
+	#include <linux/perf_event.h>
+	#include <asm/processor.h>
 int
 main ()
 {
-
-	#ifndef arch_setup_additional_pages /* Must be macro or have a decl */
-	  int x = sizeof(&arch_setup_additional_pages);
-	#endif
-	    arch_setup_additional_pages(NULL,0,0,0);
+struct thread_struct x;
+          struct perf_event  tc_1 = *(x.ptrace_bps[1]);
   ;
   return 0;
 }
@@ -32775,7 +37425,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=yes
+	 cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -32783,27 +37433,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=no
+	 cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1
+#define HAVE_THREAD_PTRACE_BPS 1
 _ACEOF
 
-     HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=1
+     HAVE_THREAD_PTRACE_BPS=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0
+#define HAVE_THREAD_PTRACE_BPS 0
 _ACEOF
 
-     HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=''
+     HAVE_THREAD_PTRACE_BPS=''
   fi
 
 
@@ -32813,22 +37463,15 @@
 
 
 
-if test -n "${HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES}${HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES}"; then
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for arch_setup_additional_pages" >&5
-echo $ECHO_N "checking kernel symbol table for arch_setup_additional_pages... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_arch_setup_additional_pages+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for thread.i387" >&5
+echo $ECHO_N "checking kernel for thread.i387... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_THREAD_I387+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_arch_setup_additional_pages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_setup_additional_pages$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_arch_setup_additional_pages"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_arch_setup_additional_pages\$" >/dev/null ; then
-        cr_cv_ksymtab_arch_setup_additional_pages=0
-      fi
 
 
   SAVE_CC=$CC
@@ -32849,14 +37492,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/processor.h>
 int
 main ()
 {
-int x = sizeof(&arch_setup_additional_pages);
+struct thread_struct x;
+          union i387_union tc_1 = x.i387;
   ;
   return 0;
 }
@@ -32886,7 +37527,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_arch_setup_additional_pages="Y$cr_cv_ksymtab_arch_setup_additional_pages"
+	 cr_cv_kconfig_HAVE_THREAD_I387=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -32894,49 +37535,42 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_arch_setup_additional_pages="N$cr_cv_ksymtab_arch_setup_additional_pages"
+	 cr_cv_kconfig_HAVE_THREAD_I387=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_arch_setup_additional_pages"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_arch_setup_additional_pages" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_arch_setup_additional_pages | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(arch_setup_additional_pages, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_I387
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_arch_setup_additional_pages $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_THREAD_I387 1
+_ACEOF
+
+     HAVE_THREAD_I387=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_THREAD_I387 0
 _ACEOF
 
+     HAVE_THREAD_I387=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-fi
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for map_vsyscall" >&5
-echo $ECHO_N "checking kernel for map_vsyscall... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_MAP_VSYSCALL+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for thread.xstate" >&5
+echo $ECHO_N "checking kernel for thread.xstate... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_THREAD_XSTATE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32960,23 +37594,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-    #include <linux/sched.h>
-    #include <asm/elf.h>
-    #ifndef __HAVE_ARCH_VSYSCALL
-      choke me
-    #endif
+		 #include <asm/processor.h>
 int
 main ()
 {
-
-   #ifdef map_vsyscall
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&map_vsyscall);
-   #endif
-
+struct thread_struct x;
+          union thread_xstate  tc_1 = *(x.xstate);
   ;
   return 0;
 }
@@ -33006,7 +37629,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MAP_VSYSCALL=yes
+	 cr_cv_kconfig_HAVE_THREAD_XSTATE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -33014,27 +37637,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MAP_VSYSCALL=no
+	 cr_cv_kconfig_HAVE_THREAD_XSTATE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_MAP_VSYSCALL
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_XSTATE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_MAP_VSYSCALL 1
+#define HAVE_THREAD_XSTATE 1
 _ACEOF
 
-     HAVE_MAP_VSYSCALL=1
+     HAVE_THREAD_XSTATE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_MAP_VSYSCALL 0
+#define HAVE_THREAD_XSTATE 0
 _ACEOF
 
-     HAVE_MAP_VSYSCALL=''
+     HAVE_THREAD_XSTATE=''
   fi
 
 
@@ -33042,22 +37665,17 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test -n "${HAVE_MAP_VSYSCALL}"; then
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for map_vsyscall" >&5
-echo $ECHO_N "checking kernel symbol table for map_vsyscall... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_map_vsyscall+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for thread.fpu" >&5
+echo $ECHO_N "checking kernel for thread.fpu... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_THREAD_FPU+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_map_vsyscall=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}map_vsyscall$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_map_vsyscall"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_map_vsyscall\$" >/dev/null ; then
-        cr_cv_ksymtab_map_vsyscall=0
-      fi
 
 
   SAVE_CC=$CC
@@ -33078,14 +37696,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/processor.h>
 int
 main ()
 {
-int x = sizeof(&map_vsyscall);
+struct thread_struct x;
+          struct fpu tc_1 = x.fpu;
   ;
   return 0;
 }
@@ -33115,7 +37731,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_map_vsyscall="Y$cr_cv_ksymtab_map_vsyscall"
+	 cr_cv_kconfig_HAVE_THREAD_FPU=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -33123,57 +37739,46 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_map_vsyscall="N$cr_cv_ksymtab_map_vsyscall"
+	 cr_cv_kconfig_HAVE_THREAD_FPU=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_map_vsyscall"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_map_vsyscall" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol map_vsyscall but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol map_vsyscall but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_map_vsyscall | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(map_vsyscall, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_THREAD_FPU
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_map_vsyscall $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_THREAD_FPU 1
+_ACEOF
+
+     HAVE_THREAD_FPU=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_THREAD_FPU 0
 _ACEOF
 
+     HAVE_THREAD_FPU=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-fi
-if test $CR_ARCH = x86_64; then
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for syscall32_setup_pages" >&5
-echo $ECHO_N "checking kernel symbol table for syscall32_setup_pages... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_syscall32_setup_pages+set}" = set; then
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for pt_regs.eflags" >&5
+echo $ECHO_N "checking kernel for pt_regs.eflags... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_PT_REGS_EFLAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_syscall32_setup_pages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}syscall32_setup_pages$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_syscall32_setup_pages"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_syscall32_setup_pages\$" >/dev/null ; then
-        cr_cv_ksymtab_syscall32_setup_pages=0
-      fi
 
 
   SAVE_CC=$CC
@@ -33194,14 +37799,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/ptrace.h>
 int
 main ()
 {
-int x = sizeof(&syscall32_setup_pages);
+struct pt_regs x;
+          unsigned long tc_1 = x.eflags;
   ;
   return 0;
 }
@@ -33231,7 +37834,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_syscall32_setup_pages="Y$cr_cv_ksymtab_syscall32_setup_pages"
+	 cr_cv_kconfig_HAVE_PT_REGS_EFLAGS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -33239,58 +37842,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_syscall32_setup_pages="N$cr_cv_ksymtab_syscall32_setup_pages"
+	 cr_cv_kconfig_HAVE_PT_REGS_EFLAGS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_syscall32_setup_pages"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_syscall32_setup_pages" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int syscall32_setup_pages(void *, int);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_EFLAGS
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_syscall32_setup_pages | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(syscall32_setup_pages, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_EFLAGS 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_syscall32_setup_pages $cr_addr
+     HAVE_PT_REGS_EFLAGS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_EFLAGS 0
 _ACEOF
 
+     HAVE_PT_REGS_EFLAGS=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-fi
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for arch_pick_mmap_layout" >&5
-echo $ECHO_N "checking kernel symbol table for arch_pick_mmap_layout... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_arch_pick_mmap_layout+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for pt_regs.flags" >&5
+echo $ECHO_N "checking kernel for pt_regs.flags... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_PT_REGS_FLAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_arch_pick_mmap_layout=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_pick_mmap_layout$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_arch_pick_mmap_layout"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_arch_pick_mmap_layout\$" >/dev/null ; then
-        cr_cv_ksymtab_arch_pick_mmap_layout=0
-      fi
 
 
   SAVE_CC=$CC
@@ -33311,14 +37901,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/ptrace.h>
 int
 main ()
 {
-int x = sizeof(&arch_pick_mmap_layout);
+struct pt_regs x;
+          unsigned long tc_1 = x.flags;
   ;
   return 0;
 }
@@ -33348,7 +37936,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_arch_pick_mmap_layout="Y$cr_cv_ksymtab_arch_pick_mmap_layout"
+	 cr_cv_kconfig_HAVE_PT_REGS_FLAGS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -33356,54 +37944,49 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_arch_pick_mmap_layout="N$cr_cv_ksymtab_arch_pick_mmap_layout"
+	 cr_cv_kconfig_HAVE_PT_REGS_FLAGS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_arch_pick_mmap_layout"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_arch_pick_mmap_layout" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_arch_pick_mmap_layout | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(arch_pick_mmap_layout, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_FLAGS
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_arch_pick_mmap_layout $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_FLAGS 1
+_ACEOF
+
+     HAVE_PT_REGS_FLAGS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_FLAGS 0
 _ACEOF
 
+     HAVE_PT_REGS_FLAGS=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for arch_get_unmaped_area" >&5
-echo $ECHO_N "checking kernel symbol table for arch_get_unmaped_area... $ECHO_C" >&6
+
+
+  echo "$as_me:$LINENO: checking kernel symbol table for init_fpu" >&5
+echo $ECHO_N "checking kernel symbol table for init_fpu... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_arch_get_unmaped_area+set}" = set; then
+    if test "${cr_cv_ksymtab_init_fpu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_arch_get_unmaped_area=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_get_unmaped_area$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_arch_get_unmaped_area"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_arch_get_unmaped_area\$" >/dev/null ; then
-        cr_cv_ksymtab_arch_get_unmaped_area=0
+    cr_cv_ksymtab_init_fpu=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}init_fpu$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_init_fpu"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_init_fpu\$" >/dev/null ; then
+        cr_cv_ksymtab_init_fpu=0
       fi
 
 
@@ -33432,7 +38015,7 @@
 int
 main ()
 {
-int x = sizeof(&arch_get_unmaped_area);
+int x = sizeof(&init_fpu);
   ;
   return 0;
 }
@@ -33462,7 +38045,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_arch_get_unmaped_area="Y$cr_cv_ksymtab_arch_get_unmaped_area"
+	 cr_cv_ksymtab_init_fpu="Y$cr_cv_ksymtab_init_fpu"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -33470,7 +38053,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_arch_get_unmaped_area="N$cr_cv_ksymtab_arch_get_unmaped_area"
+	 cr_cv_ksymtab_init_fpu="N$cr_cv_ksymtab_init_fpu"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -33479,25 +38062,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_arch_get_unmaped_area"; then
+  if test -z "$cr_cv_ksymtab_init_fpu"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_arch_get_unmaped_area" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_init_fpu" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern void init_fpu(struct task_struct *);
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab_arch_get_unmaped_area | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_init_fpu | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(arch_get_unmaped_area, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(init_fpu, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_arch_get_unmaped_area $cr_addr
+#define CR_KCODE_init_fpu $cr_addr
 _ACEOF
 
   fi
@@ -33506,18 +38090,18 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for arch_unmap_area" >&5
-echo $ECHO_N "checking kernel symbol table for arch_unmap_area... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for xstate_size" >&5
+echo $ECHO_N "checking kernel symbol table for xstate_size... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_arch_unmap_area+set}" = set; then
+    if test "${cr_cv_ksymtab_xstate_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_arch_unmap_area=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_unmap_area$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_arch_unmap_area"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_arch_unmap_area\$" >/dev/null ; then
-        cr_cv_ksymtab_arch_unmap_area=0
+    cr_cv_ksymtab_xstate_size=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}xstate_size$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_xstate_size"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_xstate_size\$" >/dev/null ; then
+        cr_cv_ksymtab_xstate_size=0
       fi
 
 
@@ -33546,7 +38130,7 @@
 int
 main ()
 {
-int x = sizeof(&arch_unmap_area);
+int x = sizeof(&xstate_size);
   ;
   return 0;
 }
@@ -33576,7 +38160,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_arch_unmap_area="Y$cr_cv_ksymtab_arch_unmap_area"
+	 cr_cv_ksymtab_xstate_size="Y$cr_cv_ksymtab_xstate_size"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -33584,7 +38168,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_arch_unmap_area="N$cr_cv_ksymtab_arch_unmap_area"
+	 cr_cv_ksymtab_xstate_size="N$cr_cv_ksymtab_xstate_size"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -33593,25 +38177,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_arch_unmap_area"; then
+  if test -z "$cr_cv_ksymtab_xstate_size"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_arch_unmap_area" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol arch_unmap_area but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol arch_unmap_area but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_xstate_size" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern unsigned int xstate_size;
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab_arch_unmap_area | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_xstate_size | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(arch_unmap_area, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KDATA(xstate_size, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_arch_unmap_area $cr_addr
+#define CR_KDATA_xstate_size $cr_addr
 _ACEOF
 
   fi
@@ -33622,10 +38207,11 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for mm.mmap_base" >&5
-echo $ECHO_N "checking kernel for mm.mmap_base... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_MM_MMAP_BASE+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for restore_fpu_checking" >&5
+echo $ECHO_N "checking kernel for restore_fpu_checking... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -33649,12 +38235,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+		 #include <asm/i387.h>
 int
 main ()
 {
-struct mm_struct x;
-          unsigned long tc_1 = x.mmap_base;
+
+   #ifdef restore_fpu_checking
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&restore_fpu_checking);
+   #endif
+
   ;
   return 0;
 }
@@ -33684,7 +38276,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_MMAP_BASE=yes
+	 cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -33692,27 +38284,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_MMAP_BASE=no
+	 cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_MM_MMAP_BASE
+  cr_result=$cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_MMAP_BASE 1
+#define HAVE_RESTORE_FPU_CHECKING 1
 _ACEOF
 
-     HAVE_MM_MMAP_BASE=1
+     HAVE_RESTORE_FPU_CHECKING=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_MMAP_BASE 0
+#define HAVE_RESTORE_FPU_CHECKING 0
 _ACEOF
 
-     HAVE_MM_MMAP_BASE=''
+     HAVE_RESTORE_FPU_CHECKING=''
   fi
 
 
@@ -33720,14 +38312,15 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+  if test -n "${HAVE_RESTORE_FPU_CHECKING}"; then
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for mm.cached_hole_size" >&5
-echo $ECHO_N "checking kernel for mm.cached_hole_size... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for 2.6.0 restore_fpu_checking" >&5
+echo $ECHO_N "checking kernel for 2.6.0 restore_fpu_checking... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -33751,12 +38344,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+		 #include <asm/i387.h>
+   int restore_fpu_checking(struct i387_fxsave_struct *);
 int
 main ()
 {
-struct mm_struct x;
-          unsigned long tc_1 = x.cached_hole_size;
+int x = sizeof(&restore_fpu_checking)
   ;
   return 0;
 }
@@ -33786,7 +38379,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE=yes
+	 cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -33794,27 +38387,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE=no
+	 cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE
+  cr_result=$cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_CACHED_HOLE_SIZE 1
+#define HAVE_2_6_0_RESTORE_FPU_CHECKING 1
 _ACEOF
 
-     HAVE_MM_CACHED_HOLE_SIZE=1
+     HAVE_2_6_0_RESTORE_FPU_CHECKING=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_CACHED_HOLE_SIZE 0
+#define HAVE_2_6_0_RESTORE_FPU_CHECKING 0
 _ACEOF
 
-     HAVE_MM_CACHED_HOLE_SIZE=''
+     HAVE_2_6_0_RESTORE_FPU_CHECKING=''
   fi
 
 
@@ -33826,11 +38419,10 @@
 
 
 
+  echo "$as_me:$LINENO: checking kernel for 2.6.28 restore_fpu_checking" >&5
+echo $ECHO_N "checking kernel for 2.6.28 restore_fpu_checking... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel for CONFIG_HUGETLBFS" >&5
-echo $ECHO_N "checking kernel for CONFIG_HUGETLBFS... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -33854,15 +38446,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
+		 #include <asm/i387.h>
+   int restore_fpu_checking(struct task_struct *);
 int
 main ()
 {
-
-   #ifndef CONFIG_HUGETLBFS
-     choke me
-   #endif
-
+int x = sizeof(&restore_fpu_checking)
   ;
   return 0;
 }
@@ -33892,7 +38481,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS=yes
+	 cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -33900,27 +38489,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS=no
+	 cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS
+  cr_result=$cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_CONFIG_HUGETLBFS 1
+#define HAVE_2_6_28_RESTORE_FPU_CHECKING 1
 _ACEOF
 
-     HAVE_CONFIG_HUGETLBFS=1
+     HAVE_2_6_28_RESTORE_FPU_CHECKING=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_CONFIG_HUGETLBFS 0
+#define HAVE_2_6_28_RESTORE_FPU_CHECKING 0
 _ACEOF
 
-     HAVE_CONFIG_HUGETLBFS=''
+     HAVE_2_6_28_RESTORE_FPU_CHECKING=''
   fi
 
 
@@ -33928,22 +38517,92 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test -n "${HAVE_CONFIG_HUGETLBFS}"; then
+    if test "${HAVE_2_6_0_RESTORE_FPU_CHECKING}${HAVE_2_6_28_RESTORE_FPU_CHECKING}" != "1"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
+_ACEOF
 
-  echo "$as_me:$LINENO: checking kernel symbol table for hugetlbfs_file_operations" >&5
-echo $ECHO_N "checking kernel symbol table for hugetlbfs_file_operations... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_hugetlbfs_file_operations+set}" = set; then
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" >&2;}
+   { (exit 1); exit 1; }; }
+
+    fi
+  fi
+fi
+
+if test $CR_KARCH = i386; then
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for pt_regs.xcs" >&5
+echo $ECHO_N "checking kernel for pt_regs.xcs... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_PT_REGS_XCS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_hugetlbfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}hugetlbfs_file_operations$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_hugetlbfs_file_operations"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_hugetlbfs_file_operations\$" >/dev/null ; then
-        cr_cv_ksymtab_hugetlbfs_file_operations=0
-      fi
 
 
   SAVE_CC=$CC
@@ -33964,14 +38623,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/ptrace.h>
 int
 main ()
 {
-int x = sizeof(&hugetlbfs_file_operations);
+struct pt_regs x;
+          int tc_1 = x.xcs;
   ;
   return 0;
 }
@@ -34001,7 +38658,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_hugetlbfs_file_operations="Y$cr_cv_ksymtab_hugetlbfs_file_operations"
+	 cr_cv_kconfig_HAVE_PT_REGS_XCS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -34009,56 +38666,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_hugetlbfs_file_operations="N$cr_cv_ksymtab_hugetlbfs_file_operations"
+	 cr_cv_kconfig_HAVE_PT_REGS_XCS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_hugetlbfs_file_operations"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_hugetlbfs_file_operations" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern const struct file_operations hugetlbfs_file_operations;
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XCS
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_hugetlbfs_file_operations | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(hugetlbfs_file_operations, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_XCS 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_hugetlbfs_file_operations $cr_addr
+     HAVE_PT_REGS_XCS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_XCS 0
 _ACEOF
 
+     HAVE_PT_REGS_XCS=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for is_file_shm_hugepages" >&5
-echo $ECHO_N "checking kernel symbol table for is_file_shm_hugepages... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_is_file_shm_hugepages+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for pt_regs.xfs" >&5
+echo $ECHO_N "checking kernel for pt_regs.xfs... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_PT_REGS_XFS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_is_file_shm_hugepages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}is_file_shm_hugepages$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_is_file_shm_hugepages"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_is_file_shm_hugepages\$" >/dev/null ; then
-        cr_cv_ksymtab_is_file_shm_hugepages=0
-      fi
 
 
   SAVE_CC=$CC
@@ -34079,14 +38725,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/ptrace.h>
 int
 main ()
 {
-int x = sizeof(&is_file_shm_hugepages);
+struct pt_regs x;
+          int tc_1 = x.xfs;
   ;
   return 0;
 }
@@ -34116,7 +38760,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_is_file_shm_hugepages="Y$cr_cv_ksymtab_is_file_shm_hugepages"
+	 cr_cv_kconfig_HAVE_PT_REGS_XFS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -34124,56 +38768,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_is_file_shm_hugepages="N$cr_cv_ksymtab_is_file_shm_hugepages"
+	 cr_cv_kconfig_HAVE_PT_REGS_XFS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_is_file_shm_hugepages"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_is_file_shm_hugepages" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int is_file_shm_hugepages(struct file *file);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XFS
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_is_file_shm_hugepages | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(is_file_shm_hugepages, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_XFS 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_is_file_shm_hugepages $cr_addr
+     HAVE_PT_REGS_XFS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_XFS 0
 _ACEOF
 
+     HAVE_PT_REGS_XFS=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for hugepage_vma" >&5
-echo $ECHO_N "checking kernel symbol table for hugepage_vma... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_hugepage_vma+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for pt_regs.xgs" >&5
+echo $ECHO_N "checking kernel for pt_regs.xgs... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_PT_REGS_XGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_hugepage_vma=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}hugepage_vma$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_hugepage_vma"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_hugepage_vma\$" >/dev/null ; then
-        cr_cv_ksymtab_hugepage_vma=0
-      fi
 
 
   SAVE_CC=$CC
@@ -34194,14 +38827,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/ptrace.h>
 int
 main ()
 {
-int x = sizeof(&hugepage_vma);
+struct pt_regs x;
+          int tc_1 = x.xgs;
   ;
   return 0;
 }
@@ -34231,7 +38862,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_hugepage_vma="Y$cr_cv_ksymtab_hugepage_vma"
+	 cr_cv_kconfig_HAVE_PT_REGS_XGS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -34239,56 +38870,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_hugepage_vma="N$cr_cv_ksymtab_hugepage_vma"
+	 cr_cv_kconfig_HAVE_PT_REGS_XGS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_hugepage_vma"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_hugepage_vma" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern struct vm_area_struct *hugepage_vma(struct mm_struct *, unsigned long);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XGS
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_hugepage_vma | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(hugepage_vma, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_XGS 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_hugepage_vma $cr_addr
+     HAVE_PT_REGS_XGS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_XGS 0
 _ACEOF
 
+     HAVE_PT_REGS_XGS=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for pmd_huge" >&5
-echo $ECHO_N "checking kernel symbol table for pmd_huge... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_pmd_huge+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for pt_regs.cs" >&5
+echo $ECHO_N "checking kernel for pt_regs.cs... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_PT_REGS_CS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_pmd_huge=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}pmd_huge$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_pmd_huge"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pmd_huge\$" >/dev/null ; then
-        cr_cv_ksymtab_pmd_huge=0
-      fi
 
 
   SAVE_CC=$CC
@@ -34309,14 +38929,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/ptrace.h>
 int
 main ()
 {
-int x = sizeof(&pmd_huge);
+struct pt_regs x;
+          int tc_1 = x.cs;
   ;
   return 0;
 }
@@ -34346,7 +38964,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pmd_huge="Y$cr_cv_ksymtab_pmd_huge"
+	 cr_cv_kconfig_HAVE_PT_REGS_CS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -34354,56 +38972,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pmd_huge="N$cr_cv_ksymtab_pmd_huge"
+	 cr_cv_kconfig_HAVE_PT_REGS_CS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_pmd_huge"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_pmd_huge" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int pmd_huge(pmd_t pmd);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_CS
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_pmd_huge | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(pmd_huge, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_CS 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_pmd_huge $cr_addr
+     HAVE_PT_REGS_CS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_CS 0
 _ACEOF
 
+     HAVE_PT_REGS_CS=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for follow_huge_pmd" >&5
-echo $ECHO_N "checking kernel symbol table for follow_huge_pmd... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_follow_huge_pmd+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for pt_regs.fs" >&5
+echo $ECHO_N "checking kernel for pt_regs.fs... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_PT_REGS_FS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_follow_huge_pmd=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}follow_huge_pmd$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_follow_huge_pmd"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_follow_huge_pmd\$" >/dev/null ; then
-        cr_cv_ksymtab_follow_huge_pmd=0
-      fi
 
 
   SAVE_CC=$CC
@@ -34424,14 +39031,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <asm/ptrace.h>
 int
 main ()
 {
-int x = sizeof(&follow_huge_pmd);
+struct pt_regs x;
+          int tc_1 = x.fs;
   ;
   return 0;
 }
@@ -34461,7 +39066,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_follow_huge_pmd="Y$cr_cv_ksymtab_follow_huge_pmd"
+	 cr_cv_kconfig_HAVE_PT_REGS_FS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -34469,56 +39074,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_follow_huge_pmd="N$cr_cv_ksymtab_follow_huge_pmd"
+	 cr_cv_kconfig_HAVE_PT_REGS_FS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_follow_huge_pmd"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_follow_huge_pmd" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern struct page * follow_huge_pmd(struct mm_struct *, unsigned long  pmd_t *, int);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_FS
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_follow_huge_pmd | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(follow_huge_pmd, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_FS 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_follow_huge_pmd $cr_addr
+     HAVE_PT_REGS_FS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_FS 0
 _ACEOF
 
+     HAVE_PT_REGS_FS=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for follow_huge_addr" >&5
-echo $ECHO_N "checking kernel symbol table for follow_huge_addr... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_follow_huge_addr+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for pt_regs.gs" >&5
+echo $ECHO_N "checking kernel for pt_regs.gs... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_PT_REGS_GS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_follow_huge_addr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}follow_huge_addr$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_follow_huge_addr"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_follow_huge_addr\$" >/dev/null ; then
-        cr_cv_ksymtab_follow_huge_addr=0
-      fi
 
 
   SAVE_CC=$CC
@@ -34536,17 +39130,15 @@
 
 		 #include <linux/kernel.h>
 		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <asm/ptrace.h>
 int
 main ()
 {
-int x = sizeof(&follow_huge_addr);
+struct pt_regs x;
+          int tc_1 = x.gs;
   ;
   return 0;
 }
@@ -34576,7 +39168,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_follow_huge_addr="Y$cr_cv_ksymtab_follow_huge_addr"
+	 cr_cv_kconfig_HAVE_PT_REGS_GS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -34584,51 +39176,44 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_follow_huge_addr="N$cr_cv_ksymtab_follow_huge_addr"
+	 cr_cv_kconfig_HAVE_PT_REGS_GS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_follow_huge_addr"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_follow_huge_addr" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol follow_huge_addr but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol follow_huge_addr but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_follow_huge_addr | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(follow_huge_addr, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_GS
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_follow_huge_addr $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_GS 1
+_ACEOF
+
+     HAVE_PT_REGS_GS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_PT_REGS_GS 0
 _ACEOF
 
+     HAVE_PT_REGS_GS=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
- # Must have prototype, or NARGS probe will fail
 
 
+fi
 
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for 3-arg follow_huge_addr" >&5
-echo $ECHO_N "checking kernel for 3-arg follow_huge_addr... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for inode sem" >&5
+echo $ECHO_N "checking kernel for inode sem... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_INODE_SEM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -34652,16 +39237,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/mm.h>
-						 #include <linux/hugetlb.h>
+
+    #include <linux/sched.h>
+    #include <linux/fs.h>
+
 int
 main ()
 {
-
-	#ifndef follow_huge_addr /* Must be macro or have a decl */
-	  int x = sizeof(&follow_huge_addr);
-	#endif
-	    follow_huge_addr(NULL,0,0);
+struct inode x;
+          struct semaphore tc_1 = x.i_sem;
   ;
   return 0;
 }
@@ -34691,7 +39275,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR=yes
+	 cr_cv_kconfig_HAVE_INODE_SEM=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -34699,27 +39283,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR=no
+	 cr_cv_kconfig_HAVE_INODE_SEM=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR
+  cr_result=$cr_cv_kconfig_HAVE_INODE_SEM
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 1
+#define HAVE_INODE_SEM 1
 _ACEOF
 
-     HAVE_3_ARG_FOLLOW_HUGE_ADDR=1
+     HAVE_INODE_SEM=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 0
+#define HAVE_INODE_SEM 0
 _ACEOF
 
-     HAVE_3_ARG_FOLLOW_HUGE_ADDR=''
+     HAVE_INODE_SEM=''
   fi
 
 
@@ -34731,14 +39315,10 @@
 
 
 
+  echo "$as_me:$LINENO: checking kernel for inode mutex" >&5
+echo $ECHO_N "checking kernel for inode mutex... $ECHO_C" >&6
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 4-arg follow_huge_addr" >&5
-echo $ECHO_N "checking kernel for 4-arg follow_huge_addr... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_INODE_MUTEX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -34762,16 +39342,16 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/mm.h>
-						 #include <linux/hugetlb.h>
+
+    #include <linux/sched.h>
+    #include <linux/fs.h>
+    #include <linux/mutex.h>
+
 int
 main ()
 {
-
-	#ifndef follow_huge_addr /* Must be macro or have a decl */
-	  int x = sizeof(&follow_huge_addr);
-	#endif
-	    follow_huge_addr(NULL,NULL,0,0);
+struct inode x;
+          struct mutex tc_1 = x.i_mutex;
   ;
   return 0;
 }
@@ -34801,7 +39381,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR=yes
+	 cr_cv_kconfig_HAVE_INODE_MUTEX=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -34809,27 +39389,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR=no
+	 cr_cv_kconfig_HAVE_INODE_MUTEX=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR
+  cr_result=$cr_cv_kconfig_HAVE_INODE_MUTEX
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 1
+#define HAVE_INODE_MUTEX 1
 _ACEOF
 
-     HAVE_4_ARG_FOLLOW_HUGE_ADDR=1
+     HAVE_INODE_MUTEX=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 0
+#define HAVE_INODE_MUTEX 0
 _ACEOF
 
-     HAVE_4_ARG_FOLLOW_HUGE_ADDR=''
+     HAVE_INODE_MUTEX=''
   fi
 
 
@@ -34837,9 +39417,8 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-
-
-  if test "${HAVE_3_ARG_FOLLOW_HUGE_ADDR}${HAVE_4_ARG_FOLLOW_HUGE_ADDR}" != "1"; then
+# Allow exactly one match
+if test "${HAVE_INODE_SEM}${HAVE_INODE_MUTEX}" != "1"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -34905,34 +39484,23 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" >&2;}
    { (exit 1); exit 1; }; }
 
-  fi
 fi
 
-# Import the correct symbol for arch-specific ZERO_PAGE(),
-# which must have a prototype in asm/pgtable.h (arch-specific)
-# If we support ia64 or mips in the future we'll need to add more cases here.
-# NOTE: don't try to factor the CR_FIND_KSYM() call; it requires a literal.
-case $CR_ARCH in
-  sparc*)
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for mem_map_zero" >&5
-echo $ECHO_N "checking kernel symbol table for mem_map_zero... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_mem_map_zero+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for mm.dumpable" >&5
+echo $ECHO_N "checking kernel for mm.dumpable... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_MM_DUMPABLE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_mem_map_zero=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}mem_map_zero$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_mem_map_zero"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_mem_map_zero\$" >/dev/null ; then
-        cr_cv_ksymtab_mem_map_zero=0
-      fi
 
 
   SAVE_CC=$CC
@@ -34953,14 +39521,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/sched.h>
 int
 main ()
 {
-int x = sizeof(&mem_map_zero);
+struct mm_struct x;
+          int tc_1 = x.dumpable;
   ;
   return 0;
 }
@@ -34990,7 +39556,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_mem_map_zero="Y$cr_cv_ksymtab_mem_map_zero"
+	 cr_cv_kconfig_HAVE_MM_DUMPABLE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -34998,57 +39564,48 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_mem_map_zero="N$cr_cv_ksymtab_mem_map_zero"
+	 cr_cv_kconfig_HAVE_MM_DUMPABLE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_mem_map_zero"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_mem_map_zero" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol mem_map_zero but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol mem_map_zero but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_mem_map_zero | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(mem_map_zero, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_MM_DUMPABLE
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_mem_map_zero $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_MM_DUMPABLE 1
+_ACEOF
+
+     HAVE_MM_DUMPABLE=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_MM_DUMPABLE 0
 _ACEOF
 
+     HAVE_MM_DUMPABLE=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-    ZERO_PAGE_SYMBOL=mem_map_zero
-    ;;
-  *)
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for empty_zero_page" >&5
-echo $ECHO_N "checking kernel symbol table for empty_zero_page... $ECHO_C" >&6
+
+  echo "$as_me:$LINENO: checking kernel symbol table for get_dumpable" >&5
+echo $ECHO_N "checking kernel symbol table for get_dumpable... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_empty_zero_page+set}" = set; then
+    if test "${cr_cv_ksymtab_get_dumpable+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_empty_zero_page=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}empty_zero_page$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_empty_zero_page"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_empty_zero_page\$" >/dev/null ; then
-        cr_cv_ksymtab_empty_zero_page=0
+    cr_cv_ksymtab_get_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}get_dumpable$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_get_dumpable"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_get_dumpable\$" >/dev/null ; then
+        cr_cv_ksymtab_get_dumpable=0
       fi
 
 
@@ -35077,7 +39634,7 @@
 int
 main ()
 {
-int x = sizeof(&empty_zero_page);
+int x = sizeof(&get_dumpable);
   ;
   return 0;
 }
@@ -35107,7 +39664,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_empty_zero_page="Y$cr_cv_ksymtab_empty_zero_page"
+	 cr_cv_ksymtab_get_dumpable="Y$cr_cv_ksymtab_get_dumpable"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -35115,7 +39672,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_empty_zero_page="N$cr_cv_ksymtab_empty_zero_page"
+	 cr_cv_ksymtab_get_dumpable="N$cr_cv_ksymtab_get_dumpable"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -35124,49 +39681,113 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_empty_zero_page"; then
+  if test -z "$cr_cv_ksymtab_get_dumpable"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_empty_zero_page" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol empty_zero_page but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol empty_zero_page but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_get_dumpable" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int get_dumpable(struct mm_struct *mm);
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab_empty_zero_page | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_get_dumpable | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(empty_zero_page, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(get_dumpable, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_empty_zero_page $cr_addr
+#define CR_KCODE_get_dumpable $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-    ZERO_PAGE_SYMBOL=empty_zero_page
-    ;;
-esac
-if test -z "$cr_addr"; then
-  { { echo "$as_me:$LINENO: error: failed to find symbol $ZERO_PAGE_SYMBOL" >&5
-echo "$as_me: error: failed to find symbol $ZERO_PAGE_SYMBOL" >&2;}
+# Allow one or more match(es)
+if test -z "${HAVE_MM_DUMPABLE}${cr_addr}"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" >&2;}
    { (exit 1); exit 1; }; }
+
 fi
 
-# How to check for permission
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for inode_permission" >&5
-echo $ECHO_N "checking kernel for inode_permission... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for task.rlim" >&5
+echo $ECHO_N "checking kernel for task.rlim... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_INODE_PERMISSION+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_TASK_RLIM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -35190,18 +39811,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-
-   #ifdef inode_permission
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&inode_permission);
-   #endif
-
+struct task_struct x;
+          struct rlimit tc_1 = x.rlim[0];
   ;
   return 0;
 }
@@ -35231,7 +39846,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_INODE_PERMISSION=yes
+	 cr_cv_kconfig_HAVE_TASK_RLIM=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -35239,27 +39854,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_INODE_PERMISSION=no
+	 cr_cv_kconfig_HAVE_TASK_RLIM=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_INODE_PERMISSION
+  cr_result=$cr_cv_kconfig_HAVE_TASK_RLIM
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_INODE_PERMISSION 1
+#define HAVE_TASK_RLIM 1
 _ACEOF
 
-     HAVE_INODE_PERMISSION=1
+     HAVE_TASK_RLIM=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_INODE_PERMISSION 0
+#define HAVE_TASK_RLIM 0
 _ACEOF
 
-     HAVE_INODE_PERMISSION=''
+     HAVE_TASK_RLIM=''
   fi
 
 
@@ -35271,10 +39886,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for permission" >&5
-echo $ECHO_N "checking kernel for permission... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for signal.rlim" >&5
+echo $ECHO_N "checking kernel for signal.rlim... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_PERMISSION+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_SIGNAL_RLIM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -35298,18 +39913,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-
-   #ifdef permission
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&permission);
-   #endif
-
+struct task_struct x;
+          struct rlimit tc_1 = x.signal->rlim[0];
   ;
   return 0;
 }
@@ -35339,7 +39948,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PERMISSION=yes
+	 cr_cv_kconfig_HAVE_SIGNAL_RLIM=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -35347,27 +39956,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PERMISSION=no
+	 cr_cv_kconfig_HAVE_SIGNAL_RLIM=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PERMISSION
+  cr_result=$cr_cv_kconfig_HAVE_SIGNAL_RLIM
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PERMISSION 1
+#define HAVE_SIGNAL_RLIM 1
 _ACEOF
 
-     HAVE_PERMISSION=1
+     HAVE_SIGNAL_RLIM=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PERMISSION 0
+#define HAVE_SIGNAL_RLIM 0
 _ACEOF
 
-     HAVE_PERMISSION=''
+     HAVE_SIGNAL_RLIM=''
   fi
 
 
@@ -35375,7 +39984,8 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test -z "${HAVE_INODE_PERMISSION}${HAVE_PERMISSION}"; then
+# Allow exactly one match
+if test "${HAVE_TASK_RLIM}${HAVE_SIGNAL_RLIM}" != "1"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -35441,143 +40051,23 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 
-# Bits for save/restore of pending signals
-
-
-  echo "$as_me:$LINENO: checking kernel symbol table for copy_siginfo_to_user" >&5
-echo $ECHO_N "checking kernel symbol table for copy_siginfo_to_user... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_copy_siginfo_to_user+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    cr_cv_ksymtab_copy_siginfo_to_user=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_siginfo_to_user$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_copy_siginfo_to_user"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_copy_siginfo_to_user\$" >/dev/null ; then
-        cr_cv_ksymtab_copy_siginfo_to_user=0
-      fi
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
-int
-main ()
-{
-int x = sizeof(&copy_siginfo_to_user);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_copy_siginfo_to_user="Y$cr_cv_ksymtab_copy_siginfo_to_user"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_copy_siginfo_to_user="N$cr_cv_ksymtab_copy_siginfo_to_user"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-    fi
-
-fi
-
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_copy_siginfo_to_user"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_copy_siginfo_to_user" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int copy_siginfo_to_user(siginfo_t *to, siginfo_t *from);
-_EOF
-
-    fi
-    cr_result=`echo $cr_cv_ksymtab_copy_siginfo_to_user | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(copy_siginfo_to_user, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_copy_siginfo_to_user $cr_addr
-_ACEOF
 
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
 
 
+  echo "$as_me:$LINENO: checking kernel for task.cred" >&5
+echo $ECHO_N "checking kernel for task.cred... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel symbol table for group_send_sig_info" >&5
-echo $ECHO_N "checking kernel symbol table for group_send_sig_info... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_group_send_sig_info+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_TASK_CRED+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_group_send_sig_info=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}group_send_sig_info$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_group_send_sig_info"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_group_send_sig_info\$" >/dev/null ; then
-        cr_cv_ksymtab_group_send_sig_info=0
-      fi
 
 
   SAVE_CC=$CC
@@ -35598,14 +40088,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/sched.h>
 int
 main ()
 {
-int x = sizeof(&group_send_sig_info);
+struct task_struct x;
+          const struct cred  tc_1 = *(x.cred);
   ;
   return 0;
 }
@@ -35635,7 +40123,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_group_send_sig_info="Y$cr_cv_ksymtab_group_send_sig_info"
+	 cr_cv_kconfig_HAVE_TASK_CRED=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -35643,58 +40131,46 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_group_send_sig_info="N$cr_cv_ksymtab_group_send_sig_info"
+	 cr_cv_kconfig_HAVE_TASK_CRED=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_group_send_sig_info"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_group_send_sig_info" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int group_send_sig_info(int, struct siginfo *, struct task_struct *);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_TASK_CRED
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_group_send_sig_info | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(group_send_sig_info, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_CRED 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_group_send_sig_info $cr_addr
+     HAVE_TASK_CRED=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_CRED 0
 _ACEOF
 
+     HAVE_TASK_CRED=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
-# For save/restore of sigaltstack
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for do_sigaltstack" >&5
-echo $ECHO_N "checking kernel symbol table for do_sigaltstack... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_do_sigaltstack+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for task.group_info" >&5
+echo $ECHO_N "checking kernel for task.group_info... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_TASK_GROUP_INFO+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_do_sigaltstack=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_sigaltstack$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_do_sigaltstack"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_sigaltstack\$" >/dev/null ; then
-        cr_cv_ksymtab_do_sigaltstack=0
-      fi
 
 
   SAVE_CC=$CC
@@ -35715,14 +40191,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/sched.h>
 int
 main ()
 {
-int x = sizeof(&do_sigaltstack);
+struct task_struct x;
+          struct group_info  tc_1 = *(x.group_info);
   ;
   return 0;
 }
@@ -35752,7 +40226,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_do_sigaltstack="Y$cr_cv_ksymtab_do_sigaltstack"
+	 cr_cv_kconfig_HAVE_TASK_GROUP_INFO=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -35760,51 +40234,42 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_do_sigaltstack="N$cr_cv_ksymtab_do_sigaltstack"
+	 cr_cv_kconfig_HAVE_TASK_GROUP_INFO=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_do_sigaltstack"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_do_sigaltstack" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int do_sigaltstack(const stack_t *, stack_t *, unsigned long);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_TASK_GROUP_INFO
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_do_sigaltstack | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(do_sigaltstack, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_GROUP_INFO 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_do_sigaltstack $cr_addr
+     HAVE_TASK_GROUP_INFO=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_GROUP_INFO 0
 _ACEOF
 
+     HAVE_TASK_GROUP_INFO=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test $CR_ARCH = i386 -o $CR_ARCH = x86_64; then
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for struct n_desc_struct" >&5
-echo $ECHO_N "checking kernel for struct n_desc_struct... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for suid_dumpable" >&5
+echo $ECHO_N "checking kernel for suid_dumpable... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_SUID_DUMPABLE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -35828,15 +40293,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-	#include <linux/sched.h>
-	#include <asm/desc.h>
+		 #include <linux/binfmts.h>
 int
 main ()
 {
 
-     struct n_desc_struct y;
-     int x = sizeof(y);
+     int x = sizeof(&suid_dumpable);
 
   ;
   return 0;
@@ -35867,7 +40329,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT=yes
+	 cr_cv_kconfig_HAVE_SUID_DUMPABLE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -35875,27 +40337,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT=no
+	 cr_cv_kconfig_HAVE_SUID_DUMPABLE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT
+  cr_result=$cr_cv_kconfig_HAVE_SUID_DUMPABLE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_N_DESC_STRUCT 1
+#define HAVE_SUID_DUMPABLE 1
 _ACEOF
 
-     HAVE_STRUCT_N_DESC_STRUCT=1
+     HAVE_SUID_DUMPABLE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_N_DESC_STRUCT 0
+#define HAVE_SUID_DUMPABLE 0
 _ACEOF
 
-     HAVE_STRUCT_N_DESC_STRUCT=''
+     HAVE_SUID_DUMPABLE=''
   fi
 
 
@@ -35903,17 +40365,22 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test -n "${HAVE_SUID_DUMPABLE}"; then
 
 
-
-
-  echo "$as_me:$LINENO: checking kernel for cpu_gdt_descr" >&5
-echo $ECHO_N "checking kernel for cpu_gdt_descr... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_CPU_GDT_DESCR+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for suid_dumpable" >&5
+echo $ECHO_N "checking kernel symbol table for suid_dumpable... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_suid_dumpable+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_suid_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}suid_dumpable$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_suid_dumpable"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_suid_dumpable\$" >/dev/null ; then
+        cr_cv_ksymtab_suid_dumpable=0
+      fi
 
 
   SAVE_CC=$CC
@@ -35934,14 +40401,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
-					  #include <asm/desc.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-     int x = sizeof(&cpu_gdt_descr);
-
+int x = sizeof(&suid_dumpable);
   ;
   return 0;
 }
@@ -35971,7 +40438,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_CPU_GDT_DESCR=yes
+	 cr_cv_ksymtab_suid_dumpable="Y$cr_cv_ksymtab_suid_dumpable"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -35979,50 +40446,52 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_CPU_GDT_DESCR=no
+	 cr_cv_ksymtab_suid_dumpable="N$cr_cv_ksymtab_suid_dumpable"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_CPU_GDT_DESCR
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_CPU_GDT_DESCR 1
-_ACEOF
-
-     HAVE_CPU_GDT_DESCR=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_suid_dumpable"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_CPU_GDT_DESCR 0
+    if expr "$cr_cv_ksymtab_suid_dumpable" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol suid_dumpable but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol suid_dumpable but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_suid_dumpable | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(suid_dumpable, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_suid_dumpable $cr_addr
 _ACEOF
 
-     HAVE_CPU_GDT_DESCR=''
   fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
+fi
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
 
 
-  if test -n "${HAVE_CPU_GDT_DESCR}"; then
 
+  echo "$as_me:$LINENO: checking kernel for set_dumpable" >&5
+echo $ECHO_N "checking kernel for set_dumpable... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel symbol table for cpu_gdt_descr" >&5
-echo $ECHO_N "checking kernel symbol table for cpu_gdt_descr... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_cpu_gdt_descr+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_SET_DUMPABLE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_cpu_gdt_descr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}cpu_gdt_descr$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_cpu_gdt_descr"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_cpu_gdt_descr\$" >/dev/null ; then
-        cr_cv_ksymtab_cpu_gdt_descr=0
-      fi
 
 
   SAVE_CC=$CC
@@ -36043,14 +40512,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/sched.h>
 int
 main ()
 {
-int x = sizeof(&cpu_gdt_descr);
+
+   #ifdef set_dumpable
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&set_dumpable);
+   #endif
+
   ;
   return 0;
 }
@@ -36080,7 +40553,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_cpu_gdt_descr="Y$cr_cv_ksymtab_cpu_gdt_descr"
+	 cr_cv_kconfig_HAVE_SET_DUMPABLE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -36088,55 +40561,49 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_cpu_gdt_descr="N$cr_cv_ksymtab_cpu_gdt_descr"
+	 cr_cv_kconfig_HAVE_SET_DUMPABLE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_cpu_gdt_descr"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_cpu_gdt_descr" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol cpu_gdt_descr but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol cpu_gdt_descr but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_cpu_gdt_descr | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(cpu_gdt_descr, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_SET_DUMPABLE
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_cpu_gdt_descr $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_SET_DUMPABLE 1
+_ACEOF
+
+     HAVE_SET_DUMPABLE=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_SET_DUMPABLE 0
 _ACEOF
 
+     HAVE_SET_DUMPABLE=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-  fi
 
+if test -n "${HAVE_SET_DUMPABLE}"; then
 
-  echo "$as_me:$LINENO: checking kernel symbol table for cpu_gdt_table" >&5
-echo $ECHO_N "checking kernel symbol table for cpu_gdt_table... $ECHO_C" >&6
+
+  echo "$as_me:$LINENO: checking kernel symbol table for set_dumpable" >&5
+echo $ECHO_N "checking kernel symbol table for set_dumpable... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_cpu_gdt_table+set}" = set; then
+    if test "${cr_cv_ksymtab_set_dumpable+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_cpu_gdt_table=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}cpu_gdt_table$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_cpu_gdt_table"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_cpu_gdt_table\$" >/dev/null ; then
-        cr_cv_ksymtab_cpu_gdt_table=0
+    cr_cv_ksymtab_set_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}set_dumpable$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_set_dumpable"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_set_dumpable\$" >/dev/null ; then
+        cr_cv_ksymtab_set_dumpable=0
       fi
 
 
@@ -36165,7 +40632,7 @@
 int
 main ()
 {
-int x = sizeof(&cpu_gdt_table);
+int x = sizeof(&set_dumpable);
   ;
   return 0;
 }
@@ -36195,7 +40662,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_cpu_gdt_table="Y$cr_cv_ksymtab_cpu_gdt_table"
+	 cr_cv_ksymtab_set_dumpable="Y$cr_cv_ksymtab_set_dumpable"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -36203,7 +40670,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_cpu_gdt_table="N$cr_cv_ksymtab_cpu_gdt_table"
+	 cr_cv_ksymtab_set_dumpable="N$cr_cv_ksymtab_set_dumpable"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -36212,45 +40679,46 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_cpu_gdt_table"; then
+  if test -z "$cr_cv_ksymtab_set_dumpable"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_cpu_gdt_table" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol cpu_gdt_table but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol cpu_gdt_table but no declaration -- please file a bug report." >&2;}
+    if expr "$cr_cv_ksymtab_set_dumpable" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol set_dumpable but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol set_dumpable but no declaration -- please file a bug report." >&2;}
    { (exit 1); exit 1; }; }
     fi
-    cr_result=`echo $cr_cv_ksymtab_cpu_gdt_table | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_set_dumpable | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(cpu_gdt_table, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(set_dumpable, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_cpu_gdt_table $cr_addr
+#define CR_KCODE_set_dumpable $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+fi
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for per_cpu__cpu_gdt_descr" >&5
-echo $ECHO_N "checking kernel symbol table for per_cpu__cpu_gdt_descr... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for groups_search" >&5
+echo $ECHO_N "checking kernel symbol table for groups_search... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_per_cpu__cpu_gdt_descr+set}" = set; then
+    if test "${cr_cv_ksymtab_groups_search+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_per_cpu__cpu_gdt_descr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}per_cpu__cpu_gdt_descr$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_per_cpu__cpu_gdt_descr\$" >/dev/null ; then
-        cr_cv_ksymtab_per_cpu__cpu_gdt_descr=0
+    cr_cv_ksymtab_groups_search=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}groups_search$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_groups_search"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_groups_search\$" >/dev/null ; then
+        cr_cv_ksymtab_groups_search=0
       fi
 
 
@@ -36279,7 +40747,7 @@
 int
 main ()
 {
-int x = sizeof(&per_cpu__cpu_gdt_descr);
+int x = sizeof(&groups_search);
   ;
   return 0;
 }
@@ -36309,7 +40777,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_per_cpu__cpu_gdt_descr="Y$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"
+	 cr_cv_ksymtab_groups_search="Y$cr_cv_ksymtab_groups_search"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -36317,7 +40785,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_per_cpu__cpu_gdt_descr="N$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"
+	 cr_cv_ksymtab_groups_search="N$cr_cv_ksymtab_groups_search"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -36326,25 +40794,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"; then
+  if test -z "$cr_cv_ksymtab_groups_search"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_per_cpu__cpu_gdt_descr" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_groups_search" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int groups_search(struct group_info *, gid_t);
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab_per_cpu__cpu_gdt_descr | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_groups_search | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(per_cpu__cpu_gdt_descr, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(groups_search, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_per_cpu__cpu_gdt_descr $cr_addr
+#define CR_KCODE_groups_search $cr_addr
 _ACEOF
 
   fi
@@ -36353,16 +40822,19 @@
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for thread.sp0" >&5
-echo $ECHO_N "checking kernel for thread.sp0... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_THREAD_SP0+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for supplemental_group_member" >&5
+echo $ECHO_N "checking kernel symbol table for supplemental_group_member... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_supplemental_group_member+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_supplemental_group_member=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}supplemental_group_member$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_supplemental_group_member"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_supplemental_group_member\$" >/dev/null ; then
+        cr_cv_ksymtab_supplemental_group_member=0
+      fi
 
 
   SAVE_CC=$CC
@@ -36383,12 +40855,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/processor.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct thread_struct x;
-          unsigned long tc_1 = x.sp0;
+int x = sizeof(&supplemental_group_member);
   ;
   return 0;
 }
@@ -36418,7 +40892,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_SP0=yes
+	 cr_cv_ksymtab_supplemental_group_member="Y$cr_cv_ksymtab_supplemental_group_member"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -36426,31 +40900,39 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_SP0=no
+	 cr_cv_ksymtab_supplemental_group_member="N$cr_cv_ksymtab_supplemental_group_member"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_SP0
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_supplemental_group_member"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_supplemental_group_member" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int supplemental_group_member(gid_t);
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_SP0 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_supplemental_group_member | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(supplemental_group_member, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_THREAD_SP0=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_SP0 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_supplemental_group_member $cr_addr
 _ACEOF
 
-     HAVE_THREAD_SP0=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
@@ -36458,10 +40940,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for thread.esp0" >&5
-echo $ECHO_N "checking kernel for thread.esp0... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for PIDTYPE_TGID" >&5
+echo $ECHO_N "checking kernel for PIDTYPE_TGID... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_THREAD_ESP0+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_PIDTYPE_TGID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -36485,12 +40967,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/processor.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-struct thread_struct x;
-          unsigned long tc_1 = x.esp0;
+
+     typeof(PIDTYPE_TGID) y;
+     int x = sizeof(y);
+
   ;
   return 0;
 }
@@ -36520,7 +41004,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_ESP0=yes
+	 cr_cv_kconfig_HAVE_PIDTYPE_TGID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -36528,27 +41012,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_ESP0=no
+	 cr_cv_kconfig_HAVE_PIDTYPE_TGID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_ESP0
+  cr_result=$cr_cv_kconfig_HAVE_PIDTYPE_TGID
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_ESP0 1
+#define HAVE_PIDTYPE_TGID 1
 _ACEOF
 
-     HAVE_THREAD_ESP0=1
+     HAVE_PIDTYPE_TGID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_ESP0 0
+#define HAVE_PIDTYPE_TGID 0
 _ACEOF
 
-     HAVE_THREAD_ESP0=''
+     HAVE_PIDTYPE_TGID=''
   fi
 
 
@@ -36560,10 +41044,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for thread.rsp0" >&5
-echo $ECHO_N "checking kernel for thread.rsp0... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for task.thread_group" >&5
+echo $ECHO_N "checking kernel for task.thread_group... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_THREAD_RSP0+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_TASK_THREAD_GROUP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -36587,12 +41071,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/processor.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-struct thread_struct x;
-          unsigned long tc_1 = x.rsp0;
+struct task_struct x;
+          struct list_head tc_1 = x.thread_group;
   ;
   return 0;
 }
@@ -36622,7 +41106,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_RSP0=yes
+	 cr_cv_kconfig_HAVE_TASK_THREAD_GROUP=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -36630,45 +41114,121 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_RSP0=no
+	 cr_cv_kconfig_HAVE_TASK_THREAD_GROUP=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_RSP0
+  cr_result=$cr_cv_kconfig_HAVE_TASK_THREAD_GROUP
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_RSP0 1
+#define HAVE_TASK_THREAD_GROUP 1
 _ACEOF
 
-     HAVE_THREAD_RSP0=1
+     HAVE_TASK_THREAD_GROUP=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_THREAD_GROUP 0
+_ACEOF
+
+     HAVE_TASK_THREAD_GROUP=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+if test "${HAVE_PIDTYPE_TGID}${HAVE_TASK_THREAD_GROUP}" != "1"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_RSP0 0
-_ACEOF
-
-     HAVE_THREAD_RSP0=''
+    echo "not updating unwritable cache $cache_file"
   fi
+fi
+rm -f confcache
 
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine thread group list" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine thread group list" >&2;}
+   { (exit 1); exit 1; }; }
 
+fi
 
 
-  echo "$as_me:$LINENO: checking kernel for thread.usersp" >&5
-echo $ECHO_N "checking kernel for thread.usersp... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_THREAD_USERSP+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for detach_pid" >&5
+echo $ECHO_N "checking kernel symbol table for detach_pid... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_detach_pid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_detach_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}detach_pid$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_detach_pid"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_detach_pid\$" >/dev/null ; then
+        cr_cv_ksymtab_detach_pid=0
+      fi
 
 
   SAVE_CC=$CC
@@ -36689,12 +41249,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/processor.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct thread_struct x;
-          unsigned long tc_1 = x.usersp;
+int x = sizeof(&detach_pid);
   ;
   return 0;
 }
@@ -36724,7 +41286,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_USERSP=yes
+	 cr_cv_ksymtab_detach_pid="Y$cr_cv_ksymtab_detach_pid"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -36732,45 +41294,55 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_USERSP=no
+	 cr_cv_ksymtab_detach_pid="N$cr_cv_ksymtab_detach_pid"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_USERSP
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_USERSP 1
-_ACEOF
-
-     HAVE_THREAD_USERSP=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_detach_pid"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_USERSP 0
+    if expr "$cr_cv_ksymtab_detach_pid" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol detach_pid but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol detach_pid but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_detach_pid | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(detach_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_detach_pid $cr_addr
 _ACEOF
 
-     HAVE_THREAD_USERSP=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for thread.userrsp" >&5
-echo $ECHO_N "checking kernel for thread.userrsp... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_THREAD_USERRSP+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for attach_pid" >&5
+echo $ECHO_N "checking kernel symbol table for attach_pid... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_attach_pid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_attach_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}attach_pid$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_attach_pid"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_attach_pid\$" >/dev/null ; then
+        cr_cv_ksymtab_attach_pid=0
+      fi
 
 
   SAVE_CC=$CC
@@ -36791,12 +41363,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/processor.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct thread_struct x;
-          unsigned long tc_1 = x.userrsp;
+int x = sizeof(&attach_pid);
   ;
   return 0;
 }
@@ -36826,7 +41400,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_USERRSP=yes
+	 cr_cv_ksymtab_attach_pid="Y$cr_cv_ksymtab_attach_pid"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -36834,45 +41408,55 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_USERRSP=no
+	 cr_cv_ksymtab_attach_pid="N$cr_cv_ksymtab_attach_pid"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_USERRSP
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_USERRSP 1
-_ACEOF
-
-     HAVE_THREAD_USERRSP=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_attach_pid"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_USERRSP 0
+    if expr "$cr_cv_ksymtab_attach_pid" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol attach_pid but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol attach_pid but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_attach_pid | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(attach_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_attach_pid $cr_addr
 _ACEOF
 
-     HAVE_THREAD_USERRSP=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for thread.debugreg0" >&5
-echo $ECHO_N "checking kernel for thread.debugreg0... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREG0+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for change_pid" >&5
+echo $ECHO_N "checking kernel symbol table for change_pid... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_change_pid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_change_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}change_pid$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_change_pid"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_change_pid\$" >/dev/null ; then
+        cr_cv_ksymtab_change_pid=0
+      fi
 
 
   SAVE_CC=$CC
@@ -36893,12 +41477,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/processor.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct thread_struct x;
-          unsigned long tc_1 = x.debugreg0;
+int x = sizeof(&change_pid);
   ;
   return 0;
 }
@@ -36928,7 +41514,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_DEBUGREG0=yes
+	 cr_cv_ksymtab_change_pid="Y$cr_cv_ksymtab_change_pid"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -36936,45 +41522,55 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_DEBUGREG0=no
+	 cr_cv_ksymtab_change_pid="N$cr_cv_ksymtab_change_pid"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_DEBUGREG0
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_DEBUGREG0 1
-_ACEOF
-
-     HAVE_THREAD_DEBUGREG0=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_change_pid"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_DEBUGREG0 0
+    if expr "$cr_cv_ksymtab_change_pid" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol change_pid but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol change_pid but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_change_pid | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(change_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_change_pid $cr_addr
 _ACEOF
 
-     HAVE_THREAD_DEBUGREG0=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for thread.debugregs" >&5
-echo $ECHO_N "checking kernel for thread.debugregs... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREGS+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for find_pid" >&5
+echo $ECHO_N "checking kernel symbol table for find_pid... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_find_pid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_find_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}find_pid$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_find_pid"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_find_pid\$" >/dev/null ; then
+        cr_cv_ksymtab_find_pid=0
+      fi
 
 
   SAVE_CC=$CC
@@ -36995,12 +41591,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/processor.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct thread_struct x;
-          unsigned long tc_1 = x.debugreg[1];
+int x = sizeof(&find_pid);
   ;
   return 0;
 }
@@ -37030,7 +41628,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_DEBUGREGS=yes
+	 cr_cv_ksymtab_find_pid="Y$cr_cv_ksymtab_find_pid"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37038,45 +41636,55 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_DEBUGREGS=no
+	 cr_cv_ksymtab_find_pid="N$cr_cv_ksymtab_find_pid"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_DEBUGREGS
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_DEBUGREGS 1
-_ACEOF
-
-     HAVE_THREAD_DEBUGREGS=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_find_pid"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_DEBUGREGS 0
+    if expr "$cr_cv_ksymtab_find_pid" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol find_pid but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol find_pid but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_find_pid | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(find_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_find_pid $cr_addr
 _ACEOF
 
-     HAVE_THREAD_DEBUGREGS=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for thread.i387" >&5
-echo $ECHO_N "checking kernel for thread.i387... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_THREAD_I387+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for link_pid" >&5
+echo $ECHO_N "checking kernel symbol table for link_pid... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_link_pid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_link_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}link_pid$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_link_pid"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_link_pid\$" >/dev/null ; then
+        cr_cv_ksymtab_link_pid=0
+      fi
 
 
   SAVE_CC=$CC
@@ -37097,12 +41705,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/processor.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct thread_struct x;
-          union i387_union tc_1 = x.i387;
+int x = sizeof(&link_pid);
   ;
   return 0;
 }
@@ -37132,7 +41742,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_I387=yes
+	 cr_cv_ksymtab_link_pid="Y$cr_cv_ksymtab_link_pid"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37140,42 +41750,52 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_I387=no
+	 cr_cv_ksymtab_link_pid="N$cr_cv_ksymtab_link_pid"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_I387
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_I387 1
-_ACEOF
-
-     HAVE_THREAD_I387=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_link_pid"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_I387 0
+    if expr "$cr_cv_ksymtab_link_pid" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol link_pid but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol link_pid but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_link_pid | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(link_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_link_pid $cr_addr
 _ACEOF
 
-     HAVE_THREAD_I387=''
   fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
 
 
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for thread.xstate" >&5
-echo $ECHO_N "checking kernel for thread.xstate... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_THREAD_XSTATE+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for 1-arg find_pid" >&5
+echo $ECHO_N "checking kernel for 1-arg find_pid... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_1_ARG_FIND_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -37199,12 +41819,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/processor.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-struct thread_struct x;
-          union thread_xstate  tc_1 = *(x.xstate);
+
+	#ifndef find_pid /* Must be macro or have a decl */
+	  int x = sizeof(&find_pid);
+	#endif
+	    find_pid(0);
   ;
   return 0;
 }
@@ -37234,7 +41857,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_XSTATE=yes
+	 cr_cv_kconfig_HAVE_1_ARG_FIND_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37242,27 +41865,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_THREAD_XSTATE=no
+	 cr_cv_kconfig_HAVE_1_ARG_FIND_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_THREAD_XSTATE
+  cr_result=$cr_cv_kconfig_HAVE_1_ARG_FIND_PID
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_XSTATE 1
+#define HAVE_1_ARG_FIND_PID 1
 _ACEOF
 
-     HAVE_THREAD_XSTATE=1
+     HAVE_1_ARG_FIND_PID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_XSTATE 0
+#define HAVE_1_ARG_FIND_PID 0
 _ACEOF
 
-     HAVE_THREAD_XSTATE=''
+     HAVE_1_ARG_FIND_PID=''
   fi
 
 
@@ -37275,10 +41898,13 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for pt_regs.eflags" >&5
-echo $ECHO_N "checking kernel for pt_regs.eflags... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_PT_REGS_EFLAGS+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for 2-arg find_pid" >&5
+echo $ECHO_N "checking kernel for 2-arg find_pid... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_ARG_FIND_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -37302,12 +41928,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/ptrace.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-struct pt_regs x;
-          unsigned long tc_1 = x.eflags;
+
+	#ifndef find_pid /* Must be macro or have a decl */
+	  int x = sizeof(&find_pid);
+	#endif
+	    find_pid(0,0);
   ;
   return 0;
 }
@@ -37337,7 +41966,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_EFLAGS=yes
+	 cr_cv_kconfig_HAVE_2_ARG_FIND_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37345,27 +41974,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_EFLAGS=no
+	 cr_cv_kconfig_HAVE_2_ARG_FIND_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_EFLAGS
+  cr_result=$cr_cv_kconfig_HAVE_2_ARG_FIND_PID
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_EFLAGS 1
+#define HAVE_2_ARG_FIND_PID 1
 _ACEOF
 
-     HAVE_PT_REGS_EFLAGS=1
+     HAVE_2_ARG_FIND_PID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_EFLAGS 0
+#define HAVE_2_ARG_FIND_PID 0
 _ACEOF
 
-     HAVE_PT_REGS_EFLAGS=''
+     HAVE_2_ARG_FIND_PID=''
   fi
 
 
@@ -37377,10 +42006,12 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for pt_regs.flags" >&5
-echo $ECHO_N "checking kernel for pt_regs.flags... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_PT_REGS_FLAGS+set}" = set; then
+
+  echo "$as_me:$LINENO: checking kernel for find_pid_ns" >&5
+echo $ECHO_N "checking kernel for find_pid_ns... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_FIND_PID_NS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -37404,12 +42035,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/ptrace.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-struct pt_regs x;
-          unsigned long tc_1 = x.flags;
+
+   #ifdef find_pid_ns
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&find_pid_ns);
+   #endif
+
   ;
   return 0;
 }
@@ -37439,7 +42076,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_FLAGS=yes
+	 cr_cv_kconfig_HAVE_FIND_PID_NS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37447,50 +42084,117 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_FLAGS=no
+	 cr_cv_kconfig_HAVE_FIND_PID_NS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_FLAGS
+  cr_result=$cr_cv_kconfig_HAVE_FIND_PID_NS
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_FLAGS 1
+#define HAVE_FIND_PID_NS 1
+_ACEOF
+
+     HAVE_FIND_PID_NS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FIND_PID_NS 0
 _ACEOF
 
-     HAVE_PT_REGS_FLAGS=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_FLAGS 0
-_ACEOF
+     HAVE_FIND_PID_NS=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+if test -z "${HAVE_1_ARG_FIND_PID}${HAVE_2_ARG_FIND_PID}${HAVE_FIND_PID_NS}"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
 
-     HAVE_PT_REGS_FLAGS=''
-  fi
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" >&2;}
+   { (exit 1); exit 1; }; }
 
+fi
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
 
 
 
 
+  echo "$as_me:$LINENO: checking kernel for find_task_by_pid" >&5
+echo $ECHO_N "checking kernel for find_task_by_pid... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel symbol table for init_fpu" >&5
-echo $ECHO_N "checking kernel symbol table for init_fpu... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_init_fpu+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_init_fpu=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}init_fpu$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_init_fpu"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_init_fpu\$" >/dev/null ; then
-        cr_cv_ksymtab_init_fpu=0
-      fi
 
 
   SAVE_CC=$CC
@@ -37511,14 +42215,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/sched.h>
 int
 main ()
 {
-int x = sizeof(&init_fpu);
+
+   #ifdef find_task_by_pid
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&find_task_by_pid);
+   #endif
+
   ;
   return 0;
 }
@@ -37548,7 +42256,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_init_fpu="Y$cr_cv_ksymtab_init_fpu"
+	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37556,56 +42264,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_init_fpu="N$cr_cv_ksymtab_init_fpu"
+	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_init_fpu"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_init_fpu" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern void init_fpu(struct task_struct *);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_init_fpu | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(init_fpu, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FIND_TASK_BY_PID 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_init_fpu $cr_addr
+     HAVE_FIND_TASK_BY_PID=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FIND_TASK_BY_PID 0
 _ACEOF
 
+     HAVE_FIND_TASK_BY_PID=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for xstate_size" >&5
-echo $ECHO_N "checking kernel symbol table for xstate_size... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_xstate_size+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_ns" >&5
+echo $ECHO_N "checking kernel for find_task_by_pid_ns... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_xstate_size=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}xstate_size$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_xstate_size"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_xstate_size\$" >/dev/null ; then
-        cr_cv_ksymtab_xstate_size=0
-      fi
 
 
   SAVE_CC=$CC
@@ -37626,14 +42323,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/sched.h>
 int
 main ()
 {
-int x = sizeof(&xstate_size);
+
+   #ifdef find_task_by_pid_ns
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&find_task_by_pid_ns);
+   #endif
+
   ;
   return 0;
 }
@@ -37663,7 +42364,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_xstate_size="Y$cr_cv_ksymtab_xstate_size"
+	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37671,53 +42372,120 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_xstate_size="N$cr_cv_ksymtab_xstate_size"
+	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_xstate_size"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_xstate_size" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern unsigned int xstate_size;
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_xstate_size | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(xstate_size, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FIND_TASK_BY_PID_NS 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_xstate_size $cr_addr
+     HAVE_FIND_TASK_BY_PID_NS=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FIND_TASK_BY_PID_NS 0
 _ACEOF
 
+     HAVE_FIND_TASK_BY_PID_NS=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test -z "${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
 
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
 
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" >&2;}
+   { (exit 1); exit 1; }; }
 
+fi
 
-  echo "$as_me:$LINENO: checking kernel for restore_fpu_checking" >&5
-echo $ECHO_N "checking kernel for restore_fpu_checking... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for find_task_by_pid_ns" >&5
+echo $ECHO_N "checking kernel symbol table for find_task_by_pid_ns... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_find_task_by_pid_ns+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_find_task_by_pid_ns=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}find_task_by_pid_ns$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_find_task_by_pid_ns"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_find_task_by_pid_ns\$" >/dev/null ; then
+        cr_cv_ksymtab_find_task_by_pid_ns=0
+      fi
 
 
   SAVE_CC=$CC
@@ -37738,18 +42506,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/i387.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-   #ifdef restore_fpu_checking
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&restore_fpu_checking);
-   #endif
-
+int x = sizeof(&find_task_by_pid_ns);
   ;
   return 0;
 }
@@ -37779,7 +42543,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING=yes
+	 cr_cv_ksymtab_find_task_by_pid_ns="Y$cr_cv_ksymtab_find_task_by_pid_ns"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37787,43 +42551,49 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING=no
+	 cr_cv_ksymtab_find_task_by_pid_ns="N$cr_cv_ksymtab_find_task_by_pid_ns"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_RESTORE_FPU_CHECKING 1
-_ACEOF
-
-     HAVE_RESTORE_FPU_CHECKING=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_find_task_by_pid_ns"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_RESTORE_FPU_CHECKING 0
+    if expr "$cr_cv_ksymtab_find_task_by_pid_ns" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol find_task_by_pid_ns but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol find_task_by_pid_ns but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_find_task_by_pid_ns | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(find_task_by_pid_ns, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_find_task_by_pid_ns $cr_addr
 _ACEOF
 
-     HAVE_RESTORE_FPU_CHECKING=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
-  if test -n "${HAVE_RESTORE_FPU_CHECKING}"; then
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for 2.6.0 restore_fpu_checking" >&5
-echo $ECHO_N "checking kernel for 2.6.0 restore_fpu_checking... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_type" >&5
+echo $ECHO_N "checking kernel for find_task_by_pid_type... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -37847,12 +42617,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/i387.h>
-   int restore_fpu_checking(struct i387_fxsave_struct *);
+		 #include <linux/sched.h>
 int
 main ()
 {
-int x = sizeof(&restore_fpu_checking)
+
+   #ifdef find_task_by_pid_type
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&find_task_by_pid_type);
+   #endif
+
   ;
   return 0;
 }
@@ -37882,7 +42658,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING=yes
+	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37890,27 +42666,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING=no
+	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING
+  cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_0_RESTORE_FPU_CHECKING 1
+#define HAVE_FIND_TASK_BY_PID_TYPE 1
 _ACEOF
 
-     HAVE_2_6_0_RESTORE_FPU_CHECKING=1
+     HAVE_FIND_TASK_BY_PID_TYPE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_0_RESTORE_FPU_CHECKING 0
+#define HAVE_FIND_TASK_BY_PID_TYPE 0
 _ACEOF
 
-     HAVE_2_6_0_RESTORE_FPU_CHECKING=''
+     HAVE_FIND_TASK_BY_PID_TYPE=''
   fi
 
 
@@ -37922,10 +42698,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for 2.6.28 restore_fpu_checking" >&5
-echo $ECHO_N "checking kernel for 2.6.28 restore_fpu_checking... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_type_ns" >&5
+echo $ECHO_N "checking kernel for find_task_by_pid_type_ns... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -37949,12 +42725,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/i387.h>
-   int restore_fpu_checking(struct task_struct *);
+		 #include <linux/sched.h>
 int
 main ()
 {
-int x = sizeof(&restore_fpu_checking)
+
+   #ifdef find_task_by_pid_type_ns
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&find_task_by_pid_type_ns);
+   #endif
+
   ;
   return 0;
 }
@@ -37984,7 +42766,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING=yes
+	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -37992,27 +42774,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING=no
+	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING
+  cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_28_RESTORE_FPU_CHECKING 1
+#define HAVE_FIND_TASK_BY_PID_TYPE_NS 1
 _ACEOF
 
-     HAVE_2_6_28_RESTORE_FPU_CHECKING=1
+     HAVE_FIND_TASK_BY_PID_TYPE_NS=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_28_RESTORE_FPU_CHECKING 0
+#define HAVE_FIND_TASK_BY_PID_TYPE_NS 0
 _ACEOF
 
-     HAVE_2_6_28_RESTORE_FPU_CHECKING=''
+     HAVE_FIND_TASK_BY_PID_TYPE_NS=''
   fi
 
 
@@ -38020,7 +42802,7 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-    if test "${HAVE_2_6_0_RESTORE_FPU_CHECKING}${HAVE_2_6_28_RESTORE_FPU_CHECKING}" != "1"; then
+if test -z "${HAVE_2_ARG_FIND_PID}${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -38086,23 +42868,20 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" >&2;}
    { (exit 1); exit 1; }; }
 
-    fi
-  fi
 fi
 
-if test $CR_ARCH = i386; then
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for pt_regs.xcs" >&5
-echo $ECHO_N "checking kernel for pt_regs.xcs... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for alloc_pid" >&5
+echo $ECHO_N "checking kernel for alloc_pid... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_PT_REGS_XCS+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_ALLOC_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -38126,12 +42905,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/ptrace.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-struct pt_regs x;
-          int tc_1 = x.xcs;
+
+   #ifdef alloc_pid
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&alloc_pid);
+   #endif
+
   ;
   return 0;
 }
@@ -38161,7 +42946,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_XCS=yes
+	 cr_cv_kconfig_HAVE_ALLOC_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -38169,27 +42954,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_XCS=no
+	 cr_cv_kconfig_HAVE_ALLOC_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XCS
+  cr_result=$cr_cv_kconfig_HAVE_ALLOC_PID
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_XCS 1
+#define HAVE_ALLOC_PID 1
 _ACEOF
 
-     HAVE_PT_REGS_XCS=1
+     HAVE_ALLOC_PID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_XCS 0
+#define HAVE_ALLOC_PID 0
 _ACEOF
 
-     HAVE_PT_REGS_XCS=''
+     HAVE_ALLOC_PID=''
   fi
 
 
@@ -38197,14 +42982,18 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test -n "${HAVE_ALLOC_PID}"; then
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for pt_regs.xfs" >&5
-echo $ECHO_N "checking kernel for pt_regs.xfs... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_PT_REGS_XFS+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for 0-arg alloc_pid" >&5
+echo $ECHO_N "checking kernel for 0-arg alloc_pid... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -38228,12 +43017,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/ptrace.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-struct pt_regs x;
-          int tc_1 = x.xfs;
+
+	#ifndef alloc_pid /* Must be macro or have a decl */
+	  int x = sizeof(&alloc_pid);
+	#endif
+	    alloc_pid();
   ;
   return 0;
 }
@@ -38263,7 +43055,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_XFS=yes
+	 cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -38271,27 +43063,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_XFS=no
+	 cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XFS
+  cr_result=$cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_XFS 1
+#define HAVE_0_ARG_ALLOC_PID 1
 _ACEOF
 
-     HAVE_PT_REGS_XFS=1
+     HAVE_0_ARG_ALLOC_PID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_XFS 0
+#define HAVE_0_ARG_ALLOC_PID 0
 _ACEOF
 
-     HAVE_PT_REGS_XFS=''
+     HAVE_0_ARG_ALLOC_PID=''
   fi
 
 
@@ -38303,10 +43095,14 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for pt_regs.xgs" >&5
-echo $ECHO_N "checking kernel for pt_regs.xgs... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_PT_REGS_XGS+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 1-arg alloc_pid" >&5
+echo $ECHO_N "checking kernel for 1-arg alloc_pid... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -38330,12 +43126,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/ptrace.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-struct pt_regs x;
-          int tc_1 = x.xgs;
+
+	#ifndef alloc_pid /* Must be macro or have a decl */
+	  int x = sizeof(&alloc_pid);
+	#endif
+	    alloc_pid(NULL);
   ;
   return 0;
 }
@@ -38365,7 +43164,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_XGS=yes
+	 cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -38373,27 +43172,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_XGS=no
+	 cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XGS
+  cr_result=$cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_XGS 1
+#define HAVE_1_ARG_ALLOC_PID 1
 _ACEOF
 
-     HAVE_PT_REGS_XGS=1
+     HAVE_1_ARG_ALLOC_PID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_XGS 0
+#define HAVE_1_ARG_ALLOC_PID 0
 _ACEOF
 
-     HAVE_PT_REGS_XGS=''
+     HAVE_1_ARG_ALLOC_PID=''
   fi
 
 
@@ -38403,15 +43202,92 @@
 
 
 
+  if test "${HAVE_0_ARG_ALLOC_PID}${HAVE_1_ARG_ALLOC_PID}" != "1"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" >&2;}
+   { (exit 1); exit 1; }; }
 
+  fi
 
-  echo "$as_me:$LINENO: checking kernel for pt_regs.cs" >&5
-echo $ECHO_N "checking kernel for pt_regs.cs... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_PT_REGS_CS+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for free_pid" >&5
+echo $ECHO_N "checking kernel symbol table for free_pid... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_free_pid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_free_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_pid$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_free_pid"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_free_pid\$" >/dev/null ; then
+        cr_cv_ksymtab_free_pid=0
+      fi
 
 
   SAVE_CC=$CC
@@ -38432,12 +43308,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/ptrace.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct pt_regs x;
-          int tc_1 = x.cs;
+int x = sizeof(&free_pid);
   ;
   return 0;
 }
@@ -38467,7 +43345,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_CS=yes
+	 cr_cv_ksymtab_free_pid="Y$cr_cv_ksymtab_free_pid"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -38475,45 +43353,55 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_CS=no
+	 cr_cv_ksymtab_free_pid="N$cr_cv_ksymtab_free_pid"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_CS
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_CS 1
-_ACEOF
-
-     HAVE_PT_REGS_CS=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_free_pid"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_CS 0
+    if expr "$cr_cv_ksymtab_free_pid" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol free_pid but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol free_pid but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_free_pid | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(free_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_free_pid $cr_addr
 _ACEOF
 
-     HAVE_PT_REGS_CS=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for pt_regs.fs" >&5
-echo $ECHO_N "checking kernel for pt_regs.fs... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_PT_REGS_FS+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for pid_hash" >&5
+echo $ECHO_N "checking kernel symbol table for pid_hash... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_pid_hash+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_pid_hash=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pid_hash$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_pid_hash"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pid_hash\$" >/dev/null ; then
+        cr_cv_ksymtab_pid_hash=0
+      fi
 
 
   SAVE_CC=$CC
@@ -38534,12 +43422,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/ptrace.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct pt_regs x;
-          int tc_1 = x.fs;
+int x = sizeof(&pid_hash);
   ;
   return 0;
 }
@@ -38569,7 +43459,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_FS=yes
+	 cr_cv_ksymtab_pid_hash="Y$cr_cv_ksymtab_pid_hash"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -38577,45 +43467,56 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_FS=no
+	 cr_cv_ksymtab_pid_hash="N$cr_cv_ksymtab_pid_hash"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_FS
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_pid_hash"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_pid_hash" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern struct hlist_head *pid_hash;
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_FS 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_pid_hash | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(pid_hash, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_PT_REGS_FS=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_FS 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_pid_hash $cr_addr
 _ACEOF
 
-     HAVE_PT_REGS_FS=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for pt_regs.gs" >&5
-echo $ECHO_N "checking kernel for pt_regs.gs... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_PT_REGS_GS+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for pidhash_shift" >&5
+echo $ECHO_N "checking kernel symbol table for pidhash_shift... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_pidhash_shift+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_pidhash_shift=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidhash_shift$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_pidhash_shift"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pidhash_shift\$" >/dev/null ; then
+        cr_cv_ksymtab_pidhash_shift=0
+      fi
 
 
   SAVE_CC=$CC
@@ -38636,12 +43537,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/ptrace.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct pt_regs x;
-          int tc_1 = x.gs;
+int x = sizeof(&pidhash_shift);
   ;
   return 0;
 }
@@ -38671,7 +43574,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_GS=yes
+	 cr_cv_ksymtab_pidhash_shift="Y$cr_cv_ksymtab_pidhash_shift"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -38679,44 +43582,50 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PT_REGS_GS=no
+	 cr_cv_ksymtab_pidhash_shift="N$cr_cv_ksymtab_pidhash_shift"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PT_REGS_GS
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_pidhash_shift"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_pidhash_shift" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern int pidhash_shift;
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_GS 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_pidhash_shift | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(pidhash_shift, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_PT_REGS_GS=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PT_REGS_GS 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_pidhash_shift $cr_addr
 _ACEOF
 
-     HAVE_PT_REGS_GS=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-
-fi
-
+  # Can't use true type because 'struct kmem_cache' is opaque by design
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for inode sem" >&5
-echo $ECHO_N "checking kernel for inode sem... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for pid_namespace.pid_cachep" >&5
+echo $ECHO_N "checking kernel for pid_namespace.pid_cachep... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_INODE_SEM+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -38741,14 +43650,14 @@
 		 #endif
 		 #include <linux/types.h>
 
-    #include <linux/sched.h>
-    #include <linux/fs.h>
+	#include <linux/slab.h>
+	#include <linux/pid_namespace.h>
 
 int
 main ()
 {
-struct inode x;
-          struct semaphore tc_1 = x.i_sem;
+struct pid_namespace x;
+          void * tc_1 = x.pid_cachep;
   ;
   return 0;
 }
@@ -38778,7 +43687,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_INODE_SEM=yes
+	 cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -38786,27 +43695,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_INODE_SEM=no
+	 cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_INODE_SEM
+  cr_result=$cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_INODE_SEM 1
+#define HAVE_PID_NAMESPACE_PID_CACHEP 1
 _ACEOF
 
-     HAVE_INODE_SEM=1
+     HAVE_PID_NAMESPACE_PID_CACHEP=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_INODE_SEM 0
+#define HAVE_PID_NAMESPACE_PID_CACHEP 0
 _ACEOF
 
-     HAVE_INODE_SEM=''
+     HAVE_PID_NAMESPACE_PID_CACHEP=''
   fi
 
 
@@ -38816,15 +43725,19 @@
 
 
 
-
-
-  echo "$as_me:$LINENO: checking kernel for inode mutex" >&5
-echo $ECHO_N "checking kernel for inode mutex... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_INODE_MUTEX+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for pid_cachep" >&5
+echo $ECHO_N "checking kernel symbol table for pid_cachep... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_pid_cachep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_pid_cachep=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pid_cachep$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_pid_cachep"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pid_cachep\$" >/dev/null ; then
+        cr_cv_ksymtab_pid_cachep=0
+      fi
 
 
   SAVE_CC=$CC
@@ -38846,15 +43759,13 @@
 		 #endif
 		 #include <linux/types.h>
 
-    #include <linux/sched.h>
-    #include <linux/fs.h>
-    #include <linux/mutex.h>
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
 
 int
 main ()
 {
-struct inode x;
-          struct mutex tc_1 = x.i_mutex;
+int x = sizeof(&pid_cachep);
   ;
   return 0;
 }
@@ -38884,7 +43795,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_INODE_MUTEX=yes
+	 cr_cv_ksymtab_pid_cachep="Y$cr_cv_ksymtab_pid_cachep"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -38892,36 +43803,48 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_INODE_MUTEX=no
+	 cr_cv_ksymtab_pid_cachep="N$cr_cv_ksymtab_pid_cachep"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_INODE_MUTEX
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_pid_cachep"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_pid_cachep" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_INODE_MUTEX 1
-_ACEOF
+    #if HAVE_KMEM_CACHE_T
+      extern kmem_cache_t *pid_cachep;
+    #else
+      extern struct kmem_cache *pid_cachep;
+    #endif
 
-     HAVE_INODE_MUTEX=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_INODE_MUTEX 0
-_ACEOF
+_EOF
 
-     HAVE_INODE_MUTEX=''
-  fi
+    fi
+    cr_result=`echo $cr_cv_ksymtab_pid_cachep | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(pid_cachep, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_pid_cachep $cr_addr
+_ACEOF
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-
-# Allow exactly one match
-if test "${HAVE_INODE_SEM}${HAVE_INODE_MUTEX}" != "1"; then
+  if test -z "${cr_addr}${HAVE_PID_NAMESPACE_PID_CACHEP}"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -38987,23 +43910,27 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" >&2;}
    { (exit 1); exit 1; }; }
 
-fi
-
-
-
-
+  fi
+  if test -n "${HAVE_LINUX_PSPACE_H}"; then
 
-  echo "$as_me:$LINENO: checking kernel for mm.dumpable" >&5
-echo $ECHO_N "checking kernel for mm.dumpable... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_MM_DUMPABLE+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for init_pspace" >&5
+echo $ECHO_N "checking kernel symbol table for init_pspace... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_init_pspace+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_init_pspace=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}init_pspace$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_init_pspace"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_init_pspace\$" >/dev/null ; then
+        cr_cv_ksymtab_init_pspace=0
+      fi
 
 
   SAVE_CC=$CC
@@ -39024,12 +43951,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct mm_struct x;
-          int tc_1 = x.dumpable;
+int x = sizeof(&init_pspace);
   ;
   return 0;
 }
@@ -39059,7 +43988,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_DUMPABLE=yes
+	 cr_cv_ksymtab_init_pspace="Y$cr_cv_ksymtab_init_pspace"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -39067,48 +43996,55 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_MM_DUMPABLE=no
+	 cr_cv_ksymtab_init_pspace="N$cr_cv_ksymtab_init_pspace"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_MM_DUMPABLE
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_DUMPABLE 1
-_ACEOF
-
-     HAVE_MM_DUMPABLE=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_init_pspace"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_MM_DUMPABLE 0
+    if expr "$cr_cv_ksymtab_init_pspace" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol init_pspace but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol init_pspace but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_init_pspace | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(init_pspace, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_init_pspace $cr_addr
 _ACEOF
 
-     HAVE_MM_DUMPABLE=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+  elif test -n "${HAVE_LINUX_PID_NAMESPACE_H}"; then
 
 
-
-  echo "$as_me:$LINENO: checking kernel symbol table for get_dumpable" >&5
-echo $ECHO_N "checking kernel symbol table for get_dumpable... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for init_pid_ns" >&5
+echo $ECHO_N "checking kernel symbol table for init_pid_ns... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_get_dumpable+set}" = set; then
+    if test "${cr_cv_ksymtab_init_pid_ns+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_get_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}get_dumpable$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_get_dumpable"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_get_dumpable\$" >/dev/null ; then
-        cr_cv_ksymtab_get_dumpable=0
+    cr_cv_ksymtab_init_pid_ns=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}init_pid_ns$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_init_pid_ns"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_init_pid_ns\$" >/dev/null ; then
+        cr_cv_ksymtab_init_pid_ns=0
       fi
 
 
@@ -39137,7 +44073,7 @@
 int
 main ()
 {
-int x = sizeof(&get_dumpable);
+int x = sizeof(&init_pid_ns);
   ;
   return 0;
 }
@@ -39167,7 +44103,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_get_dumpable="Y$cr_cv_ksymtab_get_dumpable"
+	 cr_cv_ksymtab_init_pid_ns="Y$cr_cv_ksymtab_init_pid_ns"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -39175,7 +44111,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_get_dumpable="N$cr_cv_ksymtab_get_dumpable"
+	 cr_cv_ksymtab_init_pid_ns="N$cr_cv_ksymtab_init_pid_ns"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -39184,113 +44120,145 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_get_dumpable"; then
+  if test -z "$cr_cv_ksymtab_init_pid_ns"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_get_dumpable" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int get_dumpable(struct mm_struct *mm);
-_EOF
-
+    if expr "$cr_cv_ksymtab_init_pid_ns" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol init_pid_ns but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol init_pid_ns but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
     fi
-    cr_result=`echo $cr_cv_ksymtab_get_dumpable | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_init_pid_ns | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(get_dumpable, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KDATA(init_pid_ns, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_get_dumpable $cr_addr
+#define CR_KDATA_init_pid_ns $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-# Allow one or more match(es)
-if test -z "${HAVE_MM_DUMPABLE}${cr_addr}"; then
+  fi
+fi
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 2.6.0 attach_pid" >&5
+echo $ECHO_N "checking kernel for 2.6.0 attach_pid... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
 
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/sched.h>
+	 #include <linux/pid.h>
+   extern int FASTCALL(attach_pid(struct task_struct *task, enum pid_type type, int nr));
+int
+main ()
 {
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+int x = sizeof(&attach_pid)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_0_ATTACH_PID 1
+_ACEOF
+
+     HAVE_2_6_0_ATTACH_PID=1
   else
-    echo "not updating unwritable cache $cache_file"
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_0_ATTACH_PID 0
+_ACEOF
+
+     HAVE_2_6_0_ATTACH_PID=''
   fi
-fi
-rm -f confcache
 
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" >&2;}
-   { (exit 1); exit 1; }; }
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
-fi
 
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for task.rlim" >&5
-echo $ECHO_N "checking kernel for task.rlim... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for 2.6.22 attach_pid" >&5
+echo $ECHO_N "checking kernel for 2.6.22 attach_pid... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_TASK_RLIM+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -39315,11 +44283,12 @@
 		 #endif
 		 #include <linux/types.h>
 		 #include <linux/sched.h>
+	 #include <linux/pid.h>
+   extern int FASTCALL(attach_pid(struct task_struct *task, enum pid_type type, struct pid *pid));
 int
 main ()
 {
-struct task_struct x;
-          struct rlimit tc_1 = x.rlim[0];
+int x = sizeof(&attach_pid)
   ;
   return 0;
 }
@@ -39349,7 +44318,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_RLIM=yes
+	 cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -39357,27 +44326,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_RLIM=no
+	 cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_TASK_RLIM
+  cr_result=$cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_RLIM 1
+#define HAVE_2_6_22_ATTACH_PID 1
 _ACEOF
 
-     HAVE_TASK_RLIM=1
+     HAVE_2_6_22_ATTACH_PID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_RLIM 0
+#define HAVE_2_6_22_ATTACH_PID 0
 _ACEOF
 
-     HAVE_TASK_RLIM=''
+     HAVE_2_6_22_ATTACH_PID=''
   fi
 
 
@@ -39389,10 +44358,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for signal.rlim" >&5
-echo $ECHO_N "checking kernel for signal.rlim... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for 2.6.26 attach_pid" >&5
+echo $ECHO_N "checking kernel for 2.6.26 attach_pid... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_SIGNAL_RLIM+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -39417,11 +44386,12 @@
 		 #endif
 		 #include <linux/types.h>
 		 #include <linux/sched.h>
+	 #include <linux/pid.h>
+   extern void attach_pid(struct task_struct *task, enum pid_type type, struct pid *pid);
 int
 main ()
 {
-struct task_struct x;
-          struct rlimit tc_1 = x.signal->rlim[0];
+int x = sizeof(&attach_pid)
   ;
   return 0;
 }
@@ -39451,7 +44421,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SIGNAL_RLIM=yes
+	 cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -39459,27 +44429,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SIGNAL_RLIM=no
+	 cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_SIGNAL_RLIM
+  cr_result=$cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SIGNAL_RLIM 1
+#define HAVE_2_6_26_ATTACH_PID 1
 _ACEOF
 
-     HAVE_SIGNAL_RLIM=1
+     HAVE_2_6_26_ATTACH_PID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SIGNAL_RLIM 0
+#define HAVE_2_6_26_ATTACH_PID 0
 _ACEOF
 
-     HAVE_SIGNAL_RLIM=''
+     HAVE_2_6_26_ATTACH_PID=''
   fi
 
 
@@ -39487,8 +44457,9 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-# Allow exactly one match
-if test "${HAVE_TASK_RLIM}${HAVE_SIGNAL_RLIM}" != "1"; then
+
+# Require exactly one match
+if test "${HAVE_2_6_0_ATTACH_PID}${HAVE_2_6_22_ATTACH_PID}${HAVE_2_6_26_ATTACH_PID}" != "1"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -39554,8 +44525,8 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -39564,10 +44535,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for task.cred" >&5
-echo $ECHO_N "checking kernel for task.cred... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for change_pid" >&5
+echo $ECHO_N "checking kernel for change_pid... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_TASK_CRED+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_CHANGE_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -39591,12 +44562,20 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+	#include <linux/sched.h>
+	#include <linux/pid.h>
 int
 main ()
 {
-struct task_struct x;
-          const struct cred  tc_1 = *(x.cred);
+
+   #ifdef change_pid
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&change_pid);
+   #endif
+
   ;
   return 0;
 }
@@ -39626,7 +44605,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_CRED=yes
+	 cr_cv_kconfig_HAVE_CHANGE_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -39634,27 +44613,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_CRED=no
+	 cr_cv_kconfig_HAVE_CHANGE_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_TASK_CRED
+  cr_result=$cr_cv_kconfig_HAVE_CHANGE_PID
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_CRED 1
+#define HAVE_CHANGE_PID 1
 _ACEOF
 
-     HAVE_TASK_CRED=1
+     HAVE_CHANGE_PID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_CRED 0
+#define HAVE_CHANGE_PID 0
 _ACEOF
 
-     HAVE_TASK_CRED=''
+     HAVE_CHANGE_PID=''
   fi
 
 
@@ -39662,15 +44641,16 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+# OK if missing
 
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for task.group_info" >&5
-echo $ECHO_N "checking kernel for task.group_info... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for struct pidmap" >&5
+echo $ECHO_N "checking kernel for struct pidmap... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_TASK_GROUP_INFO+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_STRUCT_PIDMAP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -39694,12 +44674,21 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+  #if HAVE_LINUX_PSPACE_H
+    #include <linux/pspace.h>
+  #endif
+  #if HAVE_LINUX_PID_NAMESPACE_H
+    #include <linux/pid_namespace.h>
+  #endif
+
 int
 main ()
 {
-struct task_struct x;
-          struct group_info  tc_1 = *(x.group_info);
+
+     struct pidmap y;
+     int x = sizeof(y);
+
   ;
   return 0;
 }
@@ -39729,7 +44718,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_GROUP_INFO=yes
+	 cr_cv_kconfig_HAVE_STRUCT_PIDMAP=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -39737,27 +44726,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_GROUP_INFO=no
+	 cr_cv_kconfig_HAVE_STRUCT_PIDMAP=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_TASK_GROUP_INFO
+  cr_result=$cr_cv_kconfig_HAVE_STRUCT_PIDMAP
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_GROUP_INFO 1
+#define HAVE_STRUCT_PIDMAP 1
 _ACEOF
 
-     HAVE_TASK_GROUP_INFO=1
+     HAVE_STRUCT_PIDMAP=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_GROUP_INFO 0
+#define HAVE_STRUCT_PIDMAP 0
 _ACEOF
 
-     HAVE_TASK_GROUP_INFO=''
+     HAVE_STRUCT_PIDMAP=''
   fi
 
 
@@ -39767,15 +44756,19 @@
 
 
 
-
-
-  echo "$as_me:$LINENO: checking kernel for suid_dumpable" >&5
-echo $ECHO_N "checking kernel for suid_dumpable... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_SUID_DUMPABLE+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for pidmap_array" >&5
+echo $ECHO_N "checking kernel symbol table for pidmap_array... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_pidmap_array+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_pidmap_array=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidmap_array$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_pidmap_array"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pidmap_array\$" >/dev/null ; then
+        cr_cv_ksymtab_pidmap_array=0
+      fi
 
 
   SAVE_CC=$CC
@@ -39796,13 +44789,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/binfmts.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-     int x = sizeof(&suid_dumpable);
-
+int x = sizeof(&pidmap_array);
   ;
   return 0;
 }
@@ -39832,7 +44826,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SUID_DUMPABLE=yes
+	 cr_cv_ksymtab_pidmap_array="Y$cr_cv_ksymtab_pidmap_array"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -39840,49 +44834,64 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SUID_DUMPABLE=no
+	 cr_cv_ksymtab_pidmap_array="N$cr_cv_ksymtab_pidmap_array"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_SUID_DUMPABLE
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_pidmap_array"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_pidmap_array" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_SUID_DUMPABLE 1
-_ACEOF
+  #if !HAVE_STRUCT_PIDMAP
+    struct pidmap {
+        atomic_t nr_free;
+        void *page;
+    };
+  #endif
+  extern struct pidmap pidmap_array[];
 
-     HAVE_SUID_DUMPABLE=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_SUID_DUMPABLE 0
-_ACEOF
+_EOF
 
-     HAVE_SUID_DUMPABLE=''
-  fi
+    fi
+    cr_result=`echo $cr_cv_ksymtab_pidmap_array | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(pidmap_array, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_pidmap_array $cr_addr
+_ACEOF
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-
-if test -n "${HAVE_SUID_DUMPABLE}"; then
+if test x"$cr_kernel_smp" = xyes; then
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for suid_dumpable" >&5
-echo $ECHO_N "checking kernel symbol table for suid_dumpable... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for pidmap_lock" >&5
+echo $ECHO_N "checking kernel symbol table for pidmap_lock... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_suid_dumpable+set}" = set; then
+    if test "${cr_cv_ksymtab_pidmap_lock+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_suid_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}suid_dumpable$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_suid_dumpable"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_suid_dumpable\$" >/dev/null ; then
-        cr_cv_ksymtab_suid_dumpable=0
+    cr_cv_ksymtab_pidmap_lock=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidmap_lock$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_pidmap_lock"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pidmap_lock\$" >/dev/null ; then
+        cr_cv_ksymtab_pidmap_lock=0
       fi
 
 
@@ -39911,7 +44920,7 @@
 int
 main ()
 {
-int x = sizeof(&suid_dumpable);
+int x = sizeof(&pidmap_lock);
   ;
   return 0;
 }
@@ -39941,7 +44950,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_suid_dumpable="Y$cr_cv_ksymtab_suid_dumpable"
+	 cr_cv_ksymtab_pidmap_lock="Y$cr_cv_ksymtab_pidmap_lock"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -39949,7 +44958,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_suid_dumpable="N$cr_cv_ksymtab_suid_dumpable"
+	 cr_cv_ksymtab_pidmap_lock="N$cr_cv_ksymtab_pidmap_lock"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -39958,40 +44967,47 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_suid_dumpable"; then
+  if test -z "$cr_cv_ksymtab_pidmap_lock"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_suid_dumpable" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol suid_dumpable but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol suid_dumpable but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_pidmap_lock" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern spinlock_t pidmap_lock;
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab_suid_dumpable | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_pidmap_lock | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(suid_dumpable, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KDATA(pidmap_lock, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_suid_dumpable $cr_addr
+#define CR_KDATA_pidmap_lock $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+  if test -z "$cr_addr"; then
+    { { echo "$as_me:$LINENO: error: failed to find symbol pidmap_lock" >&5
+echo "$as_me: error: failed to find symbol pidmap_lock" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 fi
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for set_dumpable" >&5
-echo $ECHO_N "checking kernel for set_dumpable... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_SET_DUMPABLE+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for kill_pid" >&5
+echo $ECHO_N "checking kernel for kill_pid... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_KILL_PID+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -40020,11 +45036,11 @@
 main ()
 {
 
-   #ifdef set_dumpable
+   #ifdef kill_pid
      /* OK, it exists and is a macro */
    #else
      /* Check for function case */
-     int x = sizeof(&set_dumpable);
+     int x = sizeof(&kill_pid);
    #endif
 
   ;
@@ -40056,7 +45072,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SET_DUMPABLE=yes
+	 cr_cv_kconfig_HAVE_KILL_PID=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -40064,27 +45080,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SET_DUMPABLE=no
+	 cr_cv_kconfig_HAVE_KILL_PID=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_SET_DUMPABLE
+  cr_result=$cr_cv_kconfig_HAVE_KILL_PID
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SET_DUMPABLE 1
+#define HAVE_KILL_PID 1
 _ACEOF
 
-     HAVE_SET_DUMPABLE=1
+     HAVE_KILL_PID=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SET_DUMPABLE 0
+#define HAVE_KILL_PID 0
 _ACEOF
 
-     HAVE_SET_DUMPABLE=''
+     HAVE_KILL_PID=''
   fi
 
 
@@ -40092,22 +45108,17 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test -n "${HAVE_SET_DUMPABLE}"; then
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for set_dumpable" >&5
-echo $ECHO_N "checking kernel symbol table for set_dumpable... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_set_dumpable+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for kill_proc" >&5
+echo $ECHO_N "checking kernel for kill_proc... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_KILL_PROC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_set_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}set_dumpable$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_set_dumpable"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_set_dumpable\$" >/dev/null ; then
-        cr_cv_ksymtab_set_dumpable=0
-      fi
 
 
   SAVE_CC=$CC
@@ -40128,14 +45139,199 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
+		 #include <linux/sched.h>
+int
+main ()
+{
+
+   #ifdef kill_proc
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&kill_proc);
+   #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_KILL_PROC=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_kconfig_HAVE_KILL_PROC=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_KILL_PROC
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_KILL_PROC 1
+_ACEOF
+
+     HAVE_KILL_PROC=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_KILL_PROC 0
+_ACEOF
+
+     HAVE_KILL_PROC=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+# Require at least one
+if test -z "${HAVE_KILL_PID}${HAVE_KILL_PROC}"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for child_reaper" >&5
+echo $ECHO_N "checking kernel for child_reaper... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_CHILD_REAPER+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
 
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/pid_namespace.h>
 int
 main ()
 {
-int x = sizeof(&set_dumpable);
+
+   #ifdef child_reaper
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&child_reaper);
+   #endif
+
   ;
   return 0;
 }
@@ -40165,7 +45361,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_set_dumpable="Y$cr_cv_ksymtab_set_dumpable"
+	 cr_cv_kconfig_HAVE_CHILD_REAPER=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -40173,56 +45369,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_set_dumpable="N$cr_cv_ksymtab_set_dumpable"
+	 cr_cv_kconfig_HAVE_CHILD_REAPER=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_set_dumpable"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_set_dumpable" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol set_dumpable but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol set_dumpable but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_set_dumpable | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(set_dumpable, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_CHILD_REAPER
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_set_dumpable $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_CHILD_REAPER 1
+_ACEOF
+
+     HAVE_CHILD_REAPER=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_CHILD_REAPER 0
 _ACEOF
 
+     HAVE_CHILD_REAPER=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-fi
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for groups_search" >&5
-echo $ECHO_N "checking kernel symbol table for groups_search... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_groups_search+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for task_child_reaper" >&5
+echo $ECHO_N "checking kernel for task_child_reaper... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_TASK_CHILD_REAPER+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_groups_search=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}groups_search$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_groups_search"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_groups_search\$" >/dev/null ; then
-        cr_cv_ksymtab_groups_search=0
-      fi
 
 
   SAVE_CC=$CC
@@ -40243,14 +45428,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/pid_namespace.h>
 int
 main ()
 {
-int x = sizeof(&groups_search);
+
+   #ifdef task_child_reaper
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&task_child_reaper);
+   #endif
+
   ;
   return 0;
 }
@@ -40280,7 +45469,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_groups_search="Y$cr_cv_ksymtab_groups_search"
+	 cr_cv_kconfig_HAVE_TASK_CHILD_REAPER=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -40288,55 +45477,49 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_groups_search="N$cr_cv_ksymtab_groups_search"
+	 cr_cv_kconfig_HAVE_TASK_CHILD_REAPER=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_groups_search"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_groups_search" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int groups_search(struct group_info *, gid_t);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_TASK_CHILD_REAPER
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_groups_search | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(groups_search, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_CHILD_REAPER 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_groups_search $cr_addr
+     HAVE_TASK_CHILD_REAPER=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_TASK_CHILD_REAPER 0
 _ACEOF
 
+     HAVE_TASK_CHILD_REAPER=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test -z "${HAVE_CHILD_REAPER}${HAVE_TASK_CHILD_REAPER}"; then
 
-  echo "$as_me:$LINENO: checking kernel symbol table for supplemental_group_member" >&5
-echo $ECHO_N "checking kernel symbol table for supplemental_group_member... $ECHO_C" >&6
+
+  echo "$as_me:$LINENO: checking kernel symbol table for child_reaper" >&5
+echo $ECHO_N "checking kernel symbol table for child_reaper... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_supplemental_group_member+set}" = set; then
+    if test "${cr_cv_ksymtab_child_reaper+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_supplemental_group_member=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}supplemental_group_member$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_supplemental_group_member"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_supplemental_group_member\$" >/dev/null ; then
-        cr_cv_ksymtab_supplemental_group_member=0
+    cr_cv_ksymtab_child_reaper=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}child_reaper$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_child_reaper"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_child_reaper\$" >/dev/null ; then
+        cr_cv_ksymtab_child_reaper=0
       fi
 
 
@@ -40365,7 +45548,7 @@
 int
 main ()
 {
-int x = sizeof(&supplemental_group_member);
+int x = sizeof(&child_reaper);
   ;
   return 0;
 }
@@ -40395,7 +45578,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_supplemental_group_member="Y$cr_cv_ksymtab_supplemental_group_member"
+	 cr_cv_ksymtab_child_reaper="Y$cr_cv_ksymtab_child_reaper"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -40403,7 +45586,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_supplemental_group_member="N$cr_cv_ksymtab_supplemental_group_member"
+	 cr_cv_ksymtab_child_reaper="N$cr_cv_ksymtab_child_reaper"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -40412,41 +45595,42 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_supplemental_group_member"; then
+  if test -z "$cr_cv_ksymtab_child_reaper"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_supplemental_group_member" : N >/dev/null; then
+    if expr "$cr_cv_ksymtab_child_reaper" : N >/dev/null; then
       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int supplemental_group_member(gid_t);
+extern struct task_struct *child_reaper;
 _EOF
 
     fi
-    cr_result=`echo $cr_cv_ksymtab_supplemental_group_member | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_child_reaper | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(supplemental_group_member, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KDATA(child_reaper, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_supplemental_group_member $cr_addr
+#define CR_KDATA_child_reaper $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+fi
 
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for PIDTYPE_TGID" >&5
-echo $ECHO_N "checking kernel for PIDTYPE_TGID... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for task.parent" >&5
+echo $ECHO_N "checking kernel for task.parent... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_PIDTYPE_TGID+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_TASK_PARENT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -40474,10 +45658,8 @@
 int
 main ()
 {
-
-     typeof(PIDTYPE_TGID) y;
-     int x = sizeof(y);
-
+struct task_struct x;
+          struct task_struct  tc_1 = *(x.parent);
   ;
   return 0;
 }
@@ -40507,7 +45689,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PIDTYPE_TGID=yes
+	 cr_cv_kconfig_HAVE_TASK_PARENT=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -40515,27 +45697,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PIDTYPE_TGID=no
+	 cr_cv_kconfig_HAVE_TASK_PARENT=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PIDTYPE_TGID
+  cr_result=$cr_cv_kconfig_HAVE_TASK_PARENT
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PIDTYPE_TGID 1
+#define HAVE_TASK_PARENT 1
 _ACEOF
 
-     HAVE_PIDTYPE_TGID=1
+     HAVE_TASK_PARENT=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PIDTYPE_TGID 0
+#define HAVE_TASK_PARENT 0
 _ACEOF
 
-     HAVE_PIDTYPE_TGID=''
+     HAVE_TASK_PARENT=''
   fi
 
 
@@ -40547,10 +45729,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for task.thread_group" >&5
-echo $ECHO_N "checking kernel for task.thread_group... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for task.real_parent" >&5
+echo $ECHO_N "checking kernel for task.real_parent... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_TASK_THREAD_GROUP+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_TASK_REAL_PARENT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -40579,7 +45761,7 @@
 main ()
 {
 struct task_struct x;
-          struct list_head tc_1 = x.thread_group;
+          struct task_struct  tc_1 = *(x.real_parent);
   ;
   return 0;
 }
@@ -40609,7 +45791,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_THREAD_GROUP=yes
+	 cr_cv_kconfig_HAVE_TASK_REAL_PARENT=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -40617,27 +45799,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_THREAD_GROUP=no
+	 cr_cv_kconfig_HAVE_TASK_REAL_PARENT=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_TASK_THREAD_GROUP
+  cr_result=$cr_cv_kconfig_HAVE_TASK_REAL_PARENT
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_THREAD_GROUP 1
+#define HAVE_TASK_REAL_PARENT 1
 _ACEOF
 
-     HAVE_TASK_THREAD_GROUP=1
+     HAVE_TASK_REAL_PARENT=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_THREAD_GROUP 0
+#define HAVE_TASK_REAL_PARENT 0
 _ACEOF
 
-     HAVE_TASK_THREAD_GROUP=''
+     HAVE_TASK_REAL_PARENT=''
   fi
 
 
@@ -40645,93 +45827,16 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test "${HAVE_PIDTYPE_TGID}${HAVE_TASK_THREAD_GROUP}" != "1"; then
-
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine thread group list" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine thread group list" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
-
 
-  echo "$as_me:$LINENO: checking kernel symbol table for detach_pid" >&5
-echo $ECHO_N "checking kernel symbol table for detach_pid... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_detach_pid+set}" = set; then
+# Look for non-deprecated "typedef struct SOMETHING kmem_cache_t".
+# This is slightly complicated by the fact that this is an opaque type (with
+# the struct itself forward-declared but not defined in the public headers).
+echo "$as_me:$LINENO: checking kernel for kmem_cache_t" >&5
+echo $ECHO_N "checking kernel for kmem_cache_t... $ECHO_C" >&6
+if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_T+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_detach_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}detach_pid$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_detach_pid"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_detach_pid\$" >/dev/null ; then
-        cr_cv_ksymtab_detach_pid=0
-      fi
 
 
   SAVE_CC=$CC
@@ -40752,14 +45857,11 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/slab.h>
 int
 main ()
 {
-int x = sizeof(&detach_pid);
+kmem_cache_t *x = NULL;
   ;
   return 0;
 }
@@ -40789,7 +45891,43 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_detach_pid="Y$cr_cv_ksymtab_detach_pid"
+
+
+
+
+  SAVE_CPP=$CPP
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CPP="$KCC -E"
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+		 #include <linux/slab.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "typedef.+[[:space:]]kmem_cache_t[[:space:]].+deprecated" >/dev/null 2>&1; then
+  CPP=$SAVE_CPP
+	CPPFLAGS=$SAVE_CPPFLAGS
+	cr_cv_kconfig_HAVE_KMEM_CACHE_T=no
+else
+  CPP=$SAVE_CPP
+	CPPFLAGS=$SAVE_CPPFLAGS
+	cr_cv_kconfig_HAVE_KMEM_CACHE_T=yes
+fi
+rm -f conftest*
+
+
+ # Want *not* found
+
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -40797,55 +45935,42 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_detach_pid="N$cr_cv_ksymtab_detach_pid"
+	 cr_cv_kconfig_HAVE_KMEM_CACHE_T=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
+echo "$as_me:$LINENO: result: $cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&5
+echo "${ECHO_T}$cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&6
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_detach_pid"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_detach_pid" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol detach_pid but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol detach_pid but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_detach_pid | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(detach_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test x$cr_cv_kconfig_HAVE_KMEM_CACHE_T = xyes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_KMEM_CACHE_T 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_detach_pid $cr_addr
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_KMEM_CACHE_T 0
 _ACEOF
 
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for attach_pid" >&5
-echo $ECHO_N "checking kernel symbol table for attach_pid... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_attach_pid+set}" = set; then
+
+# type of (struct fs_struct).lock
+
+
+
+
+  echo "$as_me:$LINENO: checking kernel for fs_struct rwlock" >&5
+echo $ECHO_N "checking kernel for fs_struct rwlock... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_FS_STRUCT_RWLOCK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_attach_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}attach_pid$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_attach_pid"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_attach_pid\$" >/dev/null ; then
-        cr_cv_ksymtab_attach_pid=0
-      fi
 
 
   SAVE_CC=$CC
@@ -40867,13 +45992,14 @@
 		 #endif
 		 #include <linux/types.h>
 
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+    #include <linux/sched.h>
+    #include <linux/fs_struct.h>
 
 int
 main ()
 {
-int x = sizeof(&attach_pid);
+struct fs_struct x;
+          rwlock_t tc_1 = x.lock;
   ;
   return 0;
 }
@@ -40903,7 +46029,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_attach_pid="Y$cr_cv_ksymtab_attach_pid"
+	 cr_cv_kconfig_HAVE_FS_STRUCT_RWLOCK=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -40911,55 +46037,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_attach_pid="N$cr_cv_ksymtab_attach_pid"
+	 cr_cv_kconfig_HAVE_FS_STRUCT_RWLOCK=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_attach_pid"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_attach_pid" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol attach_pid but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol attach_pid but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_attach_pid | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(attach_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_FS_STRUCT_RWLOCK
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_attach_pid $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FS_STRUCT_RWLOCK 1
+_ACEOF
+
+     HAVE_FS_STRUCT_RWLOCK=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FS_STRUCT_RWLOCK 0
 _ACEOF
 
+     HAVE_FS_STRUCT_RWLOCK=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for change_pid" >&5
-echo $ECHO_N "checking kernel symbol table for change_pid... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_change_pid+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for fs_struct spinlock" >&5
+echo $ECHO_N "checking kernel for fs_struct spinlock... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_FS_STRUCT_SPINLOCK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_change_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}change_pid$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_change_pid"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_change_pid\$" >/dev/null ; then
-        cr_cv_ksymtab_change_pid=0
-      fi
 
 
   SAVE_CC=$CC
@@ -40981,13 +46097,14 @@
 		 #endif
 		 #include <linux/types.h>
 
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+    #include <linux/sched.h>
+    #include <linux/fs_struct.h>
 
 int
 main ()
 {
-int x = sizeof(&change_pid);
+struct fs_struct x;
+          spinlock_t tc_1 = x.lock;
   ;
   return 0;
 }
@@ -41017,7 +46134,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_change_pid="Y$cr_cv_ksymtab_change_pid"
+	 cr_cv_kconfig_HAVE_FS_STRUCT_SPINLOCK=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -41025,55 +46142,118 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_change_pid="N$cr_cv_ksymtab_change_pid"
+	 cr_cv_kconfig_HAVE_FS_STRUCT_SPINLOCK=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+
+  cr_result=$cr_cv_kconfig_HAVE_FS_STRUCT_SPINLOCK
+
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FS_STRUCT_SPINLOCK 1
+_ACEOF
+
+     HAVE_FS_STRUCT_SPINLOCK=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_FS_STRUCT_SPINLOCK 0
+_ACEOF
+
+     HAVE_FS_STRUCT_SPINLOCK=''
+  fi
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+
+if test "$HAVE_FS_STRUCT_RWLOCK$HAVE_FS_STRUCT_SPINLOCK" = "11" \
+     -o "$HAVE_FS_STRUCT_RWLOCK$HAVE_FS_STRUCT_SPINLOCK" = "00" ; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f confcache
 
-    fi
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized type for fs_struct.lock" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized type for fs_struct.lock" >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_change_pid"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_change_pid" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol change_pid but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol change_pid but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_change_pid | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(change_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_change_pid $cr_addr
-_ACEOF
 
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
 
 
+  echo "$as_me:$LINENO: checking kernel for gfp_t" >&5
+echo $ECHO_N "checking kernel for gfp_t... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel symbol table for find_pid" >&5
-echo $ECHO_N "checking kernel symbol table for find_pid... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_find_pid+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_GFP_T+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_find_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}find_pid$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_find_pid"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_find_pid\$" >/dev/null ; then
-        cr_cv_ksymtab_find_pid=0
-      fi
 
 
   SAVE_CC=$CC
@@ -41094,14 +46274,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/slab.h>
 int
 main ()
 {
-int x = sizeof(&find_pid);
+
+     gfp_t y;
+     int x = sizeof(y);
+
   ;
   return 0;
 }
@@ -41131,7 +46311,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_find_pid="Y$cr_cv_ksymtab_find_pid"
+	 cr_cv_kconfig_HAVE_GFP_T=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -41139,55 +46319,46 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_find_pid="N$cr_cv_ksymtab_find_pid"
+	 cr_cv_kconfig_HAVE_GFP_T=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_find_pid"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_find_pid" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol find_pid but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol find_pid but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_find_pid | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(find_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_GFP_T
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_find_pid $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_GFP_T 1
 _ACEOF
 
+     HAVE_GFP_T=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_GFP_T 0
+_ACEOF
+
+     HAVE_GFP_T=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
+# OK if missing
 
-  echo "$as_me:$LINENO: checking kernel symbol table for link_pid" >&5
-echo $ECHO_N "checking kernel symbol table for link_pid... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_link_pid+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for kzalloc" >&5
+echo $ECHO_N "checking kernel for kzalloc... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_KZALLOC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_link_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}link_pid$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_link_pid"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_link_pid\$" >/dev/null ; then
-        cr_cv_ksymtab_link_pid=0
-      fi
 
 
   SAVE_CC=$CC
@@ -41208,14 +46379,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/slab.h>
 int
 main ()
 {
-int x = sizeof(&link_pid);
+
+   #ifdef kzalloc
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&kzalloc);
+   #endif
+
   ;
   return 0;
 }
@@ -41245,7 +46420,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_link_pid="Y$cr_cv_ksymtab_link_pid"
+	 cr_cv_kconfig_HAVE_KZALLOC=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -41253,52 +46428,43 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_link_pid="N$cr_cv_ksymtab_link_pid"
+	 cr_cv_kconfig_HAVE_KZALLOC=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_link_pid"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_link_pid" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol link_pid but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol link_pid but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_link_pid | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(link_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_KZALLOC
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_link_pid $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_KZALLOC 1
 _ACEOF
 
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
+     HAVE_KZALLOC=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_KZALLOC 0
+_ACEOF
 
+     HAVE_KZALLOC=''
+  fi
 
 
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
+# OK if missing
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for 1-arg find_pid" >&5
-echo $ECHO_N "checking kernel for 1-arg find_pid... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for kmem_cache_zalloc" >&5
+echo $ECHO_N "checking kernel for kmem_cache_zalloc... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_1_ARG_FIND_PID+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -41322,15 +46488,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+		 #include <linux/slab.h>
 int
 main ()
 {
 
-	#ifndef find_pid /* Must be macro or have a decl */
-	  int x = sizeof(&find_pid);
-	#endif
-	    find_pid(0);
+   #ifdef kmem_cache_zalloc
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&kmem_cache_zalloc);
+   #endif
+
   ;
   return 0;
 }
@@ -41360,7 +46529,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_1_ARG_FIND_PID=yes
+	 cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -41368,27 +46537,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_1_ARG_FIND_PID=no
+	 cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_1_ARG_FIND_PID
+  cr_result=$cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_1_ARG_FIND_PID 1
+#define HAVE_KMEM_CACHE_ZALLOC 1
 _ACEOF
 
-     HAVE_1_ARG_FIND_PID=1
+     HAVE_KMEM_CACHE_ZALLOC=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_1_ARG_FIND_PID 0
+#define HAVE_KMEM_CACHE_ZALLOC 0
 _ACEOF
 
-     HAVE_1_ARG_FIND_PID=''
+     HAVE_KMEM_CACHE_ZALLOC=''
   fi
 
 
@@ -41396,18 +46565,15 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+# OK if missing
 
 
 
 
+  echo "$as_me:$LINENO: checking kernel for kmemdup" >&5
+echo $ECHO_N "checking kernel for kmemdup... $ECHO_C" >&6
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 2-arg find_pid" >&5
-echo $ECHO_N "checking kernel for 2-arg find_pid... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_2_ARG_FIND_PID+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_KMEMDUP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -41431,15 +46597,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+		 #include <linux/string.h>
 int
 main ()
 {
 
-	#ifndef find_pid /* Must be macro or have a decl */
-	  int x = sizeof(&find_pid);
-	#endif
-	    find_pid(0,0);
+   #ifdef kmemdup
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&kmemdup);
+   #endif
+
   ;
   return 0;
 }
@@ -41469,7 +46638,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_ARG_FIND_PID=yes
+	 cr_cv_kconfig_HAVE_KMEMDUP=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -41477,27 +46646,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_ARG_FIND_PID=no
+	 cr_cv_kconfig_HAVE_KMEMDUP=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_ARG_FIND_PID
+  cr_result=$cr_cv_kconfig_HAVE_KMEMDUP
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_ARG_FIND_PID 1
+#define HAVE_KMEMDUP 1
 _ACEOF
 
-     HAVE_2_ARG_FIND_PID=1
+     HAVE_KMEMDUP=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_ARG_FIND_PID 0
+#define HAVE_KMEMDUP 0
 _ACEOF
 
-     HAVE_2_ARG_FIND_PID=''
+     HAVE_KMEMDUP=''
   fi
 
 
@@ -41505,16 +46674,16 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+# OK if missing
 
 
 
 
 
+  echo "$as_me:$LINENO: checking kernel for pipe_inode_info.base" >&5
+echo $ECHO_N "checking kernel for pipe_inode_info.base... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel for find_pid_ns" >&5
-echo $ECHO_N "checking kernel for find_pid_ns... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_FIND_PID_NS+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -41538,18 +46707,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+    #include <linux/sched.h>
+    #include <linux/pipe_fs_i.h>
+
 int
 main ()
 {
-
-   #ifdef find_pid_ns
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&find_pid_ns);
-   #endif
-
+struct pipe_inode_info x;
+          char tc_1 = *(x.base);
   ;
   return 0;
 }
@@ -41579,7 +46745,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FIND_PID_NS=yes
+	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -41587,27 +46753,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FIND_PID_NS=no
+	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FIND_PID_NS
+  cr_result=$cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIND_PID_NS 1
+#define HAVE_PIPE_INODE_INFO_BASE 1
 _ACEOF
 
-     HAVE_FIND_PID_NS=1
+     HAVE_PIPE_INODE_INFO_BASE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIND_PID_NS 0
+#define HAVE_PIPE_INODE_INFO_BASE 0
 _ACEOF
 
-     HAVE_FIND_PID_NS=''
+     HAVE_PIPE_INODE_INFO_BASE=''
   fi
 
 
@@ -41615,86 +46781,15 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test -z "${HAVE_1_ARG_FIND_PID}${HAVE_2_ARG_FIND_PID}${HAVE_FIND_PID_NS}"; then
-
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
+# OK if missing.
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for find_task_by_pid" >&5
-echo $ECHO_N "checking kernel for find_task_by_pid... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for pipe_inode_info.buffers" >&5
+echo $ECHO_N "checking kernel for pipe_inode_info.buffers... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BUFFERS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -41718,18 +46813,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+    #include <linux/wait.h>
+    #include <linux/pipe_fs_i.h>
+
 int
 main ()
 {
-
-   #ifdef find_task_by_pid
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&find_task_by_pid);
-   #endif
-
+struct pipe_inode_info x;
+          unsigned int tc_1 = x.buffers;
   ;
   return 0;
 }
@@ -41759,7 +46851,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID=yes
+	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BUFFERS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -41767,27 +46859,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID=no
+	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BUFFERS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID
+  cr_result=$cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BUFFERS
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIND_TASK_BY_PID 1
+#define HAVE_PIPE_INODE_INFO_BUFFERS 1
 _ACEOF
 
-     HAVE_FIND_TASK_BY_PID=1
+     HAVE_PIPE_INODE_INFO_BUFFERS=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIND_TASK_BY_PID 0
+#define HAVE_PIPE_INODE_INFO_BUFFERS 0
 _ACEOF
 
-     HAVE_FIND_TASK_BY_PID=''
+     HAVE_PIPE_INODE_INFO_BUFFERS=''
   fi
 
 
@@ -41795,14 +46887,15 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+# OK if missing.
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_ns" >&5
-echo $ECHO_N "checking kernel for find_task_by_pid_ns... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for pipe_buf_operations.pin" >&5
+echo $ECHO_N "checking kernel for pipe_buf_operations.pin... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -41826,18 +46919,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+    #include <linux/sched.h>
+    #include <linux/pipe_fs_i.h>
+
 int
 main ()
 {
-
-   #ifdef find_task_by_pid_ns
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&find_task_by_pid_ns);
-   #endif
-
+struct pipe_buf_operations x;
+          x.pin;
   ;
   return 0;
 }
@@ -41867,7 +46957,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS=yes
+	 cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -41875,27 +46965,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS=no
+	 cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS
+  cr_result=$cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIND_TASK_BY_PID_NS 1
+#define HAVE_PIPE_BUF_OPERATIONS_PIN 1
 _ACEOF
 
-     HAVE_FIND_TASK_BY_PID_NS=1
+     HAVE_PIPE_BUF_OPERATIONS_PIN=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIND_TASK_BY_PID_NS 0
+#define HAVE_PIPE_BUF_OPERATIONS_PIN 0
 _ACEOF
 
-     HAVE_FIND_TASK_BY_PID_NS=''
+     HAVE_PIPE_BUF_OPERATIONS_PIN=''
   fi
 
 
@@ -41903,86 +46993,14 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test -z "${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
-
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
-
+if test -z "${HAVE_PIPE_BUF_OPERATIONS_PIN}"; then
 
 
 
-  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_type" >&5
-echo $ECHO_N "checking kernel for find_task_by_pid_type... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for 2-arg pipe_ops.unmap" >&5
+echo $ECHO_N "checking kernel for 2-arg pipe_ops.unmap... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -42006,17 +47024,16 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
-int
-main ()
-{
 
-   #ifdef find_task_by_pid_type
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&find_task_by_pid_type);
-   #endif
+      #include <linux/sched.h>
+      #include <linux/pipe_fs_i.h>
+
+int
+main ()
+{
+
+      struct pipe_buf_operations p;
+      (void)p.unmap(NULL,NULL);
 
   ;
   return 0;
@@ -42047,7 +47064,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE=yes
+	 cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -42055,27 +47072,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE=no
+	 cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE
+  cr_result=$cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIND_TASK_BY_PID_TYPE 1
+#define HAVE_2_ARG_PIPE_OPS_UNMAP 1
 _ACEOF
 
-     HAVE_FIND_TASK_BY_PID_TYPE=1
+     HAVE_2_ARG_PIPE_OPS_UNMAP=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIND_TASK_BY_PID_TYPE 0
+#define HAVE_2_ARG_PIPE_OPS_UNMAP 0
 _ACEOF
 
-     HAVE_FIND_TASK_BY_PID_TYPE=''
+     HAVE_2_ARG_PIPE_OPS_UNMAP=''
   fi
 
 
@@ -42085,12 +47102,10 @@
 
 
 
+  echo "$as_me:$LINENO: checking kernel for 3-arg pipe_ops.unmap" >&5
+echo $ECHO_N "checking kernel for 3-arg pipe_ops.unmap... $ECHO_C" >&6
 
-
-  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_type_ns" >&5
-echo $ECHO_N "checking kernel for find_task_by_pid_type_ns... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -42114,17 +47129,16 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+      #include <linux/sched.h>
+      #include <linux/pipe_fs_i.h>
+
 int
 main ()
 {
 
-   #ifdef find_task_by_pid_type_ns
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&find_task_by_pid_type_ns);
-   #endif
+      struct pipe_buf_operations p;
+      (void)p.unmap(NULL,NULL,NULL);
 
   ;
   return 0;
@@ -42155,7 +47169,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS=yes
+	 cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -42163,35 +47177,36 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS=no
+	 cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS
+  cr_result=$cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIND_TASK_BY_PID_TYPE_NS 1
+#define HAVE_3_ARG_PIPE_OPS_UNMAP 1
 _ACEOF
 
-     HAVE_FIND_TASK_BY_PID_TYPE_NS=1
+     HAVE_3_ARG_PIPE_OPS_UNMAP=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIND_TASK_BY_PID_TYPE_NS 0
+#define HAVE_3_ARG_PIPE_OPS_UNMAP 0
 _ACEOF
 
-     HAVE_FIND_TASK_BY_PID_TYPE_NS=''
+     HAVE_3_ARG_PIPE_OPS_UNMAP=''
   fi
 
 
   echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-
-if test -z "${HAVE_2_ARG_FIND_PID}${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
+fi
+# Require exactly one match
+if test "${HAVE_PIPE_INODE_INFO_BASE}${HAVE_PIPE_BUF_OPERATIONS_PIN}${HAVE_2_ARG_PIPE_OPS_UNMAP}${HAVE_3_ARG_PIPE_OPS_UNMAP}" != "1"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -42257,23 +47272,26 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for alloc_pid" >&5
-echo $ECHO_N "checking kernel for alloc_pid... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_ALLOC_PID+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for anon_pipe_buf_ops" >&5
+echo $ECHO_N "checking kernel symbol table for anon_pipe_buf_ops... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_anon_pipe_buf_ops+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_anon_pipe_buf_ops=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}anon_pipe_buf_ops$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_anon_pipe_buf_ops"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_anon_pipe_buf_ops\$" >/dev/null ; then
+        cr_cv_ksymtab_anon_pipe_buf_ops=0
+      fi
 
 
   SAVE_CC=$CC
@@ -42294,18 +47312,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-   #ifdef alloc_pid
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&alloc_pid);
-   #endif
-
+int x = sizeof(&anon_pipe_buf_ops);
   ;
   return 0;
 }
@@ -42335,7 +47349,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_ALLOC_PID=yes
+	 cr_cv_ksymtab_anon_pipe_buf_ops="Y$cr_cv_ksymtab_anon_pipe_buf_ops"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -42343,46 +47357,49 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_ALLOC_PID=no
+	 cr_cv_ksymtab_anon_pipe_buf_ops="N$cr_cv_ksymtab_anon_pipe_buf_ops"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_ALLOC_PID
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_anon_pipe_buf_ops"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_anon_pipe_buf_ops" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern struct pipe_buf_operations anon_pipe_buf_ops;
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOC_PID 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_anon_pipe_buf_ops | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(anon_pipe_buf_ops, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_ALLOC_PID=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOC_PID 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_anon_pipe_buf_ops $cr_addr
 _ACEOF
 
-     HAVE_ALLOC_PID=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test -n "${HAVE_ALLOC_PID}"; then
-
-
-
 
 
 
+  echo "$as_me:$LINENO: checking kernel for pipe_fcntl" >&5
+echo $ECHO_N "checking kernel for pipe_fcntl... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel for 0-arg alloc_pid" >&5
-echo $ECHO_N "checking kernel for 0-arg alloc_pid... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_PIPE_FCNTL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -42406,15 +47423,21 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+    #include <linux/sched.h>
+    #include <linux/pipe_fs_i.h>
+
 int
 main ()
 {
 
-	#ifndef alloc_pid /* Must be macro or have a decl */
-	  int x = sizeof(&alloc_pid);
-	#endif
-	    alloc_pid();
+   #ifdef pipe_fcntl
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&pipe_fcntl);
+   #endif
+
   ;
   return 0;
 }
@@ -42444,7 +47467,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID=yes
+	 cr_cv_kconfig_HAVE_PIPE_FCNTL=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -42452,27 +47475,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID=no
+	 cr_cv_kconfig_HAVE_PIPE_FCNTL=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID
+  cr_result=$cr_cv_kconfig_HAVE_PIPE_FCNTL
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_0_ARG_ALLOC_PID 1
+#define HAVE_PIPE_FCNTL 1
 _ACEOF
 
-     HAVE_0_ARG_ALLOC_PID=1
+     HAVE_PIPE_FCNTL=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_0_ARG_ALLOC_PID 0
+#define HAVE_PIPE_FCNTL 0
 _ACEOF
 
-     HAVE_0_ARG_ALLOC_PID=''
+     HAVE_PIPE_FCNTL=''
   fi
 
 
@@ -42480,21 +47503,22 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test "${HAVE_PIPE_FCNTL}" = "1"; then
 
 
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 1-arg alloc_pid" >&5
-echo $ECHO_N "checking kernel for 1-arg alloc_pid... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for pipe_fcntl" >&5
+echo $ECHO_N "checking kernel symbol table for pipe_fcntl... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_pipe_fcntl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_pipe_fcntl=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}pipe_fcntl$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_pipe_fcntl"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pipe_fcntl\$" >/dev/null ; then
+        cr_cv_ksymtab_pipe_fcntl=0
+      fi
 
 
   SAVE_CC=$CC
@@ -42515,15 +47539,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-	#ifndef alloc_pid /* Must be macro or have a decl */
-	  int x = sizeof(&alloc_pid);
-	#endif
-	    alloc_pid(NULL);
+int x = sizeof(&pipe_fcntl);
   ;
   return 0;
 }
@@ -42553,7 +47576,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID=yes
+	 cr_cv_ksymtab_pipe_fcntl="Y$cr_cv_ksymtab_pipe_fcntl"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -42561,122 +47584,61 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID=no
+	 cr_cv_ksymtab_pipe_fcntl="N$cr_cv_ksymtab_pipe_fcntl"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_pipe_fcntl"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_pipe_fcntl" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg);
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_1_ARG_ALLOC_PID 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_pipe_fcntl | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(pipe_fcntl, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_1_ARG_ALLOC_PID=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_1_ARG_ALLOC_PID 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_pipe_fcntl $cr_addr
 _ACEOF
 
-     HAVE_1_ARG_ALLOC_PID=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-
-
-
-  if test "${HAVE_0_ARG_ALLOC_PID}${HAVE_1_ARG_ALLOC_PID}" != "1"; then
-
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
+fi
+# Now try to define CR_F_SETPIPE_SZ and CR_F_GETPIPE_SZ, for the pipe test.
 #
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
+# We try the user space headers first.  If we don't find a definition, then we
+# poke around the kernel headers for the definition.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
+# If we still don't have a definition at this point, the crut test also
+# uses an #ifdef F_SETPIPE_SZ before using CR_F_SETPIPE_SZ, so we have
+# one more chance.
 
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" >&2;}
-   { (exit 1); exit 1; }; }
 
-  fi
 
+  echo "$as_me:$LINENO: checking kernel for F_SETPIPE_SZ" >&5
+echo $ECHO_N "checking kernel for F_SETPIPE_SZ... $ECHO_C" >&6
 
-  echo "$as_me:$LINENO: checking kernel symbol table for free_pid" >&5
-echo $ECHO_N "checking kernel symbol table for free_pid... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_free_pid+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_F_SETPIPE_SZ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_free_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_pid$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_free_pid"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_free_pid\$" >/dev/null ; then
-        cr_cv_ksymtab_free_pid=0
-      fi
 
 
   SAVE_CC=$CC
@@ -42697,14 +47659,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/fcntl.h>
 int
 main ()
 {
-int x = sizeof(&free_pid);
+
+   #ifndef F_SETPIPE_SZ
+     choke me
+   #endif
+
   ;
   return 0;
 }
@@ -42734,7 +47697,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_free_pid="Y$cr_cv_ksymtab_free_pid"
+	 cr_cv_kconfig_HAVE_F_SETPIPE_SZ=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -42742,55 +47705,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_free_pid="N$cr_cv_ksymtab_free_pid"
+	 cr_cv_kconfig_HAVE_F_SETPIPE_SZ=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_free_pid"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_free_pid" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol free_pid but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol free_pid but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_free_pid | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(free_pid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  cr_result=$cr_cv_kconfig_HAVE_F_SETPIPE_SZ
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_free_pid $cr_addr
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_F_SETPIPE_SZ 1
+_ACEOF
+
+     HAVE_F_SETPIPE_SZ=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_F_SETPIPE_SZ 0
 _ACEOF
 
+     HAVE_F_SETPIPE_SZ=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for pid_hash" >&5
-echo $ECHO_N "checking kernel symbol table for pid_hash... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_pid_hash+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for F_GETPIPE_SZ" >&5
+echo $ECHO_N "checking kernel for F_GETPIPE_SZ... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_F_GETPIPE_SZ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_pid_hash=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pid_hash$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_pid_hash"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pid_hash\$" >/dev/null ; then
-        cr_cv_ksymtab_pid_hash=0
-      fi
 
 
   SAVE_CC=$CC
@@ -42811,14 +47764,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/fcntl.h>
 int
 main ()
 {
-int x = sizeof(&pid_hash);
+
+   #ifndef F_GETPIPE_SZ
+     choke me
+   #endif
+
   ;
   return 0;
 }
@@ -42848,7 +47802,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pid_hash="Y$cr_cv_ksymtab_pid_hash"
+	 cr_cv_kconfig_HAVE_F_GETPIPE_SZ=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -42856,84 +47810,199 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pid_hash="N$cr_cv_ksymtab_pid_hash"
+	 cr_cv_kconfig_HAVE_F_GETPIPE_SZ=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_pid_hash"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_pid_hash" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern struct hlist_head *pid_hash;
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_F_GETPIPE_SZ
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_pid_hash | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(pid_hash, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_F_GETPIPE_SZ 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_pid_hash $cr_addr
+     HAVE_F_GETPIPE_SZ=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_F_GETPIPE_SZ 0
 _ACEOF
 
+     HAVE_F_GETPIPE_SZ=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test "${HAVE_F_SETPIPE_SZ}${HAVE_F_GETPIPE_SZ}" = "11"; then
 
-  echo "$as_me:$LINENO: checking kernel symbol table for pidhash_shift" >&5
-echo $ECHO_N "checking kernel symbol table for pidhash_shift... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_pidhash_shift+set}" = set; then
+    CR_F_SETPIPE_SZ=""
+
+    echo "$as_me:$LINENO: checking for value for CR_F_SETPIPE_SZ" >&5
+echo $ECHO_N "checking for value for CR_F_SETPIPE_SZ... $ECHO_C" >&6
+if test "${cr_cv_compute_int_CR_F_SETPIPE_SZ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_pidhash_shift=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidhash_shift$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_pidhash_shift"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pidhash_shift\$" >/dev/null ; then
-        cr_cv_ksymtab_pidhash_shift=0
-      fi
+    cr_cv_compute_int_CR_F_SETPIPE_SZ="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <fcntl.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((F_SETPIPE_SZ) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <fcntl.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((F_SETPIPE_SZ) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <fcntl.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((F_SETPIPE_SZ) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+#include <fcntl.h>
 int
 main ()
 {
-int x = sizeof(&pidhash_shift);
+static int test_array [1 - 2 * !((F_SETPIPE_SZ) >= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -42960,93 +48029,45 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pidhash_shift="Y$cr_cv_ksymtab_pidhash_shift"
+  ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pidhash_shift="N$cr_cv_ksymtab_pidhash_shift"
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-    fi
-
-fi
-
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_pidhash_shift"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_pidhash_shift" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern int pidhash_shift;
-_EOF
-
-    fi
-    cr_result=`echo $cr_cv_ksymtab_pidhash_shift | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(pidhash_shift, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
-
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_pidhash_shift $cr_addr
-_ACEOF
-
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-  # Can't use true type because 'struct kmem_cache' is opaque by design
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for pid_namespace.pid_cachep" >&5
-echo $ECHO_N "checking kernel for pid_namespace.pid_cachep... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  done
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-	#include <linux/slab.h>
-	#include <linux/pid_namespace.h>
-
+#include <fcntl.h>
 int
 main ()
 {
-struct pid_namespace x;
-          void * tc_1 = x.pid_cachep;
+static int test_array [1 - 2 * !((F_SETPIPE_SZ) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -43073,88 +48094,137 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP=yes
+  ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP=no
+ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PID_NAMESPACE_PID_CACHEP 1
+done
+case $ac_lo in
+?*) cr_cv_compute_int_CR_F_SETPIPE_SZ=$ac_lo;;
+'')  ;;
+esac
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <fcntl.h>
+long longval () { return F_SETPIPE_SZ; }
+unsigned long ulongval () { return F_SETPIPE_SZ; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
 
-     HAVE_PID_NAMESPACE_PID_CACHEP=1
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((F_SETPIPE_SZ) < 0)
+    {
+      long i = longval ();
+      if (i != (F_SETPIPE_SZ))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PID_NAMESPACE_PID_CACHEP 0
+    {
+      unsigned long i = ulongval ();
+      if (i != (F_SETPIPE_SZ))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_compute_int_CR_F_SETPIPE_SZ=`cat conftest.val`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-     HAVE_PID_NAMESPACE_PID_CACHEP=''
-  fi
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
 
+fi
+echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_F_SETPIPE_SZ" >&5
+echo "${ECHO_T}$cr_cv_compute_int_CR_F_SETPIPE_SZ" >&6
+  if test "$cr_cv_compute_int_CR_F_SETPIPE_SZ" != "not found"; then
+    CR_F_SETPIPE_SZ="$cr_cv_compute_int_CR_F_SETPIPE_SZ"
+  fi
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
+  if test -n "$CR_F_SETPIPE_SZ"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_F_SETPIPE_SZ $CR_F_SETPIPE_SZ
+_ACEOF
 
 
 
+  fi
 
-  echo "$as_me:$LINENO: checking kernel symbol table for pid_cachep" >&5
-echo $ECHO_N "checking kernel symbol table for pid_cachep... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_pid_cachep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+    if test -z "${CR_F_SETPIPE_SZ}"; then
 
-    cr_cv_ksymtab_pid_cachep=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pid_cachep$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_pid_cachep"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pid_cachep\$" >/dev/null ; then
-        cr_cv_ksymtab_pid_cachep=0
-      fi
+    CR_F_SETPIPE_SZ=""
 
 
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
+    SAVE_CPP=$CPP
   SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
+  SAVE_cross_compiling="$cross_compiling"
+  CPP="$KCC -E"
   CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+  cross_compiling="yes"
+  echo "$as_me:$LINENO: checking kernel for value for CR_F_SETPIPE_SZ" >&5
+echo $ECHO_N "checking kernel for value for CR_F_SETPIPE_SZ... $ECHO_C" >&6
+if test "${cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+#include <linux/fcntl.h>
 int
 main ()
 {
-int x = sizeof(&pid_cachep);
+static int test_array [1 - 2 * !((F_SETPIPE_SZ) >= 0)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -43181,173 +48251,21 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pid_cachep="Y$cr_cv_ksymtab_pid_cachep"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pid_cachep="N$cr_cv_ksymtab_pid_cachep"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-    fi
-
-fi
-
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_pid_cachep"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_pid_cachep" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-
-    #if HAVE_KMEM_CACHE_T
-      extern kmem_cache_t *pid_cachep;
-    #else
-      extern struct kmem_cache *pid_cachep;
-    #endif
-
-_EOF
-
-    fi
-    cr_result=`echo $cr_cv_ksymtab_pid_cachep | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(pid_cachep, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
-
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_pid_cachep $cr_addr
-_ACEOF
-
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-  if test -z "${cr_addr}${HAVE_PID_NAMESPACE_PID_CACHEP}"; then
-
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" >&2;}
-   { (exit 1); exit 1; }; }
-
-  fi
-  if test -n "${HAVE_LINUX_PSPACE_H}"; then
-
-
-  echo "$as_me:$LINENO: checking kernel symbol table for init_pspace" >&5
-echo $ECHO_N "checking kernel symbol table for init_pspace... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_init_pspace+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    cr_cv_ksymtab_init_pspace=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}init_pspace$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_init_pspace"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_init_pspace\$" >/dev/null ; then
-        cr_cv_ksymtab_init_pspace=0
-      fi
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+#include <linux/fcntl.h>
 int
 main ()
 {
-int x = sizeof(&init_pspace);
+static int test_array [1 - 2 * !((F_SETPIPE_SZ) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -43374,95 +48292,37 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_init_pspace="Y$cr_cv_ksymtab_init_pspace"
+  ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_init_pspace="N$cr_cv_ksymtab_init_pspace"
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    fi
-
-fi
-
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_init_pspace"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_init_pspace" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol init_pspace but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol init_pspace but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_init_pspace | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(init_pspace, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
-
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_init_pspace $cr_addr
-_ACEOF
-
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-  elif test -n "${HAVE_LINUX_PID_NAMESPACE_H}"; then
-
-
-  echo "$as_me:$LINENO: checking kernel symbol table for init_pid_ns" >&5
-echo $ECHO_N "checking kernel symbol table for init_pid_ns... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_init_pid_ns+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    cr_cv_ksymtab_init_pid_ns=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}init_pid_ns$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_init_pid_ns"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_init_pid_ns\$" >/dev/null ; then
-        cr_cv_ksymtab_init_pid_ns=0
-      fi
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <linux/fcntl.h>
 int
 main ()
 {
-int x = sizeof(&init_pid_ns);
+static int test_array [1 - 2 * !((F_SETPIPE_SZ) < 0)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -43489,92 +48349,21 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_init_pid_ns="Y$cr_cv_ksymtab_init_pid_ns"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_init_pid_ns="N$cr_cv_ksymtab_init_pid_ns"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-    fi
-
-fi
-
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_init_pid_ns"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_init_pid_ns" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol init_pid_ns but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol init_pid_ns but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    cr_result=`echo $cr_cv_ksymtab_init_pid_ns | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(init_pid_ns, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
-
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_init_pid_ns $cr_addr
-_ACEOF
-
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-  fi
-fi
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 2.6.0 attach_pid" >&5
-echo $ECHO_N "checking kernel for 2.6.0 attach_pid... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-		 #include <linux/sched.h>
-	 #include <linux/pid.h>
-   extern int FASTCALL(attach_pid(struct task_struct *task, enum pid_type type, int nr));
+#include <linux/fcntl.h>
 int
 main ()
 {
-int x = sizeof(&attach_pid)
+static int test_array [1 - 2 * !((F_SETPIPE_SZ) >= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -43601,83 +48390,45 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID=yes
+  ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID=no
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_0_ATTACH_PID 1
-_ACEOF
-
-     HAVE_2_6_0_ATTACH_PID=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_0_ATTACH_PID 0
-_ACEOF
-
-     HAVE_2_6_0_ATTACH_PID=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 2.6.22 attach_pid" >&5
-echo $ECHO_N "checking kernel for 2.6.22 attach_pid... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  done
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-		 #include <linux/sched.h>
-	 #include <linux/pid.h>
-   extern int FASTCALL(attach_pid(struct task_struct *task, enum pid_type type, struct pid *pid));
+#include <linux/fcntl.h>
 int
 main ()
 {
-int x = sizeof(&attach_pid)
+static int test_array [1 - 2 * !((F_SETPIPE_SZ) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -43704,266 +48455,132 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID=yes
+  ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID=no
+ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_22_ATTACH_PID 1
-_ACEOF
-
-     HAVE_2_6_22_ATTACH_PID=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_22_ATTACH_PID 0
-_ACEOF
-
-     HAVE_2_6_22_ATTACH_PID=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 2.6.26 attach_pid" >&5
-echo $ECHO_N "checking kernel for 2.6.26 attach_pid... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+done
+case $ac_lo in
+?*) cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ=$ac_lo;;
+'')  ;;
+esac
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 else
-
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-		 #include <linux/sched.h>
-	 #include <linux/pid.h>
-   extern void attach_pid(struct task_struct *task, enum pid_type type, struct pid *pid);
+#include <linux/fcntl.h>
+long longval () { return F_SETPIPE_SZ; }
+unsigned long ulongval () { return F_SETPIPE_SZ; }
+#include <stdio.h>
+#include <stdlib.h>
 int
 main ()
 {
-int x = sizeof(&attach_pid)
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((F_SETPIPE_SZ) < 0)
+    {
+      long i = longval ();
+      if (i != (F_SETPIPE_SZ))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != (F_SETPIPE_SZ))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+  (exit $ac_status); } && { ac_try='./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
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID=yes
+  cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ=`cat conftest.val`
 else
-  echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+fi
+rm -f conftest.val
 
-  cr_result=$cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_26_ATTACH_PID 1
-_ACEOF
-
-     HAVE_2_6_26_ATTACH_PID=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_6_26_ATTACH_PID 0
-_ACEOF
-
-     HAVE_2_6_26_ATTACH_PID=''
+fi
+echo "$as_me:$LINENO: result: $cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ" >&5
+echo "${ECHO_T}$cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ" >&6
+  CPP=$SAVE_CPP
+  CPPFLAGS=$SAVE_CPPFLAGS
+  cross_compiling="$SAVE_cross_compiling"
+  if test "$cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ" != "not found"; then
+    CR_F_SETPIPE_SZ="$cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ"
   fi
 
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-# Require exactly one match
-if test "${HAVE_2_6_0_ATTACH_PID}${HAVE_2_6_22_ATTACH_PID}${HAVE_2_6_26_ATTACH_PID}" != "1"; then
-
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
+  if test -n "$CR_F_SETPIPE_SZ"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_F_SETPIPE_SZ $CR_F_SETPIPE_SZ
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
 
 
+  fi
 
+    fi
 
-  echo "$as_me:$LINENO: checking kernel for change_pid" >&5
-echo $ECHO_N "checking kernel for change_pid... $ECHO_C" >&6
+    CR_F_GETPIPE_SZ=""
 
-    if test "${cr_cv_kconfig_HAVE_CHANGE_PID+set}" = set; then
+    echo "$as_me:$LINENO: checking for value for CR_F_GETPIPE_SZ" >&5
+echo $ECHO_N "checking for value for CR_F_GETPIPE_SZ... $ECHO_C" >&6
+if test "${cr_cv_compute_int_CR_F_GETPIPE_SZ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+    cr_cv_compute_int_CR_F_GETPIPE_SZ="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-	#include <linux/sched.h>
-	#include <linux/pid.h>
+#include <fcntl.h>
 int
 main ()
 {
-
-   #ifdef change_pid
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&change_pid);
-   #endif
+static int test_array [1 - 2 * !((F_GETPIPE_SZ) >= 0)];
+test_array [0] = 0
 
   ;
   return 0;
@@ -43991,92 +48608,20 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_CHANGE_PID=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_CHANGE_PID=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_CHANGE_PID
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_CHANGE_PID 1
-_ACEOF
-
-     HAVE_CHANGE_PID=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_CHANGE_PID 0
-_ACEOF
-
-     HAVE_CHANGE_PID=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-# OK if missing
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for struct pidmap" >&5
-echo $ECHO_N "checking kernel for struct pidmap... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_STRUCT_PIDMAP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-  #if HAVE_LINUX_PSPACE_H
-    #include <linux/pspace.h>
-  #endif
-  #if HAVE_LINUX_PID_NAMESPACE_H
-    #include <linux/pid_namespace.h>
-  #endif
-
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <fcntl.h>
 int
 main ()
 {
-
-     struct pidmap y;
-     int x = sizeof(y);
+static int test_array [1 - 2 * !((F_GETPIPE_SZ) <= $ac_mid)];
+test_array [0] = 0
 
   ;
   return 0;
@@ -44104,88 +48649,37 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_STRUCT_PIDMAP=yes
+  ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_STRUCT_PIDMAP=no
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_STRUCT_PIDMAP
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_PIDMAP 1
-_ACEOF
-
-     HAVE_STRUCT_PIDMAP=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_PIDMAP 0
-_ACEOF
-
-     HAVE_STRUCT_PIDMAP=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel symbol table for pidmap_array" >&5
-echo $ECHO_N "checking kernel symbol table for pidmap_array... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_pidmap_array+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  done
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    cr_cv_ksymtab_pidmap_array=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidmap_array$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_pidmap_array"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pidmap_array\$" >/dev/null ; then
-        cr_cv_ksymtab_pidmap_array=0
-      fi
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+#include <fcntl.h>
 int
 main ()
 {
-int x = sizeof(&pidmap_array);
+static int test_array [1 - 2 * !((F_GETPIPE_SZ) < 0)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -44212,104 +48706,21 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pidmap_array="Y$cr_cv_ksymtab_pidmap_array"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pidmap_array="N$cr_cv_ksymtab_pidmap_array"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-    fi
-
-fi
-
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_pidmap_array"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_pidmap_array" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-
-  #if !HAVE_STRUCT_PIDMAP
-    struct pidmap {
-        atomic_t nr_free;
-        void *page;
-    };
-  #endif
-  extern struct pidmap pidmap_array[];
-
-_EOF
-
-    fi
-    cr_result=`echo $cr_cv_ksymtab_pidmap_array | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(pidmap_array, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
-
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_pidmap_array $cr_addr
-_ACEOF
-
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-if test x"$cr_kernel_smp" = xyes; then
-
-
-  echo "$as_me:$LINENO: checking kernel symbol table for pidmap_lock" >&5
-echo $ECHO_N "checking kernel symbol table for pidmap_lock... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_pidmap_lock+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    cr_cv_ksymtab_pidmap_lock=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidmap_lock$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_pidmap_lock"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_pidmap_lock\$" >/dev/null ; then
-        cr_cv_ksymtab_pidmap_lock=0
-      fi
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+#include <fcntl.h>
 int
 main ()
 {
-int x = sizeof(&pidmap_lock);
+static int test_array [1 - 2 * !((F_GETPIPE_SZ) >= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -44336,101 +48747,44 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pidmap_lock="Y$cr_cv_ksymtab_pidmap_lock"
+  ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_pidmap_lock="N$cr_cv_ksymtab_pidmap_lock"
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    fi
-
+ac_lo= ac_hi=
 fi
-
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_pidmap_lock"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_pidmap_lock" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern spinlock_t pidmap_lock;
-_EOF
-
-    fi
-    cr_result=`echo $cr_cv_ksymtab_pidmap_lock | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(pidmap_lock, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
-
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_pidmap_lock $cr_addr
-_ACEOF
-
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-  if test -z "$cr_addr"; then
-    { { echo "$as_me:$LINENO: error: failed to find symbol pidmap_lock" >&5
-echo "$as_me: error: failed to find symbol pidmap_lock" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for kill_pid" >&5
-echo $ECHO_N "checking kernel for kill_pid... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_KILL_PID+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-		 #include <linux/sched.h>
+#include <fcntl.h>
 int
 main ()
 {
-
-   #ifdef kill_pid
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&kill_pid);
-   #endif
+static int test_array [1 - 2 * !((F_GETPIPE_SZ) <= $ac_mid)];
+test_array [0] = 0
 
   ;
   return 0;
@@ -44458,268 +48812,136 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KILL_PID=yes
+  ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KILL_PID=no
+ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_KILL_PID
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_KILL_PID 1
-_ACEOF
-
-     HAVE_KILL_PID=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_KILL_PID 0
-_ACEOF
-
-     HAVE_KILL_PID=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for kill_proc" >&5
-echo $ECHO_N "checking kernel for kill_proc... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_KILL_PROC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+done
+case $ac_lo in
+?*) cr_cv_compute_int_CR_F_GETPIPE_SZ=$ac_lo;;
+'')  ;;
+esac
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 else
-
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-		 #include <linux/sched.h>
+#include <fcntl.h>
+long longval () { return F_GETPIPE_SZ; }
+unsigned long ulongval () { return F_GETPIPE_SZ; }
+#include <stdio.h>
+#include <stdlib.h>
 int
 main ()
 {
 
-   #ifdef kill_proc
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&kill_proc);
-   #endif
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((F_GETPIPE_SZ) < 0)
+    {
+      long i = longval ();
+      if (i != (F_GETPIPE_SZ))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != (F_GETPIPE_SZ))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+  (exit $ac_status); } && { ac_try='./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
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KILL_PROC=yes
+  cr_cv_compute_int_CR_F_GETPIPE_SZ=`cat conftest.val`
 else
-  echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KILL_PROC=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-  cr_result=$cr_cv_kconfig_HAVE_KILL_PROC
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_KILL_PROC 1
-_ACEOF
-
-     HAVE_KILL_PROC=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_KILL_PROC 0
-_ACEOF
-
-     HAVE_KILL_PROC=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-# Require at least one
-if test -z "${HAVE_KILL_PID}${HAVE_KILL_PROC}"; then
-
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
 fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" >&2;}
-   { (exit 1); exit 1; }; }
+rm -f conftest.val
 
 fi
+echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_F_GETPIPE_SZ" >&5
+echo "${ECHO_T}$cr_cv_compute_int_CR_F_GETPIPE_SZ" >&6
+  if test "$cr_cv_compute_int_CR_F_GETPIPE_SZ" != "not found"; then
+    CR_F_GETPIPE_SZ="$cr_cv_compute_int_CR_F_GETPIPE_SZ"
+  fi
 
+  if test -n "$CR_F_GETPIPE_SZ"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_F_GETPIPE_SZ $CR_F_GETPIPE_SZ
+_ACEOF
 
 
 
+  fi
 
-  echo "$as_me:$LINENO: checking kernel for child_reaper" >&5
-echo $ECHO_N "checking kernel for child_reaper... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_CHILD_REAPER+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+    if test -z "${CR_F_GETPIPE_SZ}"; then
 
+    CR_F_GETPIPE_SZ=""
 
 
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
+    SAVE_CPP=$CPP
   SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
+  SAVE_cross_compiling="$cross_compiling"
+  CPP="$KCC -E"
   CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+  cross_compiling="yes"
+  echo "$as_me:$LINENO: checking kernel for value for CR_F_GETPIPE_SZ" >&5
+echo $ECHO_N "checking kernel for value for CR_F_GETPIPE_SZ... $ECHO_C" >&6
+if test "${cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ="not found"
+    if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-		 #include <linux/pid_namespace.h>
+#include <linux/fcntl.h>
 int
 main ()
 {
-
-   #ifdef child_reaper
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&child_reaper);
-   #endif
+static int test_array [1 - 2 * !((F_GETPIPE_SZ) >= 0)];
+test_array [0] = 0
 
   ;
   return 0;
@@ -44747,87 +48969,20 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_CHILD_REAPER=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_CHILD_REAPER=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_CHILD_REAPER
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_CHILD_REAPER 1
-_ACEOF
-
-     HAVE_CHILD_REAPER=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_CHILD_REAPER 0
-_ACEOF
-
-     HAVE_CHILD_REAPER=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for task_child_reaper" >&5
-echo $ECHO_N "checking kernel for task_child_reaper... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_TASK_CHILD_REAPER+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-		 #include <linux/pid_namespace.h>
+#include <linux/fcntl.h>
 int
 main ()
 {
-
-   #ifdef task_child_reaper
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&task_child_reaper);
-   #endif
+static int test_array [1 - 2 * !((F_GETPIPE_SZ) <= $ac_mid)];
+test_array [0] = 0
 
   ;
   return 0;
@@ -44855,89 +49010,37 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_CHILD_REAPER=yes
+  ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_CHILD_REAPER=no
+ac_lo=`expr $ac_mid + 1`
+		    if test $ac_lo -le $ac_mid; then
+		      ac_lo= ac_hi=
+		      break
+		    fi
+		    ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_TASK_CHILD_REAPER
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_CHILD_REAPER 1
-_ACEOF
-
-     HAVE_TASK_CHILD_REAPER=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_CHILD_REAPER 0
-_ACEOF
-
-     HAVE_TASK_CHILD_REAPER=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-if test -z "${HAVE_CHILD_REAPER}${HAVE_TASK_CHILD_REAPER}"; then
-
-
-  echo "$as_me:$LINENO: checking kernel symbol table for child_reaper" >&5
-echo $ECHO_N "checking kernel symbol table for child_reaper... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_child_reaper+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  done
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    cr_cv_ksymtab_child_reaper=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}child_reaper$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_child_reaper"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_child_reaper\$" >/dev/null ; then
-        cr_cv_ksymtab_child_reaper=0
-      fi
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+#include <linux/fcntl.h>
 int
 main ()
 {
-int x = sizeof(&child_reaper);
+static int test_array [1 - 2 * !((F_GETPIPE_SZ) < 0)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -44964,91 +49067,21 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_child_reaper="Y$cr_cv_ksymtab_child_reaper"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_child_reaper="N$cr_cv_ksymtab_child_reaper"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-    fi
-
-fi
-
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_child_reaper"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_child_reaper" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern struct task_struct *child_reaper;
-_EOF
-
-    fi
-    cr_result=`echo $cr_cv_ksymtab_child_reaper | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(child_reaper, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
-
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_child_reaper $cr_addr
-_ACEOF
-
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-fi
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for task.parent" >&5
-echo $ECHO_N "checking kernel for task.parent... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_TASK_PARENT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-		 #include <linux/sched.h>
+#include <linux/fcntl.h>
 int
 main ()
 {
-struct task_struct x;
-          struct task_struct  tc_1 = *(x.parent);
+static int test_array [1 - 2 * !((F_GETPIPE_SZ) >= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -45075,82 +49108,45 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PARENT=yes
+  ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PARENT=no
+ac_hi=`expr '(' $ac_mid ')' - 1`
+		       if test $ac_mid -le $ac_hi; then
+			 ac_lo= ac_hi=
+			 break
+		       fi
+		       ac_mid=`expr 2 '*' $ac_mid`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_TASK_PARENT
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PARENT 1
-_ACEOF
-
-     HAVE_TASK_PARENT=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PARENT 0
-_ACEOF
-
-     HAVE_TASK_PARENT=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for task.real_parent" >&5
-echo $ECHO_N "checking kernel for task.real_parent... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_TASK_REAL_PARENT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  done
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-		 #include <linux/sched.h>
+#include <linux/fcntl.h>
 int
 main ()
 {
-struct task_struct x;
-          struct task_struct  tc_1 = *(x.real_parent);
+static int test_array [1 - 2 * !((F_GETPIPE_SZ) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
@@ -45177,52 +49173,123 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_REAL_PARENT=yes
+  ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_REAL_PARENT=no
+ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ=$ac_lo;;
+'')  ;;
+esac
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <linux/fcntl.h>
+long longval () { return F_GETPIPE_SZ; }
+unsigned long ulongval () { return F_GETPIPE_SZ; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if ((F_GETPIPE_SZ) < 0)
+    {
+      long i = longval ();
+      if (i != (F_GETPIPE_SZ))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != (F_GETPIPE_SZ))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ=`cat conftest.val`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
 
-  cr_result=$cr_cv_kconfig_HAVE_TASK_REAL_PARENT
+fi
+echo "$as_me:$LINENO: result: $cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ" >&5
+echo "${ECHO_T}$cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ" >&6
+  CPP=$SAVE_CPP
+  CPPFLAGS=$SAVE_CPPFLAGS
+  cross_compiling="$SAVE_cross_compiling"
+  if test "$cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ" != "not found"; then
+    CR_F_GETPIPE_SZ="$cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ"
+  fi
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_REAL_PARENT 1
+  if test -n "$CR_F_GETPIPE_SZ"; then
+    cat >>confdefs.h <<_ACEOF
+#define CR_F_GETPIPE_SZ $CR_F_GETPIPE_SZ
 _ACEOF
 
-     HAVE_TASK_REAL_PARENT=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_REAL_PARENT 0
-_ACEOF
 
-     HAVE_TASK_REAL_PARENT=''
+
   fi
 
+    fi
+fi
+# The user space headers may not define F_SETPIPE_SZ or F_GETPIPE_SZ,
+# and we need these values to run the unit test,
+# so we define CR_F_SETPIPE_SZ and CR_F_GETPIPE_SZ to hold the values
+# that we find in the kernel.
 
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
+# For O_DIRECT support
 
 
 
-# Look for non-deprecated "typedef struct SOMETHING kmem_cache_t".
-# This is slightly complicated by the fact that this is an opaque type (with
-# the struct itself forward-declared but not defined in the public headers).
-echo "$as_me:$LINENO: checking kernel for kmem_cache_t" >&5
-echo $ECHO_N "checking kernel for kmem_cache_t... $ECHO_C" >&6
-if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_T+set}" = set; then
+
+  echo "$as_me:$LINENO: checking kernel for file_operations.check_flags" >&5
+echo $ECHO_N "checking kernel for file_operations.check_flags... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -45246,11 +49313,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/slab.h>
+		 #include <linux/fs.h>
 int
 main ()
 {
-kmem_cache_t *x = NULL;
+struct file_operations x;
+          x.check_flags;
   ;
   return 0;
 }
@@ -45280,43 +49348,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-
-
-
-
-  SAVE_CPP=$CPP
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CPP="$KCC -E"
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-		 #include <linux/slab.h>
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "typedef.+[[:space:]]kmem_cache_t[[:space:]].+deprecated" >/dev/null 2>&1; then
-  CPP=$SAVE_CPP
-	CPPFLAGS=$SAVE_CPPFLAGS
-	cr_cv_kconfig_HAVE_KMEM_CACHE_T=no
-else
-  CPP=$SAVE_CPP
-	CPPFLAGS=$SAVE_CPPFLAGS
-	cr_cv_kconfig_HAVE_KMEM_CACHE_T=yes
-fi
-rm -f conftest*
-
-
- # Want *not* found
-
+	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -45324,38 +49356,42 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KMEM_CACHE_T=no
+	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-echo "$as_me:$LINENO: result: $cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&5
-echo "${ECHO_T}$cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&6
 
-  if test x$cr_cv_kconfig_HAVE_KMEM_CACHE_T = xyes; then
+  cr_result=$cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS
+
+  if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_KMEM_CACHE_T 1
+#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 1
 _ACEOF
 
+     HAVE_FILE_OPERATIONS_CHECK_FLAGS=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_KMEM_CACHE_T 0
+#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 0
 _ACEOF
 
+     HAVE_FILE_OPERATIONS_CHECK_FLAGS=''
   fi
 
 
+  echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for gfp_t" >&5
-echo $ECHO_N "checking kernel for gfp_t... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for file.f_lock" >&5
+echo $ECHO_N "checking kernel for file.f_lock... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_GFP_T+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_FILE_F_LOCK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -45379,14 +49415,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/slab.h>
-int
-main ()
-{
-
-     gfp_t y;
-     int x = sizeof(y);
-
+		 #include <linux/fs.h>
+int
+main ()
+{
+struct file x;
+          spinlock_t tc_1 = x.f_lock;
   ;
   return 0;
 }
@@ -45416,7 +49450,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_GFP_T=yes
+	 cr_cv_kconfig_HAVE_FILE_F_LOCK=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -45424,27 +49458,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_GFP_T=no
+	 cr_cv_kconfig_HAVE_FILE_F_LOCK=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_GFP_T
+  cr_result=$cr_cv_kconfig_HAVE_FILE_F_LOCK
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_GFP_T 1
+#define HAVE_FILE_F_LOCK 1
 _ACEOF
 
-     HAVE_GFP_T=1
+     HAVE_FILE_F_LOCK=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_GFP_T 0
+#define HAVE_FILE_F_LOCK 0
 _ACEOF
 
-     HAVE_GFP_T=''
+     HAVE_FILE_F_LOCK=''
   fi
 
 
@@ -45452,15 +49486,14 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-# OK if missing
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for kzalloc" >&5
-echo $ECHO_N "checking kernel for kzalloc... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for inode.i_mapping" >&5
+echo $ECHO_N "checking kernel for inode.i_mapping... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_KZALLOC+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_INODE_I_MAPPING+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -45484,18 +49517,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/slab.h>
+		 #include <linux/fs.h>
 int
 main ()
 {
-
-   #ifdef kzalloc
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&kzalloc);
-   #endif
-
+struct inode x;
+          struct address_space tc_1 = *(x.i_mapping);
   ;
   return 0;
 }
@@ -45525,7 +49552,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KZALLOC=yes
+	 cr_cv_kconfig_HAVE_INODE_I_MAPPING=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -45533,27 +49560,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KZALLOC=no
+	 cr_cv_kconfig_HAVE_INODE_I_MAPPING=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_KZALLOC
+  cr_result=$cr_cv_kconfig_HAVE_INODE_I_MAPPING
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_KZALLOC 1
+#define HAVE_INODE_I_MAPPING 1
 _ACEOF
 
-     HAVE_KZALLOC=1
+     HAVE_INODE_I_MAPPING=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_KZALLOC 0
+#define HAVE_INODE_I_MAPPING 0
 _ACEOF
 
-     HAVE_KZALLOC=''
+     HAVE_INODE_I_MAPPING=''
   fi
 
 
@@ -45561,15 +49588,14 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-# OK if missing
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for kmem_cache_zalloc" >&5
-echo $ECHO_N "checking kernel for kmem_cache_zalloc... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for file.f_mapping" >&5
+echo $ECHO_N "checking kernel for file.f_mapping... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_FILE_F_MAPPING+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -45593,18 +49619,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/slab.h>
+		 #include <linux/fs.h>
 int
 main ()
 {
-
-   #ifdef kmem_cache_zalloc
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&kmem_cache_zalloc);
-   #endif
-
+struct file x;
+          struct address_space tc_1 = *(x.f_mapping);
   ;
   return 0;
 }
@@ -45634,7 +49654,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC=yes
+	 cr_cv_kconfig_HAVE_FILE_F_MAPPING=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -45642,27 +49662,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC=no
+	 cr_cv_kconfig_HAVE_FILE_F_MAPPING=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC
+  cr_result=$cr_cv_kconfig_HAVE_FILE_F_MAPPING
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_KMEM_CACHE_ZALLOC 1
+#define HAVE_FILE_F_MAPPING 1
 _ACEOF
 
-     HAVE_KMEM_CACHE_ZALLOC=1
+     HAVE_FILE_F_MAPPING=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_KMEM_CACHE_ZALLOC 0
+#define HAVE_FILE_F_MAPPING 0
 _ACEOF
 
-     HAVE_KMEM_CACHE_ZALLOC=''
+     HAVE_FILE_F_MAPPING=''
   fi
 
 
@@ -45670,15 +49690,87 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-# OK if missing
+# Require one or more match on mapping
+if test -z "${HAVE_INODE_I_MAPPING}${HAVE_FILE_F_MAPPING}"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
 
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
 
 
 
-  echo "$as_me:$LINENO: checking kernel for kmemdup" >&5
-echo $ECHO_N "checking kernel for kmemdup... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_KMEMDUP+set}" = set; then
+
+  echo "$as_me:$LINENO: checking kernel for file_operations.unlocked_ioctl" >&5
+echo $ECHO_N "checking kernel for file_operations.unlocked_ioctl... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -45702,18 +49794,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/string.h>
+		 #include <linux/fs.h>
 int
 main ()
 {
-
-   #ifdef kmemdup
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&kmemdup);
-   #endif
-
+struct file_operations x;
+          x.unlocked_ioctl;
   ;
   return 0;
 }
@@ -45743,7 +49829,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KMEMDUP=yes
+	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -45751,27 +49837,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_KMEMDUP=no
+	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_KMEMDUP
+  cr_result=$cr_cv_kconfig_HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_KMEMDUP 1
+#define HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL 1
 _ACEOF
 
-     HAVE_KMEMDUP=1
+     HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_KMEMDUP 0
+#define HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL 0
 _ACEOF
 
-     HAVE_KMEMDUP=''
+     HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL=''
   fi
 
 
@@ -45779,16 +49865,18 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-# OK if missing
 
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for pipe_inode_info.base" >&5
-echo $ECHO_N "checking kernel for pipe_inode_info.base... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for 4-arg do_generic_file_read" >&5
+echo $ECHO_N "checking kernel for 4-arg do_generic_file_read... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -45812,15 +49900,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-    #include <linux/sched.h>
-    #include <linux/pipe_fs_i.h>
-
+		 #include <linux/fs.h>
 int
 main ()
 {
-struct pipe_inode_info x;
-          char tc_1 = *(x.base);
+
+	#ifndef do_generic_file_read /* Must be macro or have a decl */
+	  int x = sizeof(&do_generic_file_read);
+	#endif
+	    do_generic_file_read(NULL,NULL,NULL,NULL);
   ;
   return 0;
 }
@@ -45850,7 +49938,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE=yes
+	 cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -45858,27 +49946,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE=no
+	 cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE
+  cr_result=$cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PIPE_INODE_INFO_BASE 1
+#define HAVE_4_ARG_DO_GENERIC_FILE_READ 1
 _ACEOF
 
-     HAVE_PIPE_INODE_INFO_BASE=1
+     HAVE_4_ARG_DO_GENERIC_FILE_READ=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PIPE_INODE_INFO_BASE 0
+#define HAVE_4_ARG_DO_GENERIC_FILE_READ 0
 _ACEOF
 
-     HAVE_PIPE_INODE_INFO_BASE=''
+     HAVE_4_ARG_DO_GENERIC_FILE_READ=''
   fi
 
 
@@ -45886,15 +49974,18 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-# OK if missing.
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for pipe_buf_operations.pin" >&5
-echo $ECHO_N "checking kernel for pipe_buf_operations.pin... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 5-arg do_generic_file_read" >&5
+echo $ECHO_N "checking kernel for 5-arg do_generic_file_read... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -45918,15 +50009,15 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-    #include <linux/sched.h>
-    #include <linux/pipe_fs_i.h>
-
+		 #include <linux/fs.h>
 int
 main ()
 {
-struct pipe_buf_operations x;
-          x.pin;
+
+	#ifndef do_generic_file_read /* Must be macro or have a decl */
+	  int x = sizeof(&do_generic_file_read);
+	#endif
+	    do_generic_file_read(NULL,NULL,NULL,NULL,0);
   ;
   return 0;
 }
@@ -45956,7 +50047,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN=yes
+	 cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -45964,27 +50055,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN=no
+	 cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN
+  cr_result=$cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PIPE_BUF_OPERATIONS_PIN 1
+#define HAVE_5_ARG_DO_GENERIC_FILE_READ 1
 _ACEOF
 
-     HAVE_PIPE_BUF_OPERATIONS_PIN=1
+     HAVE_5_ARG_DO_GENERIC_FILE_READ=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_PIPE_BUF_OPERATIONS_PIN 0
+#define HAVE_5_ARG_DO_GENERIC_FILE_READ 0
 _ACEOF
 
-     HAVE_PIPE_BUF_OPERATIONS_PIN=''
+     HAVE_5_ARG_DO_GENERIC_FILE_READ=''
   fi
 
 
@@ -45992,14 +50083,16 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test -z "${HAVE_PIPE_BUF_OPERATIONS_PIN}"; then
 
 
 
-  echo "$as_me:$LINENO: checking kernel for 2-arg pipe_ops.unmap" >&5
-echo $ECHO_N "checking kernel for 2-arg pipe_ops.unmap... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for read_descriptor_t.arg.data" >&5
+echo $ECHO_N "checking kernel for read_descriptor_t.arg.data... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -46023,17 +50116,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-      #include <linux/sched.h>
-      #include <linux/pipe_fs_i.h>
-
+		 #include <linux/fs.h>
 int
 main ()
 {
-
-      struct pipe_buf_operations p;
-      (void)p.unmap(NULL,NULL);
-
+read_descriptor_t x;
+          void * tc_1 = x.arg.data;
   ;
   return 0;
 }
@@ -46063,7 +50151,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP=yes
+	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -46071,27 +50159,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP=no
+	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP
+  cr_result=$cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_ARG_PIPE_OPS_UNMAP 1
+#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 1
 _ACEOF
 
-     HAVE_2_ARG_PIPE_OPS_UNMAP=1
+     HAVE_READ_DESCRIPTOR_T_ARG_DATA=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_ARG_PIPE_OPS_UNMAP 0
+#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 0
 _ACEOF
 
-     HAVE_2_ARG_PIPE_OPS_UNMAP=''
+     HAVE_READ_DESCRIPTOR_T_ARG_DATA=''
   fi
 
 
@@ -46101,10 +50189,12 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for 3-arg pipe_ops.unmap" >&5
-echo $ECHO_N "checking kernel for 3-arg pipe_ops.unmap... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP+set}" = set; then
+
+  echo "$as_me:$LINENO: checking kernel for read_descriptor_t.buf" >&5
+echo $ECHO_N "checking kernel for read_descriptor_t.buf... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -46128,17 +50218,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-      #include <linux/sched.h>
-      #include <linux/pipe_fs_i.h>
-
+		 #include <linux/fs.h>
 int
 main ()
 {
-
-      struct pipe_buf_operations p;
-      (void)p.unmap(NULL,NULL,NULL);
-
+read_descriptor_t x;
+          char tc_1 = *(x.buf);
   ;
   return 0;
 }
@@ -46168,7 +50253,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP=yes
+	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -46176,36 +50261,35 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP=no
+	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP
+  cr_result=$cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_3_ARG_PIPE_OPS_UNMAP 1
+#define HAVE_READ_DESCRIPTOR_T_BUF 1
 _ACEOF
 
-     HAVE_3_ARG_PIPE_OPS_UNMAP=1
+     HAVE_READ_DESCRIPTOR_T_BUF=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_3_ARG_PIPE_OPS_UNMAP 0
+#define HAVE_READ_DESCRIPTOR_T_BUF 0
 _ACEOF
 
-     HAVE_3_ARG_PIPE_OPS_UNMAP=''
+     HAVE_READ_DESCRIPTOR_T_BUF=''
   fi
 
 
   echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-fi
-# Require exactly one match
-if test "${HAVE_PIPE_INODE_INFO_BASE}${HAVE_PIPE_BUF_OPERATIONS_PIN}${HAVE_2_ARG_PIPE_OPS_UNMAP}${HAVE_3_ARG_PIPE_OPS_UNMAP}" != "1"; then
+
+if test "${HAVE_READ_DESCRIPTOR_T_ARG_DATA}${HAVE_READ_DESCRIPTOR_T_BUF}" != "1"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -46271,136 +50355,20 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for anon_pipe_buf_ops" >&5
-echo $ECHO_N "checking kernel symbol table for anon_pipe_buf_ops... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_anon_pipe_buf_ops+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    cr_cv_ksymtab_anon_pipe_buf_ops=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}anon_pipe_buf_ops$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_anon_pipe_buf_ops"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_anon_pipe_buf_ops\$" >/dev/null ; then
-        cr_cv_ksymtab_anon_pipe_buf_ops=0
-      fi
-
-
-  SAVE_CC=$CC
-  SAVE_CFLAGS=$CFLAGS
-  SAVE_CPPFLAGS=$CPPFLAGS
-  CC=$KCC
-  CFLAGS=""
-  CPPFLAGS="$KCFLAGS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-		 #include <linux/kernel.h>
-		 #ifndef FASTCALL
-		   #define FASTCALL(_decl) _decl
-		 #endif
-		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
-int
-main ()
-{
-int x = sizeof(&anon_pipe_buf_ops);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (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
-  CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_anon_pipe_buf_ops="Y$cr_cv_ksymtab_anon_pipe_buf_ops"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CC=$SAVE_CC
-	 CFLAGS=$SAVE_CFLAGS
-	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_anon_pipe_buf_ops="N$cr_cv_ksymtab_anon_pipe_buf_ops"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-    fi
-
-fi
-
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_anon_pipe_buf_ops"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_anon_pipe_buf_ops" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern struct pipe_buf_operations anon_pipe_buf_ops;
-_EOF
-
-    fi
-    cr_result=`echo $cr_cv_ksymtab_anon_pipe_buf_ops | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(anon_pipe_buf_ops, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
-
-cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_anon_pipe_buf_ops $cr_addr
-_ACEOF
-
-  fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-# For O_DIRECT support
-
 
 
 
-  echo "$as_me:$LINENO: checking kernel for file_operations.check_flags" >&5
-echo $ECHO_N "checking kernel for file_operations.check_flags... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for splice_direct_to_actor" >&5
+echo $ECHO_N "checking kernel for splice_direct_to_actor... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -46424,12 +50392,20 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+
+	#include <linux/fs.h>
+	#include <linux/splice.h>
 int
 main ()
 {
-struct file_operations x;
-          x.check_flags;
+
+   #ifdef splice_direct_to_actor
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&splice_direct_to_actor);
+   #endif
+
   ;
   return 0;
 }
@@ -46459,7 +50435,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS=yes
+	 cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -46467,27 +50443,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS=no
+	 cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS
+  cr_result=$cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 1
+#define HAVE_SPLICE_DIRECT_TO_ACTOR 1
 _ACEOF
 
-     HAVE_FILE_OPERATIONS_CHECK_FLAGS=1
+     HAVE_SPLICE_DIRECT_TO_ACTOR=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 0
+#define HAVE_SPLICE_DIRECT_TO_ACTOR 0
 _ACEOF
 
-     HAVE_FILE_OPERATIONS_CHECK_FLAGS=''
+     HAVE_SPLICE_DIRECT_TO_ACTOR=''
   fi
 
 
@@ -46499,10 +50475,14 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for inode.i_mapping" >&5
-echo $ECHO_N "checking kernel for inode.i_mapping... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_INODE_I_MAPPING+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 4-arg vfs_mknod" >&5
+echo $ECHO_N "checking kernel for 4-arg vfs_mknod... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -46530,8 +50510,11 @@
 int
 main ()
 {
-struct inode x;
-          struct address_space tc_1 = *(x.i_mapping);
+
+	#ifndef vfs_mknod /* Must be macro or have a decl */
+	  int x = sizeof(&vfs_mknod);
+	#endif
+	    vfs_mknod(NULL,NULL,0,0);
   ;
   return 0;
 }
@@ -46561,7 +50544,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_INODE_I_MAPPING=yes
+	 cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -46569,27 +50552,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_INODE_I_MAPPING=no
+	 cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_INODE_I_MAPPING
+  cr_result=$cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_INODE_I_MAPPING 1
+#define HAVE_4_ARG_VFS_MKNOD 1
 _ACEOF
 
-     HAVE_INODE_I_MAPPING=1
+     HAVE_4_ARG_VFS_MKNOD=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_INODE_I_MAPPING 0
+#define HAVE_4_ARG_VFS_MKNOD 0
 _ACEOF
 
-     HAVE_INODE_I_MAPPING=''
+     HAVE_4_ARG_VFS_MKNOD=''
   fi
 
 
@@ -46601,10 +50584,14 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for file.f_mapping" >&5
-echo $ECHO_N "checking kernel for file.f_mapping... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_FILE_F_MAPPING+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 5-arg vfs_mknod" >&5
+echo $ECHO_N "checking kernel for 5-arg vfs_mknod... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -46632,8 +50619,11 @@
 int
 main ()
 {
-struct file x;
-          struct address_space tc_1 = *(x.f_mapping);
+
+	#ifndef vfs_mknod /* Must be macro or have a decl */
+	  int x = sizeof(&vfs_mknod);
+	#endif
+	    vfs_mknod(NULL,NULL,NULL,0,0);
   ;
   return 0;
 }
@@ -46663,7 +50653,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FILE_F_MAPPING=yes
+	 cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -46671,27 +50661,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_FILE_F_MAPPING=no
+	 cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_FILE_F_MAPPING
+  cr_result=$cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FILE_F_MAPPING 1
+#define HAVE_5_ARG_VFS_MKNOD 1
 _ACEOF
 
-     HAVE_FILE_F_MAPPING=1
+     HAVE_5_ARG_VFS_MKNOD=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_FILE_F_MAPPING 0
+#define HAVE_5_ARG_VFS_MKNOD 0
 _ACEOF
 
-     HAVE_FILE_F_MAPPING=''
+     HAVE_5_ARG_VFS_MKNOD=''
   fi
 
 
@@ -46699,8 +50689,9 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-# Require one or more match on mapping
-if test -z "${HAVE_INODE_I_MAPPING}${HAVE_FILE_F_MAPPING}"; then
+
+
+if test "${HAVE_4_ARG_VFS_MKNOD}${HAVE_5_ARG_VFS_MKNOD}" != "1"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -46766,8 +50757,8 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -46779,10 +50770,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for 4-arg do_generic_file_read" >&5
-echo $ECHO_N "checking kernel for 4-arg do_generic_file_read... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for 2-arg vfs_unlink" >&5
+echo $ECHO_N "checking kernel for 2-arg vfs_unlink... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -46811,10 +50802,10 @@
 main ()
 {
 
-	#ifndef do_generic_file_read /* Must be macro or have a decl */
-	  int x = sizeof(&do_generic_file_read);
+	#ifndef vfs_unlink /* Must be macro or have a decl */
+	  int x = sizeof(&vfs_unlink);
 	#endif
-	    do_generic_file_read(NULL,NULL,NULL,NULL);
+	    vfs_unlink(NULL,NULL);
   ;
   return 0;
 }
@@ -46844,7 +50835,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ=yes
+	 cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -46852,27 +50843,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ=no
+	 cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ
+  cr_result=$cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_4_ARG_DO_GENERIC_FILE_READ 1
+#define HAVE_2_ARG_VFS_UNLINK 1
 _ACEOF
 
-     HAVE_4_ARG_DO_GENERIC_FILE_READ=1
+     HAVE_2_ARG_VFS_UNLINK=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_4_ARG_DO_GENERIC_FILE_READ 0
+#define HAVE_2_ARG_VFS_UNLINK 0
 _ACEOF
 
-     HAVE_4_ARG_DO_GENERIC_FILE_READ=''
+     HAVE_2_ARG_VFS_UNLINK=''
   fi
 
 
@@ -46888,10 +50879,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for 5-arg do_generic_file_read" >&5
-echo $ECHO_N "checking kernel for 5-arg do_generic_file_read... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for 3-arg vfs_unlink" >&5
+echo $ECHO_N "checking kernel for 3-arg vfs_unlink... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -46920,10 +50911,10 @@
 main ()
 {
 
-	#ifndef do_generic_file_read /* Must be macro or have a decl */
-	  int x = sizeof(&do_generic_file_read);
+	#ifndef vfs_unlink /* Must be macro or have a decl */
+	  int x = sizeof(&vfs_unlink);
 	#endif
-	    do_generic_file_read(NULL,NULL,NULL,NULL,0);
+	    vfs_unlink(NULL,NULL,NULL);
   ;
   return 0;
 }
@@ -46953,7 +50944,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ=yes
+	 cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -46961,27 +50952,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ=no
+	 cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ
+  cr_result=$cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_5_ARG_DO_GENERIC_FILE_READ 1
+#define HAVE_3_ARG_VFS_UNLINK 1
 _ACEOF
 
-     HAVE_5_ARG_DO_GENERIC_FILE_READ=1
+     HAVE_3_ARG_VFS_UNLINK=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_5_ARG_DO_GENERIC_FILE_READ 0
+#define HAVE_3_ARG_VFS_UNLINK 0
 _ACEOF
 
-     HAVE_5_ARG_DO_GENERIC_FILE_READ=''
+     HAVE_3_ARG_VFS_UNLINK=''
   fi
 
 
@@ -46991,14 +50982,89 @@
 
 
 
+if test "${HAVE_2_ARG_VFS_UNLINK}${HAVE_3_ARG_VFS_UNLINK}" != "1"; then
+
+  cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+  echo "======================================================================"
+  echo "Please review the following configuration information:"
+  echo "  Kernel source directory = $LINUX_SRC"
+  echo "  Kernel build directory = $LINUX_OBJ"
+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+  echo "  Kernel version probed from kernel build = $LINUX_VER"
+  echo "  Kernel running currently = `uname -r`"
+  echo "======================================================================"
+
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+
 
 
 
 
-  echo "$as_me:$LINENO: checking kernel for read_descriptor_t.arg.data" >&5
-echo $ECHO_N "checking kernel for read_descriptor_t.arg.data... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel for 2-arg notify_change" >&5
+echo $ECHO_N "checking kernel for 2-arg notify_change... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -47026,8 +51092,11 @@
 int
 main ()
 {
-read_descriptor_t x;
-          void * tc_1 = x.arg.data;
+
+	#ifndef notify_change /* Must be macro or have a decl */
+	  int x = sizeof(&notify_change);
+	#endif
+	    notify_change(NULL,NULL);
   ;
   return 0;
 }
@@ -47057,7 +51126,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA=yes
+	 cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -47065,27 +51134,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA=no
+	 cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA
+  cr_result=$cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 1
+#define HAVE_2_ARG_NOTIFY_CHANGE 1
 _ACEOF
 
-     HAVE_READ_DESCRIPTOR_T_ARG_DATA=1
+     HAVE_2_ARG_NOTIFY_CHANGE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 0
+#define HAVE_2_ARG_NOTIFY_CHANGE 0
 _ACEOF
 
-     HAVE_READ_DESCRIPTOR_T_ARG_DATA=''
+     HAVE_2_ARG_NOTIFY_CHANGE=''
   fi
 
 
@@ -47097,10 +51166,14 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for read_descriptor_t.buf" >&5
-echo $ECHO_N "checking kernel for read_descriptor_t.buf... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 3-arg notify_change" >&5
+echo $ECHO_N "checking kernel for 3-arg notify_change... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -47128,8 +51201,11 @@
 int
 main ()
 {
-read_descriptor_t x;
-          char tc_1 = *(x.buf);
+
+	#ifndef notify_change /* Must be macro or have a decl */
+	  int x = sizeof(&notify_change);
+	#endif
+	    notify_change(NULL,NULL,NULL);
   ;
   return 0;
 }
@@ -47159,7 +51235,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF=yes
+	 cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -47167,27 +51243,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF=no
+	 cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF
+  cr_result=$cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_READ_DESCRIPTOR_T_BUF 1
+#define HAVE_3_ARG_NOTIFY_CHANGE 1
 _ACEOF
 
-     HAVE_READ_DESCRIPTOR_T_BUF=1
+     HAVE_3_ARG_NOTIFY_CHANGE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_READ_DESCRIPTOR_T_BUF 0
+#define HAVE_3_ARG_NOTIFY_CHANGE 0
 _ACEOF
 
-     HAVE_READ_DESCRIPTOR_T_BUF=''
+     HAVE_3_ARG_NOTIFY_CHANGE=''
   fi
 
 
@@ -47195,7 +51271,9 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test "${HAVE_READ_DESCRIPTOR_T_ARG_DATA}${HAVE_READ_DESCRIPTOR_T_BUF}" != "1"; then
+
+
+if test "${HAVE_2_ARG_NOTIFY_CHANGE}${HAVE_3_ARG_NOTIFY_CHANGE}" != "1"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -47261,8 +51339,8 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -47271,10 +51349,10 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel for splice_direct_to_actor" >&5
-echo $ECHO_N "checking kernel for splice_direct_to_actor... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel for task.ptrace" >&5
+echo $ECHO_N "checking kernel for task.ptrace... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_TASK_PTRACE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -47298,20 +51376,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-	#include <linux/fs.h>
-	#include <linux/splice.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-
-   #ifdef splice_direct_to_actor
-     /* OK, it exists and is a macro */
-   #else
-     /* Check for function case */
-     int x = sizeof(&splice_direct_to_actor);
-   #endif
-
+struct task_struct x;
+          unsigned long tc_1 = x.ptrace;
   ;
   return 0;
 }
@@ -47341,7 +51411,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR=yes
+	 cr_cv_kconfig_HAVE_TASK_PTRACE=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -47349,27 +51419,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR=no
+	 cr_cv_kconfig_HAVE_TASK_PTRACE=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR
+  cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACE
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SPLICE_DIRECT_TO_ACTOR 1
+#define HAVE_TASK_PTRACE 1
 _ACEOF
 
-     HAVE_SPLICE_DIRECT_TO_ACTOR=1
+     HAVE_TASK_PTRACE=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SPLICE_DIRECT_TO_ACTOR 0
+#define HAVE_TASK_PTRACE 0
 _ACEOF
 
-     HAVE_SPLICE_DIRECT_TO_ACTOR=''
+     HAVE_TASK_PTRACE=''
   fi
 
 
@@ -47381,14 +51451,10 @@
 
 
 
+  echo "$as_me:$LINENO: checking kernel for task.ptracees" >&5
+echo $ECHO_N "checking kernel for task.ptracees... $ECHO_C" >&6
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 4-arg vfs_mknod" >&5
-echo $ECHO_N "checking kernel for 4-arg vfs_mknod... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_TASK_PTRACEES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -47412,15 +51478,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-
-	#ifndef vfs_mknod /* Must be macro or have a decl */
-	  int x = sizeof(&vfs_mknod);
-	#endif
-	    vfs_mknod(NULL,NULL,0,0);
+struct task_struct x;
+          struct list_head tc_1 = x.ptracees;
   ;
   return 0;
 }
@@ -47450,7 +51513,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD=yes
+	 cr_cv_kconfig_HAVE_TASK_PTRACEES=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -47458,27 +51521,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD=no
+	 cr_cv_kconfig_HAVE_TASK_PTRACEES=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD
+  cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACEES
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_4_ARG_VFS_MKNOD 1
+#define HAVE_TASK_PTRACEES 1
 _ACEOF
 
-     HAVE_4_ARG_VFS_MKNOD=1
+     HAVE_TASK_PTRACEES=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_4_ARG_VFS_MKNOD 0
+#define HAVE_TASK_PTRACEES 0
 _ACEOF
 
-     HAVE_4_ARG_VFS_MKNOD=''
+     HAVE_TASK_PTRACEES=''
   fi
 
 
@@ -47490,14 +51553,10 @@
 
 
 
+  echo "$as_me:$LINENO: checking kernel for task.ptraced" >&5
+echo $ECHO_N "checking kernel for task.ptraced... $ECHO_C" >&6
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 5-arg vfs_mknod" >&5
-echo $ECHO_N "checking kernel for 5-arg vfs_mknod... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_TASK_PTRACED+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -47521,15 +51580,12 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+		 #include <linux/sched.h>
 int
 main ()
 {
-
-	#ifndef vfs_mknod /* Must be macro or have a decl */
-	  int x = sizeof(&vfs_mknod);
-	#endif
-	    vfs_mknod(NULL,NULL,NULL,0,0);
+struct task_struct x;
+          struct list_head tc_1 = x.ptraced;
   ;
   return 0;
 }
@@ -47559,7 +51615,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD=yes
+	 cr_cv_kconfig_HAVE_TASK_PTRACED=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -47567,27 +51623,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD=no
+	 cr_cv_kconfig_HAVE_TASK_PTRACED=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD
+  cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACED
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_5_ARG_VFS_MKNOD 1
+#define HAVE_TASK_PTRACED 1
 _ACEOF
 
-     HAVE_5_ARG_VFS_MKNOD=1
+     HAVE_TASK_PTRACED=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_5_ARG_VFS_MKNOD 0
+#define HAVE_TASK_PTRACED 0
 _ACEOF
 
-     HAVE_5_ARG_VFS_MKNOD=''
+     HAVE_TASK_PTRACED=''
   fi
 
 
@@ -47595,9 +51651,129 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test -n "${HAVE_TASK_PTRACEES}"; then
 
 
-if test "${HAVE_4_ARG_VFS_MKNOD}${HAVE_5_ARG_VFS_MKNOD}" != "1"; then
+  echo "$as_me:$LINENO: checking kernel symbol table for ptrace_utrace_ops" >&5
+echo $ECHO_N "checking kernel symbol table for ptrace_utrace_ops... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_ptrace_utrace_ops+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_cv_ksymtab_ptrace_utrace_ops=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ptrace_utrace_ops$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_ptrace_utrace_ops"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_ptrace_utrace_ops\$" >/dev/null ; then
+        cr_cv_ksymtab_ptrace_utrace_ops=0
+      fi
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
+int
+main ()
+{
+int x = sizeof(&ptrace_utrace_ops);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_ptrace_utrace_ops="Y$cr_cv_ksymtab_ptrace_utrace_ops"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_ptrace_utrace_ops="N$cr_cv_ksymtab_ptrace_utrace_ops"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    fi
+
+fi
+
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_ptrace_utrace_ops"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_ptrace_utrace_ops" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern struct utrace_engine_ops ptrace_utrace_ops;
+_EOF
+
+    fi
+    cr_result=`echo $cr_cv_ksymtab_ptrace_utrace_ops | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(ptrace_utrace_ops, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_ptrace_utrace_ops $cr_addr
+_ACEOF
+
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+  if test -z "$cr_addr"; then
+    { { echo "$as_me:$LINENO: error: failed to find symbol ptrace_utrace_ops" >&5
+echo "$as_me: error: failed to find symbol ptrace_utrace_ops" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+if test "${HAVE_TASK_PTRACE}${HAVE_TASK_PTRACEES}" != "1"; then
 
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -47663,8 +51839,8 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
@@ -47673,13 +51849,10 @@
 
 
 
+  echo "$as_me:$LINENO: checking kernel for proc_root" >&5
+echo $ECHO_N "checking kernel for proc_root... $ECHO_C" >&6
 
-
-
-  echo "$as_me:$LINENO: checking kernel for 2-arg vfs_unlink" >&5
-echo $ECHO_N "checking kernel for 2-arg vfs_unlink... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK+set}" = set; then
+    if test "${cr_cv_kconfig_HAVE_PROC_ROOT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -47703,15 +51876,13 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+		 #include <linux/proc_fs.h>
 int
 main ()
 {
 
-	#ifndef vfs_unlink /* Must be macro or have a decl */
-	  int x = sizeof(&vfs_unlink);
-	#endif
-	    vfs_unlink(NULL,NULL);
+     int x = sizeof(&proc_root);
+
   ;
   return 0;
 }
@@ -47741,7 +51912,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK=yes
+	 cr_cv_kconfig_HAVE_PROC_ROOT=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -47749,27 +51920,27 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK=no
+	 cr_cv_kconfig_HAVE_PROC_ROOT=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK
+  cr_result=$cr_cv_kconfig_HAVE_PROC_ROOT
 
   if test $cr_result = yes; then
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_ARG_VFS_UNLINK 1
+#define HAVE_PROC_ROOT 1
 _ACEOF
 
-     HAVE_2_ARG_VFS_UNLINK=1
+     HAVE_PROC_ROOT=1
   else
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_ARG_VFS_UNLINK 0
+#define HAVE_PROC_ROOT 0
 _ACEOF
 
-     HAVE_2_ARG_VFS_UNLINK=''
+     HAVE_PROC_ROOT=''
   fi
 
 
@@ -47778,20 +51949,58 @@
 
 
 
+# check kmalloc max size
+
+    echo "$as_me:$LINENO: checking kernel for maximum kmalloc() allocation" >&5
+echo $ECHO_N "checking kernel for maximum kmalloc() allocation... $ECHO_C" >&6
+if test "${cr_cv_kconfig_kmalloc_max+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_kmalloc_default="131072 (default)"
+    cr_header="${LINUX_OBJ}/include/generated/autoconf.h"
+    test -e "$cr_header" || cr_header="${LINUX_OBJ}/include/linux/autoconf.h"
+    cr_cv_kconfig_kmalloc_max=`eval "$CPP $CPPFLAGS -I${LINUX_OBJ}/include \
+			-include ${cr_header} \
+			${LINUX_OBJ}/include/linux/kmalloc_sizes.h" 2>/dev/null | \
+		$PERL -n -e 'BEGIN {$max=0;}' \
+			 -e 'if (/CACHE\s*\(\s*([0-9]+)\s*\)/ && ($1 > $max)) { $max = $1; }' \
+			 -e 'END {print "$max\n";}'`
+    if test $? = 0 -a "$cr_cv_kconfig_kmalloc_max" != 0; then
+      : # OK - keep it
+    else
+      cr_cv_kconfig_kmalloc_max="$cr_kmalloc_default"
+    fi
 
+fi
+echo "$as_me:$LINENO: result: $cr_cv_kconfig_kmalloc_max" >&5
+echo "${ECHO_T}$cr_cv_kconfig_kmalloc_max" >&6
+  cr_kmalloc_max=`echo $cr_cv_kconfig_kmalloc_max | cut -d' ' -f1`
 
+cat >>confdefs.h <<_ACEOF
+#define CR_KMALLOC_MAX $cr_kmalloc_max
+_ACEOF
 
 
 
+## Now we check for some additional (potentially) non-exported kernel symbols...
 
+# DATA
 
-  echo "$as_me:$LINENO: checking kernel for 3-arg vfs_unlink" >&5
-echo $ECHO_N "checking kernel for 3-arg vfs_unlink... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for tasklist_lock" >&5
+echo $ECHO_N "checking kernel symbol table for tasklist_lock... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_tasklist_lock+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_tasklist_lock=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}tasklist_lock$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_tasklist_lock"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_tasklist_lock\$" >/dev/null ; then
+        cr_cv_ksymtab_tasklist_lock=0
+      fi
 
 
   SAVE_CC=$CC
@@ -47812,15 +52021,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-	#ifndef vfs_unlink /* Must be macro or have a decl */
-	  int x = sizeof(&vfs_unlink);
-	#endif
-	    vfs_unlink(NULL,NULL,NULL);
+int x = sizeof(&tasklist_lock);
   ;
   return 0;
 }
@@ -47850,7 +52058,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK=yes
+	 cr_cv_ksymtab_tasklist_lock="Y$cr_cv_ksymtab_tasklist_lock"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -47858,122 +52066,55 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK=no
+	 cr_cv_ksymtab_tasklist_lock="N$cr_cv_ksymtab_tasklist_lock"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_3_ARG_VFS_UNLINK 1
-_ACEOF
-
-     HAVE_3_ARG_VFS_UNLINK=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_tasklist_lock"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_3_ARG_VFS_UNLINK 0
-_ACEOF
-
-     HAVE_3_ARG_VFS_UNLINK=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-
-if test "${HAVE_2_ARG_VFS_UNLINK}${HAVE_3_ARG_VFS_UNLINK}" != "1"; then
-
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+    if expr "$cr_cv_ksymtab_tasklist_lock" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol tasklist_lock but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol tasklist_lock but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_tasklist_lock | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(tasklist_lock, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_tasklist_lock $cr_addr
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
   fi
-fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
-
-
-
-
-
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-  echo "$as_me:$LINENO: checking kernel for 2-arg notify_change" >&5
-echo $ECHO_N "checking kernel for 2-arg notify_change... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for shmem_file_operations" >&5
+echo $ECHO_N "checking kernel symbol table for shmem_file_operations... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_shmem_file_operations+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_shmem_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}shmem_file_operations$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_shmem_file_operations"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_shmem_file_operations\$" >/dev/null ; then
+        cr_cv_ksymtab_shmem_file_operations=0
+      fi
 
 
   SAVE_CC=$CC
@@ -47994,15 +52135,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-	#ifndef notify_change /* Must be macro or have a decl */
-	  int x = sizeof(&notify_change);
-	#endif
-	    notify_change(NULL,NULL);
+int x = sizeof(&shmem_file_operations);
   ;
   return 0;
 }
@@ -48032,7 +52172,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE=yes
+	 cr_cv_ksymtab_shmem_file_operations="Y$cr_cv_ksymtab_shmem_file_operations"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -48040,49 +52180,56 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE=no
+	 cr_cv_ksymtab_shmem_file_operations="N$cr_cv_ksymtab_shmem_file_operations"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_shmem_file_operations"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_shmem_file_operations" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern const struct file_operations shmem_file_operations;
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_ARG_NOTIFY_CHANGE 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_shmem_file_operations | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(shmem_file_operations, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_2_ARG_NOTIFY_CHANGE=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_2_ARG_NOTIFY_CHANGE 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_shmem_file_operations $cr_addr
 _ACEOF
 
-     HAVE_2_ARG_NOTIFY_CHANGE=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking kernel for 3-arg notify_change" >&5
-echo $ECHO_N "checking kernel for 3-arg notify_change... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for ramfs_file_operations" >&5
+echo $ECHO_N "checking kernel symbol table for ramfs_file_operations... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_ramfs_file_operations+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_ramfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ramfs_file_operations$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_ramfs_file_operations"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_ramfs_file_operations\$" >/dev/null ; then
+        cr_cv_ksymtab_ramfs_file_operations=0
+      fi
 
 
   SAVE_CC=$CC
@@ -48103,15 +52250,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/fs.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-	#ifndef notify_change /* Must be macro or have a decl */
-	  int x = sizeof(&notify_change);
-	#endif
-	    notify_change(NULL,NULL,NULL);
+int x = sizeof(&ramfs_file_operations);
   ;
   return 0;
 }
@@ -48141,7 +52287,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE=yes
+	 cr_cv_ksymtab_ramfs_file_operations="Y$cr_cv_ksymtab_ramfs_file_operations"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -48149,119 +52295,56 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE=no
+	 cr_cv_ksymtab_ramfs_file_operations="N$cr_cv_ksymtab_ramfs_file_operations"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_3_ARG_NOTIFY_CHANGE 1
-_ACEOF
-
-     HAVE_3_ARG_NOTIFY_CHANGE=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_ramfs_file_operations"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_3_ARG_NOTIFY_CHANGE 0
-_ACEOF
-
-     HAVE_3_ARG_NOTIFY_CHANGE=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-
-if test "${HAVE_2_ARG_NOTIFY_CHANGE}${HAVE_3_ARG_NOTIFY_CHANGE}" != "1"; then
+    if expr "$cr_cv_ksymtab_ramfs_file_operations" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern const struct file_operations ramfs_file_operations;
+_EOF
 
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+    fi
+    cr_result=`echo $cr_cv_ksymtab_ramfs_file_operations | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(ramfs_file_operations, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_ramfs_file_operations $cr_addr
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
   fi
-fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
-
-
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-  echo "$as_me:$LINENO: checking kernel for task.ptrace" >&5
-echo $ECHO_N "checking kernel for task.ptrace... $ECHO_C" >&6
 
-    if test "${cr_cv_kconfig_HAVE_TASK_PTRACE+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for HPAGE_SHIFT" >&5
+echo $ECHO_N "checking kernel symbol table for HPAGE_SHIFT... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_HPAGE_SHIFT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_HPAGE_SHIFT=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}HPAGE_SHIFT$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_HPAGE_SHIFT"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_HPAGE_SHIFT\$" >/dev/null ; then
+        cr_cv_ksymtab_HPAGE_SHIFT=0
+      fi
 
 
   SAVE_CC=$CC
@@ -48282,12 +52365,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct task_struct x;
-          unsigned long tc_1 = x.ptrace;
+int x = sizeof(&HPAGE_SHIFT);
   ;
   return 0;
 }
@@ -48317,7 +52402,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PTRACE=yes
+	 cr_cv_ksymtab_HPAGE_SHIFT="Y$cr_cv_ksymtab_HPAGE_SHIFT"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -48325,45 +52410,56 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PTRACE=no
+	 cr_cv_ksymtab_HPAGE_SHIFT="N$cr_cv_ksymtab_HPAGE_SHIFT"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACE
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_HPAGE_SHIFT"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_HPAGE_SHIFT" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern unsigned int HPAGE_SHIFT;
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PTRACE 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_HPAGE_SHIFT | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(HPAGE_SHIFT, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_TASK_PTRACE=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PTRACE 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_HPAGE_SHIFT $cr_addr
 _ACEOF
 
-     HAVE_TASK_PTRACE=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-
-
-
-  echo "$as_me:$LINENO: checking kernel for task.ptracees" >&5
-echo $ECHO_N "checking kernel for task.ptracees... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_TASK_PTRACEES+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for phys_base" >&5
+echo $ECHO_N "checking kernel symbol table for phys_base... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_phys_base+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_phys_base=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}phys_base$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_phys_base"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_phys_base\$" >/dev/null ; then
+        cr_cv_ksymtab_phys_base=0
+      fi
 
 
   SAVE_CC=$CC
@@ -48384,12 +52480,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct task_struct x;
-          struct list_head tc_1 = x.ptracees;
+int x = sizeof(&phys_base);
   ;
   return 0;
 }
@@ -48419,7 +52517,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PTRACEES=yes
+	 cr_cv_ksymtab_phys_base="Y$cr_cv_ksymtab_phys_base"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -48427,45 +52525,58 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PTRACEES=no
+	 cr_cv_ksymtab_phys_base="N$cr_cv_ksymtab_phys_base"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACEES
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_phys_base"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_phys_base" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern unsigned long phys_base;
+_EOF
 
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PTRACEES 1
-_ACEOF
+    fi
+    cr_result=`echo $cr_cv_ksymtab_phys_base | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(phys_base, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
 
-     HAVE_TASK_PTRACEES=1
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PTRACEES 0
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_phys_base $cr_addr
 _ACEOF
 
-     HAVE_TASK_PTRACEES=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
+# CODE
 
 
-
-
-  echo "$as_me:$LINENO: checking kernel for task.ptraced" >&5
-echo $ECHO_N "checking kernel for task.ptraced... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_TASK_PTRACED+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for do_pipe" >&5
+echo $ECHO_N "checking kernel symbol table for do_pipe... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_do_pipe+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_do_pipe=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_do_pipe"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_pipe\$" >/dev/null ; then
+        cr_cv_ksymtab_do_pipe=0
+      fi
 
 
   SAVE_CC=$CC
@@ -48486,12 +52597,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/sched.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-struct task_struct x;
-          struct list_head tc_1 = x.ptraced;
+int x = sizeof(&do_pipe);
   ;
   return 0;
 }
@@ -48521,7 +52634,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PTRACED=yes
+	 cr_cv_ksymtab_do_pipe="Y$cr_cv_ksymtab_do_pipe"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -48529,49 +52642,54 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_TASK_PTRACED=no
+	 cr_cv_ksymtab_do_pipe="N$cr_cv_ksymtab_do_pipe"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-
-fi
-
-  cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACED
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PTRACED 1
-_ACEOF
-
-     HAVE_TASK_PTRACED=1
+    fi
+
+fi
+
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_do_pipe"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_TASK_PTRACED 0
+    if expr "$cr_cv_ksymtab_do_pipe" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol do_pipe but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol do_pipe but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    cr_result=`echo $cr_cv_ksymtab_do_pipe | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(do_pipe, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KCODE_do_pipe $cr_addr
 _ACEOF
 
-     HAVE_TASK_PTRACED=''
   fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
+    echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
-if test -n "${HAVE_TASK_PTRACEES}"; then
-
 
-  echo "$as_me:$LINENO: checking kernel symbol table for ptrace_utrace_ops" >&5
-echo $ECHO_N "checking kernel symbol table for ptrace_utrace_ops... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for do_pipe_flags" >&5
+echo $ECHO_N "checking kernel symbol table for do_pipe_flags... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_ptrace_utrace_ops+set}" = set; then
+    if test "${cr_cv_ksymtab_do_pipe_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_ptrace_utrace_ops=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ptrace_utrace_ops$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_ptrace_utrace_ops"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_ptrace_utrace_ops\$" >/dev/null ; then
-        cr_cv_ksymtab_ptrace_utrace_ops=0
+    cr_cv_ksymtab_do_pipe_flags=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe_flags$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_do_pipe_flags"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_pipe_flags\$" >/dev/null ; then
+        cr_cv_ksymtab_do_pipe_flags=0
       fi
 
 
@@ -48600,7 +52718,7 @@
 int
 main ()
 {
-int x = sizeof(&ptrace_utrace_ops);
+int x = sizeof(&do_pipe_flags);
   ;
   return 0;
 }
@@ -48630,7 +52748,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_ptrace_utrace_ops="Y$cr_cv_ksymtab_ptrace_utrace_ops"
+	 cr_cv_ksymtab_do_pipe_flags="Y$cr_cv_ksymtab_do_pipe_flags"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -48638,7 +52756,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_ptrace_utrace_ops="N$cr_cv_ksymtab_ptrace_utrace_ops"
+	 cr_cv_ksymtab_do_pipe_flags="N$cr_cv_ksymtab_do_pipe_flags"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -48647,121 +52765,46 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_ptrace_utrace_ops"; then
+  if test -z "$cr_cv_ksymtab_do_pipe_flags"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_ptrace_utrace_ops" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern struct utrace_engine_ops ptrace_utrace_ops;
-_EOF
-
+    if expr "$cr_cv_ksymtab_do_pipe_flags" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol do_pipe_flags but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol do_pipe_flags but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
     fi
-    cr_result=`echo $cr_cv_ksymtab_ptrace_utrace_ops | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_do_pipe_flags | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(ptrace_utrace_ops, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(do_pipe_flags, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_ptrace_utrace_ops $cr_addr
+#define CR_KCODE_do_pipe_flags $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-  if test -z "$cr_addr"; then
-    { { echo "$as_me:$LINENO: error: failed to find symbol ptrace_utrace_ops" >&5
-echo "$as_me: error: failed to find symbol ptrace_utrace_ops" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-if test "${HAVE_TASK_PTRACE}${HAVE_TASK_PTRACEES}" != "1"; then
-
-  cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-  echo "======================================================================"
-  echo "Please review the following configuration information:"
-  echo "  Kernel source directory = $LINUX_SRC"
-  echo "  Kernel build directory = $LINUX_OBJ"
-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-  echo "  Kernel version probed from kernel build = $LINUX_VER"
-  echo "  Kernel running currently = `uname -r`"
-  echo "======================================================================"
-
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
 
 
-
-
-  echo "$as_me:$LINENO: checking kernel for proc_root" >&5
-echo $ECHO_N "checking kernel for proc_root... $ECHO_C" >&6
-
-    if test "${cr_cv_kconfig_HAVE_PROC_ROOT+set}" = set; then
+  echo "$as_me:$LINENO: checking kernel symbol table for sys_munmap" >&5
+echo $ECHO_N "checking kernel symbol table for sys_munmap... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_sys_munmap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+    cr_cv_ksymtab_sys_munmap=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_munmap$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_sys_munmap"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_munmap\$" >/dev/null ; then
+        cr_cv_ksymtab_sys_munmap=0
+      fi
 
 
   SAVE_CC=$CC
@@ -48782,13 +52825,14 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <linux/proc_fs.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
 int
 main ()
 {
-
-     int x = sizeof(&proc_root);
-
+int x = sizeof(&sys_munmap);
   ;
   return 0;
 }
@@ -48818,7 +52862,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PROC_ROOT=yes
+	 cr_cv_ksymtab_sys_munmap="Y$cr_cv_ksymtab_sys_munmap"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -48826,84 +52870,55 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_kconfig_HAVE_PROC_ROOT=no
+	 cr_cv_ksymtab_sys_munmap="N$cr_cv_ksymtab_sys_munmap"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    fi
 
 fi
 
-  cr_result=$cr_cv_kconfig_HAVE_PROC_ROOT
-
-  if test $cr_result = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PROC_ROOT 1
-_ACEOF
-
-     HAVE_PROC_ROOT=1
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_sys_munmap"; then
+    cr_result='not found'
   else
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PROC_ROOT 0
-_ACEOF
-
-     HAVE_PROC_ROOT=''
-  fi
-
-
-  echo "$as_me:$LINENO: result: $cr_result" >&5
-echo "${ECHO_T}$cr_result" >&6
-
-
-
-# check kmalloc max size
-
-    echo "$as_me:$LINENO: checking kernel for maximum kmalloc() allocation" >&5
-echo $ECHO_N "checking kernel for maximum kmalloc() allocation... $ECHO_C" >&6
-if test "${cr_cv_kconfig_kmalloc_max+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+    if expr "$cr_cv_ksymtab_sys_munmap" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern asmlinkage long sys_munmap(unsigned long addr, size_t len);
+_EOF
 
-    cr_kmalloc_default="131072 (default)"
-    cr_cv_kconfig_kmalloc_max=`eval "$CPP $CPPFLAGS -I${LINUX_OBJ}/include \
-			-include ${LINUX_OBJ}/include/linux/autoconf.h\
-			${LINUX_OBJ}/include/linux/kmalloc_sizes.h" 2>/dev/null | \
-		$PERL -n -e 'BEGIN {$max=0;}' \
-			 -e 'if (/CACHE\s*\(\s*([0-9]+)\s*\)/ && ($1 > $max)) { $max = $1; }' \
-			 -e 'END {print "$max\n";}'`
-    if test $? = 0 -a "$cr_cv_kconfig_kmalloc_max" != 0; then
-      : # OK - keep it
+    fi
+    cr_result=`echo $cr_cv_ksymtab_sys_munmap | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
     else
-      cr_cv_kconfig_kmalloc_max="$cr_kmalloc_default"
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KCODE(sys_munmap, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
-fi
-echo "$as_me:$LINENO: result: $cr_cv_kconfig_kmalloc_max" >&5
-echo "${ECHO_T}$cr_cv_kconfig_kmalloc_max" >&6
-  cr_kmalloc_max=`echo $cr_cv_kconfig_kmalloc_max | cut -d' ' -f1`
-
 cat >>confdefs.h <<_ACEOF
-#define CR_KMALLOC_MAX $cr_kmalloc_max
+#define CR_KCODE_sys_munmap $cr_addr
 _ACEOF
 
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
 
 
-## Now we check for some additional (potentially) non-exported kernel symbols...
-
-# DATA
-
 
-  echo "$as_me:$LINENO: checking kernel symbol table for tasklist_lock" >&5
-echo $ECHO_N "checking kernel symbol table for tasklist_lock... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for sys_dup2" >&5
+echo $ECHO_N "checking kernel symbol table for sys_dup2... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_tasklist_lock+set}" = set; then
+    if test "${cr_cv_ksymtab_sys_dup2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_tasklist_lock=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}tasklist_lock$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_tasklist_lock"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_tasklist_lock\$" >/dev/null ; then
-        cr_cv_ksymtab_tasklist_lock=0
+    cr_cv_ksymtab_sys_dup2=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_dup2$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_sys_dup2"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_dup2\$" >/dev/null ; then
+        cr_cv_ksymtab_sys_dup2=0
       fi
 
 
@@ -48932,7 +52947,7 @@
 int
 main ()
 {
-int x = sizeof(&tasklist_lock);
+int x = sizeof(&sys_dup2);
   ;
   return 0;
 }
@@ -48962,7 +52977,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_tasklist_lock="Y$cr_cv_ksymtab_tasklist_lock"
+	 cr_cv_ksymtab_sys_dup2="Y$cr_cv_ksymtab_sys_dup2"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -48970,7 +52985,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_tasklist_lock="N$cr_cv_ksymtab_tasklist_lock"
+	 cr_cv_ksymtab_sys_dup2="N$cr_cv_ksymtab_sys_dup2"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -48979,25 +52994,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_tasklist_lock"; then
+  if test -z "$cr_cv_ksymtab_sys_dup2"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_tasklist_lock" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol tasklist_lock but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol tasklist_lock but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_sys_dup2" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd);
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab_tasklist_lock | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_sys_dup2 | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(tasklist_lock, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(sys_dup2, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_tasklist_lock $cr_addr
+#define CR_KCODE_sys_dup2 $cr_addr
 _ACEOF
 
   fi
@@ -49006,18 +53022,18 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for shmem_file_operations" >&5
-echo $ECHO_N "checking kernel symbol table for shmem_file_operations... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for sys_lseek" >&5
+echo $ECHO_N "checking kernel symbol table for sys_lseek... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_shmem_file_operations+set}" = set; then
+    if test "${cr_cv_ksymtab_sys_lseek+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_shmem_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}shmem_file_operations$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_shmem_file_operations"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_shmem_file_operations\$" >/dev/null ; then
-        cr_cv_ksymtab_shmem_file_operations=0
+    cr_cv_ksymtab_sys_lseek=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_lseek$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_sys_lseek"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_lseek\$" >/dev/null ; then
+        cr_cv_ksymtab_sys_lseek=0
       fi
 
 
@@ -49046,7 +53062,7 @@
 int
 main ()
 {
-int x = sizeof(&shmem_file_operations);
+int x = sizeof(&sys_lseek);
   ;
   return 0;
 }
@@ -49076,7 +53092,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_shmem_file_operations="Y$cr_cv_ksymtab_shmem_file_operations"
+	 cr_cv_ksymtab_sys_lseek="Y$cr_cv_ksymtab_sys_lseek"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -49084,7 +53100,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_shmem_file_operations="N$cr_cv_ksymtab_shmem_file_operations"
+	 cr_cv_ksymtab_sys_lseek="N$cr_cv_ksymtab_sys_lseek"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -49093,26 +53109,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_shmem_file_operations"; then
+  if test -z "$cr_cv_ksymtab_sys_lseek"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_shmem_file_operations" : N >/dev/null; then
+    if expr "$cr_cv_ksymtab_sys_lseek" : N >/dev/null; then
       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern const struct file_operations shmem_file_operations;
+extern asmlinkage off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin);
 _EOF
 
     fi
-    cr_result=`echo $cr_cv_ksymtab_shmem_file_operations | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_sys_lseek | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(shmem_file_operations, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(sys_lseek, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_shmem_file_operations $cr_addr
+#define CR_KCODE_sys_lseek $cr_addr
 _ACEOF
 
   fi
@@ -49121,18 +53137,18 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for ramfs_file_operations" >&5
-echo $ECHO_N "checking kernel symbol table for ramfs_file_operations... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for sys_ftruncate" >&5
+echo $ECHO_N "checking kernel symbol table for sys_ftruncate... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_ramfs_file_operations+set}" = set; then
+    if test "${cr_cv_ksymtab_sys_ftruncate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_ramfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ramfs_file_operations$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_ramfs_file_operations"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_ramfs_file_operations\$" >/dev/null ; then
-        cr_cv_ksymtab_ramfs_file_operations=0
+    cr_cv_ksymtab_sys_ftruncate=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_ftruncate$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_sys_ftruncate"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_ftruncate\$" >/dev/null ; then
+        cr_cv_ksymtab_sys_ftruncate=0
       fi
 
 
@@ -49161,7 +53177,7 @@
 int
 main ()
 {
-int x = sizeof(&ramfs_file_operations);
+int x = sizeof(&sys_ftruncate);
   ;
   return 0;
 }
@@ -49191,7 +53207,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_ramfs_file_operations="Y$cr_cv_ksymtab_ramfs_file_operations"
+	 cr_cv_ksymtab_sys_ftruncate="Y$cr_cv_ksymtab_sys_ftruncate"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -49199,7 +53215,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_ramfs_file_operations="N$cr_cv_ksymtab_ramfs_file_operations"
+	 cr_cv_ksymtab_sys_ftruncate="N$cr_cv_ksymtab_sys_ftruncate"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -49208,26 +53224,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_ramfs_file_operations"; then
+  if test -z "$cr_cv_ksymtab_sys_ftruncate"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_ramfs_file_operations" : N >/dev/null; then
+    if expr "$cr_cv_ksymtab_sys_ftruncate" : N >/dev/null; then
       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern const struct file_operations ramfs_file_operations;
+extern asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
 _EOF
 
     fi
-    cr_result=`echo $cr_cv_ksymtab_ramfs_file_operations | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_sys_ftruncate | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(ramfs_file_operations, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(sys_ftruncate, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_ramfs_file_operations $cr_addr
+#define CR_KCODE_sys_ftruncate $cr_addr
 _ACEOF
 
   fi
@@ -49236,18 +53252,18 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for HPAGE_SHIFT" >&5
-echo $ECHO_N "checking kernel symbol table for HPAGE_SHIFT... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for sys_mprotect" >&5
+echo $ECHO_N "checking kernel symbol table for sys_mprotect... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_HPAGE_SHIFT+set}" = set; then
+    if test "${cr_cv_ksymtab_sys_mprotect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_HPAGE_SHIFT=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}HPAGE_SHIFT$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_HPAGE_SHIFT"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_HPAGE_SHIFT\$" >/dev/null ; then
-        cr_cv_ksymtab_HPAGE_SHIFT=0
+    cr_cv_ksymtab_sys_mprotect=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_mprotect$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_sys_mprotect"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_mprotect\$" >/dev/null ; then
+        cr_cv_ksymtab_sys_mprotect=0
       fi
 
 
@@ -49276,7 +53292,7 @@
 int
 main ()
 {
-int x = sizeof(&HPAGE_SHIFT);
+int x = sizeof(&sys_mprotect);
   ;
   return 0;
 }
@@ -49306,7 +53322,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_HPAGE_SHIFT="Y$cr_cv_ksymtab_HPAGE_SHIFT"
+	 cr_cv_ksymtab_sys_mprotect="Y$cr_cv_ksymtab_sys_mprotect"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -49314,7 +53330,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_HPAGE_SHIFT="N$cr_cv_ksymtab_HPAGE_SHIFT"
+	 cr_cv_ksymtab_sys_mprotect="N$cr_cv_ksymtab_sys_mprotect"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -49323,26 +53339,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_HPAGE_SHIFT"; then
+  if test -z "$cr_cv_ksymtab_sys_mprotect"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_HPAGE_SHIFT" : N >/dev/null; then
+    if expr "$cr_cv_ksymtab_sys_mprotect" : N >/dev/null; then
       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern unsigned int HPAGE_SHIFT;
+extern asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot);
 _EOF
 
     fi
-    cr_result=`echo $cr_cv_ksymtab_HPAGE_SHIFT | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_sys_mprotect | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(HPAGE_SHIFT, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(sys_mprotect, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_HPAGE_SHIFT $cr_addr
+#define CR_KCODE_sys_mprotect $cr_addr
 _ACEOF
 
   fi
@@ -49351,18 +53367,18 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for phys_base" >&5
-echo $ECHO_N "checking kernel symbol table for phys_base... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for sys_setitimer" >&5
+echo $ECHO_N "checking kernel symbol table for sys_setitimer... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_phys_base+set}" = set; then
+    if test "${cr_cv_ksymtab_sys_setitimer+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_phys_base=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}phys_base$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_phys_base"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_phys_base\$" >/dev/null ; then
-        cr_cv_ksymtab_phys_base=0
+    cr_cv_ksymtab_sys_setitimer=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setitimer$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_sys_setitimer"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_setitimer\$" >/dev/null ; then
+        cr_cv_ksymtab_sys_setitimer=0
       fi
 
 
@@ -49391,7 +53407,7 @@
 int
 main ()
 {
-int x = sizeof(&phys_base);
+int x = sizeof(&sys_setitimer);
   ;
   return 0;
 }
@@ -49421,7 +53437,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_phys_base="Y$cr_cv_ksymtab_phys_base"
+	 cr_cv_ksymtab_sys_setitimer="Y$cr_cv_ksymtab_sys_setitimer"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -49429,7 +53445,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_phys_base="N$cr_cv_ksymtab_phys_base"
+	 cr_cv_ksymtab_sys_setitimer="N$cr_cv_ksymtab_sys_setitimer"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -49438,26 +53454,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_phys_base"; then
+  if test -z "$cr_cv_ksymtab_sys_setitimer"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_phys_base" : N >/dev/null; then
+    if expr "$cr_cv_ksymtab_sys_setitimer" : N >/dev/null; then
       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern unsigned long phys_base;
+extern asmlinkage long sys_setitimer(int which, struct itimerval *value, struct itimerval *ovalue);
 _EOF
 
     fi
-    cr_result=`echo $cr_cv_ksymtab_phys_base | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_sys_setitimer | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KDATA(phys_base, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(sys_setitimer, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KDATA_phys_base $cr_addr
+#define CR_KCODE_sys_setitimer $cr_addr
 _ACEOF
 
   fi
@@ -49465,21 +53481,19 @@
 echo "${ECHO_T}$cr_result" >&6
 
 
-# CODE
-
 
-  echo "$as_me:$LINENO: checking kernel symbol table for do_pipe" >&5
-echo $ECHO_N "checking kernel symbol table for do_pipe... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for sys_prctl" >&5
+echo $ECHO_N "checking kernel symbol table for sys_prctl... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_do_pipe+set}" = set; then
+    if test "${cr_cv_ksymtab_sys_prctl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_do_pipe=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_do_pipe"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_pipe\$" >/dev/null ; then
-        cr_cv_ksymtab_do_pipe=0
+    cr_cv_ksymtab_sys_prctl=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_prctl$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_sys_prctl"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_prctl\$" >/dev/null ; then
+        cr_cv_ksymtab_sys_prctl=0
       fi
 
 
@@ -49508,7 +53522,7 @@
 int
 main ()
 {
-int x = sizeof(&do_pipe);
+int x = sizeof(&sys_prctl);
   ;
   return 0;
 }
@@ -49538,7 +53552,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_do_pipe="Y$cr_cv_ksymtab_do_pipe"
+	 cr_cv_ksymtab_sys_prctl="Y$cr_cv_ksymtab_sys_prctl"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -49546,7 +53560,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_do_pipe="N$cr_cv_ksymtab_do_pipe"
+	 cr_cv_ksymtab_sys_prctl="N$cr_cv_ksymtab_sys_prctl"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -49555,25 +53569,26 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_do_pipe"; then
+  if test -z "$cr_cv_ksymtab_sys_prctl"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_do_pipe" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol do_pipe but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol do_pipe but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_sys_prctl" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5);
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab_do_pipe | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_sys_prctl | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(do_pipe, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(sys_prctl, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_do_pipe $cr_addr
+#define CR_KCODE_sys_prctl $cr_addr
 _ACEOF
 
   fi
@@ -49582,18 +53597,19 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for do_pipe_flags" >&5
-echo $ECHO_N "checking kernel symbol table for do_pipe_flags... $ECHO_C" >&6
+
+  echo "$as_me:$LINENO: checking kernel symbol table for copy_fs_struct" >&5
+echo $ECHO_N "checking kernel symbol table for copy_fs_struct... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_do_pipe_flags+set}" = set; then
+    if test "${cr_cv_ksymtab_copy_fs_struct+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_do_pipe_flags=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe_flags$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_do_pipe_flags"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_pipe_flags\$" >/dev/null ; then
-        cr_cv_ksymtab_do_pipe_flags=0
+    cr_cv_ksymtab_copy_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_fs_struct$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_copy_fs_struct"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_copy_fs_struct\$" >/dev/null ; then
+        cr_cv_ksymtab_copy_fs_struct=0
       fi
 
 
@@ -49622,7 +53638,7 @@
 int
 main ()
 {
-int x = sizeof(&do_pipe_flags);
+int x = sizeof(&copy_fs_struct);
   ;
   return 0;
 }
@@ -49652,7 +53668,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_do_pipe_flags="Y$cr_cv_ksymtab_do_pipe_flags"
+	 cr_cv_ksymtab_copy_fs_struct="Y$cr_cv_ksymtab_copy_fs_struct"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -49660,7 +53676,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_do_pipe_flags="N$cr_cv_ksymtab_do_pipe_flags"
+	 cr_cv_ksymtab_copy_fs_struct="N$cr_cv_ksymtab_copy_fs_struct"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -49669,25 +53685,25 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_do_pipe_flags"; then
+  if test -z "$cr_cv_ksymtab_copy_fs_struct"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_do_pipe_flags" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol do_pipe_flags but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol do_pipe_flags but no declaration -- please file a bug report." >&2;}
+    if expr "$cr_cv_ksymtab_copy_fs_struct" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol copy_fs_struct but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol copy_fs_struct but no declaration -- please file a bug report." >&2;}
    { (exit 1); exit 1; }; }
     fi
-    cr_result=`echo $cr_cv_ksymtab_do_pipe_flags | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_copy_fs_struct | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(do_pipe_flags, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(copy_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_do_pipe_flags $cr_addr
+#define CR_KCODE_copy_fs_struct $cr_addr
 _ACEOF
 
   fi
@@ -49696,18 +53712,18 @@
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for sys_munmap" >&5
-echo $ECHO_N "checking kernel symbol table for sys_munmap... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for put_fs_struct" >&5
+echo $ECHO_N "checking kernel symbol table for put_fs_struct... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_sys_munmap+set}" = set; then
+    if test "${cr_cv_ksymtab_put_fs_struct+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_sys_munmap=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_munmap$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_sys_munmap"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_munmap\$" >/dev/null ; then
-        cr_cv_ksymtab_sys_munmap=0
+    cr_cv_ksymtab_put_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}put_fs_struct$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_put_fs_struct"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_put_fs_struct\$" >/dev/null ; then
+        cr_cv_ksymtab_put_fs_struct=0
       fi
 
 
@@ -49736,7 +53752,7 @@
 int
 main ()
 {
-int x = sizeof(&sys_munmap);
+int x = sizeof(&put_fs_struct);
   ;
   return 0;
 }
@@ -49766,7 +53782,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_munmap="Y$cr_cv_ksymtab_sys_munmap"
+	 cr_cv_ksymtab_put_fs_struct="Y$cr_cv_ksymtab_put_fs_struct"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -49774,7 +53790,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_munmap="N$cr_cv_ksymtab_sys_munmap"
+	 cr_cv_ksymtab_put_fs_struct="N$cr_cv_ksymtab_put_fs_struct"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -49783,46 +53799,46 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_sys_munmap"; then
+  if test -z "$cr_cv_ksymtab_put_fs_struct"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_sys_munmap" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern asmlinkage long sys_munmap(unsigned long addr, size_t len);
-_EOF
-
+    if expr "$cr_cv_ksymtab_put_fs_struct" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol put_fs_struct but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol put_fs_struct but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
     fi
-    cr_result=`echo $cr_cv_ksymtab_sys_munmap | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_put_fs_struct | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(sys_munmap, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(put_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_sys_munmap $cr_addr
+#define CR_KCODE_put_fs_struct $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+if test -z "$cr_addr"; then
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for sys_dup2" >&5
-echo $ECHO_N "checking kernel symbol table for sys_dup2... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for free_fs_struct" >&5
+echo $ECHO_N "checking kernel symbol table for free_fs_struct... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_sys_dup2+set}" = set; then
+    if test "${cr_cv_ksymtab_free_fs_struct+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_sys_dup2=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_dup2$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_sys_dup2"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_dup2\$" >/dev/null ; then
-        cr_cv_ksymtab_sys_dup2=0
+    cr_cv_ksymtab_free_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_fs_struct$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_free_fs_struct"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_free_fs_struct\$" >/dev/null ; then
+        cr_cv_ksymtab_free_fs_struct=0
       fi
 
 
@@ -49851,7 +53867,7 @@
 int
 main ()
 {
-int x = sizeof(&sys_dup2);
+int x = sizeof(&free_fs_struct);
   ;
   return 0;
 }
@@ -49881,7 +53897,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_dup2="Y$cr_cv_ksymtab_sys_dup2"
+	 cr_cv_ksymtab_free_fs_struct="Y$cr_cv_ksymtab_free_fs_struct"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -49889,7 +53905,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_dup2="N$cr_cv_ksymtab_sys_dup2"
+	 cr_cv_ksymtab_free_fs_struct="N$cr_cv_ksymtab_free_fs_struct"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -49898,47 +53914,50 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_sys_dup2"; then
+  if test -z "$cr_cv_ksymtab_free_fs_struct"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_sys_dup2" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd);
-_EOF
-
+    if expr "$cr_cv_ksymtab_free_fs_struct" : N >/dev/null; then
+      { { echo "$as_me:$LINENO: error: Found symbol free_fs_struct but no declaration -- please file a bug report." >&5
+echo "$as_me: error: Found symbol free_fs_struct but no declaration -- please file a bug report." >&2;}
+   { (exit 1); exit 1; }; }
     fi
-    cr_result=`echo $cr_cv_ksymtab_sys_dup2 | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_free_fs_struct | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(sys_dup2, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(free_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_sys_dup2 $cr_addr
+#define CR_KCODE_free_fs_struct $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+  if test -z "$cr_addr"; then
+    { { echo "$as_me:$LINENO: error: failed to find either symbol put_fs_struct or free_fs_struct" >&5
+echo "$as_me: error: failed to find either symbol put_fs_struct or free_fs_struct" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+# Check for auditing support
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for sys_lseek" >&5
-echo $ECHO_N "checking kernel symbol table for sys_lseek... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_sys_lseek+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking kernel for CONFIG_AUDITSYSCALL" >&5
+echo $ECHO_N "checking kernel for CONFIG_AUDITSYSCALL... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_CONFIG_AUDITSYSCALL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_sys_lseek=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_lseek$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_sys_lseek"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_lseek\$" >/dev/null ; then
-        cr_cv_ksymtab_sys_lseek=0
-      fi
 
 
   SAVE_CC=$CC
@@ -49960,13 +53979,14 @@
 		 #endif
 		 #include <linux/types.h>
 
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
 int
 main ()
 {
-int x = sizeof(&sys_lseek);
+
+   #ifndef CONFIG_AUDITSYSCALL
+     choke me
+   #endif
+
   ;
   return 0;
 }
@@ -49996,7 +54016,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_lseek="Y$cr_cv_ksymtab_sys_lseek"
+	 cr_cv_kconfig_HAVE_CONFIG_AUDITSYSCALL=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -50004,56 +54024,46 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_lseek="N$cr_cv_ksymtab_sys_lseek"
+	 cr_cv_kconfig_HAVE_CONFIG_AUDITSYSCALL=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_sys_lseek"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_sys_lseek" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern asmlinkage off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_CONFIG_AUDITSYSCALL
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_sys_lseek | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(sys_lseek, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_CONFIG_AUDITSYSCALL 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_sys_lseek $cr_addr
+     HAVE_CONFIG_AUDITSYSCALL=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_CONFIG_AUDITSYSCALL 0
 _ACEOF
 
+     HAVE_CONFIG_AUDITSYSCALL=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
+if test -n "${HAVE_CONFIG_AUDITSYSCALL}"; then
 
-  echo "$as_me:$LINENO: checking kernel symbol table for sys_ftruncate" >&5
-echo $ECHO_N "checking kernel symbol table for sys_ftruncate... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_sys_ftruncate+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for audit_dummy_context" >&5
+echo $ECHO_N "checking kernel for audit_dummy_context... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_AUDIT_DUMMY_CONTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_sys_ftruncate=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_ftruncate$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_sys_ftruncate"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_ftruncate\$" >/dev/null ; then
-        cr_cv_ksymtab_sys_ftruncate=0
-      fi
 
 
   SAVE_CC=$CC
@@ -50074,14 +54084,18 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-
+		 #include <linux/audit.h>
 int
 main ()
 {
-int x = sizeof(&sys_ftruncate);
+
+   #ifdef audit_dummy_context
+     /* OK, it exists and is a macro */
+   #else
+     /* Check for function case */
+     int x = sizeof(&audit_dummy_context);
+   #endif
+
   ;
   return 0;
 }
@@ -50111,7 +54125,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_ftruncate="Y$cr_cv_ksymtab_sys_ftruncate"
+	 cr_cv_kconfig_HAVE_AUDIT_DUMMY_CONTEXT=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -50119,56 +54133,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_ftruncate="N$cr_cv_ksymtab_sys_ftruncate"
+	 cr_cv_kconfig_HAVE_AUDIT_DUMMY_CONTEXT=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_sys_ftruncate"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_sys_ftruncate" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_AUDIT_DUMMY_CONTEXT
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_sys_ftruncate | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(sys_ftruncate, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_AUDIT_DUMMY_CONTEXT 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_sys_ftruncate $cr_addr
+     HAVE_AUDIT_DUMMY_CONTEXT=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_AUDIT_DUMMY_CONTEXT 0
 _ACEOF
 
+     HAVE_AUDIT_DUMMY_CONTEXT=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for sys_mprotect" >&5
-echo $ECHO_N "checking kernel symbol table for sys_mprotect... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_sys_mprotect+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 2.6.6 audit_syscall_exit" >&5
+echo $ECHO_N "checking kernel for 2.6.6 audit_syscall_exit... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_6_6_AUDIT_SYSCALL_EXIT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_sys_mprotect=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_mprotect$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_sys_mprotect"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_mprotect\$" >/dev/null ; then
-        cr_cv_ksymtab_sys_mprotect=0
-      fi
 
 
   SAVE_CC=$CC
@@ -50190,13 +54193,19 @@
 		 #endif
 		 #include <linux/types.h>
 
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+        #include <linux/audit.h>
+        #ifdef AUDITSC_RESULT
+          choke me
+        #endif
 
 int
 main ()
 {
-int x = sizeof(&sys_mprotect);
+
+	#ifndef audit_syscall_exit /* Must be macro or have a decl */
+	  int x = sizeof(&audit_syscall_exit);
+	#endif
+	    audit_syscall_exit(NULL,0);
   ;
   return 0;
 }
@@ -50226,7 +54235,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_mprotect="Y$cr_cv_ksymtab_sys_mprotect"
+	 cr_cv_kconfig_HAVE_2_6_6_AUDIT_SYSCALL_EXIT=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -50234,56 +54243,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_mprotect="N$cr_cv_ksymtab_sys_mprotect"
+	 cr_cv_kconfig_HAVE_2_6_6_AUDIT_SYSCALL_EXIT=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_sys_mprotect"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_sys_mprotect" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_2_6_6_AUDIT_SYSCALL_EXIT
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_sys_mprotect | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(sys_mprotect, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_6_AUDIT_SYSCALL_EXIT 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_sys_mprotect $cr_addr
+     HAVE_2_6_6_AUDIT_SYSCALL_EXIT=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_6_AUDIT_SYSCALL_EXIT 0
 _ACEOF
 
+     HAVE_2_6_6_AUDIT_SYSCALL_EXIT=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for sys_setitimer" >&5
-echo $ECHO_N "checking kernel symbol table for sys_setitimer... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_sys_setitimer+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 2.6.12 audit_syscall_exit" >&5
+echo $ECHO_N "checking kernel for 2.6.12 audit_syscall_exit... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_6_12_AUDIT_SYSCALL_EXIT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_sys_setitimer=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setitimer$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_sys_setitimer"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_setitimer\$" >/dev/null ; then
-        cr_cv_ksymtab_sys_setitimer=0
-      fi
 
 
   SAVE_CC=$CC
@@ -50305,13 +54303,19 @@
 		 #endif
 		 #include <linux/types.h>
 
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+        #include <linux/audit.h>
+        #ifndef AUDITSC_RESULT
+          choke me
+        #endif
 
 int
 main ()
 {
-int x = sizeof(&sys_setitimer);
+
+	#ifndef audit_syscall_exit /* Must be macro or have a decl */
+	  int x = sizeof(&audit_syscall_exit);
+	#endif
+	    audit_syscall_exit(NULL,AUDITSC_RESULT(0),0);
   ;
   return 0;
 }
@@ -50341,7 +54345,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_setitimer="Y$cr_cv_ksymtab_sys_setitimer"
+	 cr_cv_kconfig_HAVE_2_6_12_AUDIT_SYSCALL_EXIT=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -50349,56 +54353,45 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_setitimer="N$cr_cv_ksymtab_sys_setitimer"
+	 cr_cv_kconfig_HAVE_2_6_12_AUDIT_SYSCALL_EXIT=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_sys_setitimer"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_sys_setitimer" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern asmlinkage long sys_setitimer(int which, struct itimerval *value, struct itimerval *ovalue);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_2_6_12_AUDIT_SYSCALL_EXIT
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_sys_setitimer | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(sys_setitimer, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_12_AUDIT_SYSCALL_EXIT 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_sys_setitimer $cr_addr
+     HAVE_2_6_12_AUDIT_SYSCALL_EXIT=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_12_AUDIT_SYSCALL_EXIT 0
 _ACEOF
 
+     HAVE_2_6_12_AUDIT_SYSCALL_EXIT=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for sys_prctl" >&5
-echo $ECHO_N "checking kernel symbol table for sys_prctl... $ECHO_C" >&6
-  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-  # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_sys_prctl+set}" = set; then
+
+
+
+  echo "$as_me:$LINENO: checking kernel for 2.6.17 audit_syscall_exit" >&5
+echo $ECHO_N "checking kernel for 2.6.17 audit_syscall_exit... $ECHO_C" >&6
+
+    if test "${cr_cv_kconfig_HAVE_2_6_17_AUDIT_SYSCALL_EXIT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_sys_prctl=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_prctl$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_sys_prctl"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_prctl\$" >/dev/null ; then
-        cr_cv_ksymtab_sys_prctl=0
-      fi
 
 
   SAVE_CC=$CC
@@ -50420,13 +54413,19 @@
 		 #endif
 		 #include <linux/types.h>
 
-		#define IN_CONFIGURE 1
-		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+        #include <linux/audit.h>
+        #ifndef AUDITSC_RESULT
+          choke me
+        #endif
 
 int
 main ()
 {
-int x = sizeof(&sys_prctl);
+
+	#ifndef audit_syscall_exit /* Must be macro or have a decl */
+	  int x = sizeof(&audit_syscall_exit);
+	#endif
+	    audit_syscall_exit(AUDITSC_RESULT(0),0);
   ;
   return 0;
 }
@@ -50456,7 +54455,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_prctl="Y$cr_cv_ksymtab_sys_prctl"
+	 cr_cv_kconfig_HAVE_2_6_17_AUDIT_SYSCALL_EXIT=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -50464,56 +54463,54 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_sys_prctl="N$cr_cv_ksymtab_sys_prctl"
+	 cr_cv_kconfig_HAVE_2_6_17_AUDIT_SYSCALL_EXIT=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    fi
 
 fi
 
-  cr_addr=''
-  if test -z "$cr_cv_ksymtab_sys_prctl"; then
-    cr_result='not found'
-  else
-    if expr "$cr_cv_ksymtab_sys_prctl" : N >/dev/null; then
-      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-extern asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5);
-_EOF
+  cr_result=$cr_cv_kconfig_HAVE_2_6_17_AUDIT_SYSCALL_EXIT
 
-    fi
-    cr_result=`echo $cr_cv_ksymtab_sys_prctl | tr -d 'YN'`
-    if test $cr_result = 0; then
-      cr_result=exported
-      cr_addr=0
-    else
-      cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(sys_prctl, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-    fi
+  if test $cr_result = yes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_17_AUDIT_SYSCALL_EXIT 1
+_ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_sys_prctl $cr_addr
+     HAVE_2_6_17_AUDIT_SYSCALL_EXIT=1
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_2_6_17_AUDIT_SYSCALL_EXIT 0
 _ACEOF
 
+     HAVE_2_6_17_AUDIT_SYSCALL_EXIT=''
   fi
-    echo "$as_me:$LINENO: result: $cr_result" >&5
+
+
+  echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
 
+  if test x"${HAVE_2_6_6_AUDIT_SYSCALL_EXIT}${HAVE_2_6_12_AUDIT_SYSCALL_EXIT}${HAVE_2_6_17_AUDIT_SYSCALL_EXIT}" != x"1"; then
+    { { echo "$as_me:$LINENO: error: failed to determine arguments to audit_syscall_exit()" >&5
+echo "$as_me: error: failed to determine arguments to audit_syscall_exit()" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  if test x"${HAVE_2_6_17_AUDIT_SYSCALL_EXIT}" = x"1"; then
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for copy_fs_struct" >&5
-echo $ECHO_N "checking kernel symbol table for copy_fs_struct... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for audit_syscall_exit" >&5
+echo $ECHO_N "checking kernel symbol table for audit_syscall_exit... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_copy_fs_struct+set}" = set; then
+    if test "${cr_cv_ksymtab_audit_syscall_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_copy_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_fs_struct$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_copy_fs_struct"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_copy_fs_struct\$" >/dev/null ; then
-        cr_cv_ksymtab_copy_fs_struct=0
+    cr_cv_ksymtab_audit_syscall_exit=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}audit_syscall_exit$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_audit_syscall_exit"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_audit_syscall_exit\$" >/dev/null ; then
+        cr_cv_ksymtab_audit_syscall_exit=0
       fi
 
 
@@ -50542,7 +54539,7 @@
 int
 main ()
 {
-int x = sizeof(&copy_fs_struct);
+int x = sizeof(&audit_syscall_exit);
   ;
   return 0;
 }
@@ -50572,7 +54569,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_copy_fs_struct="Y$cr_cv_ksymtab_copy_fs_struct"
+	 cr_cv_ksymtab_audit_syscall_exit="Y$cr_cv_ksymtab_audit_syscall_exit"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -50580,7 +54577,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_copy_fs_struct="N$cr_cv_ksymtab_copy_fs_struct"
+	 cr_cv_ksymtab_audit_syscall_exit="N$cr_cv_ksymtab_audit_syscall_exit"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -50589,45 +54586,47 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_copy_fs_struct"; then
+  if test -z "$cr_cv_ksymtab_audit_syscall_exit"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_copy_fs_struct" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol copy_fs_struct but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol copy_fs_struct but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_audit_syscall_exit" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern void audit_syscall_exit(int failed, long return_code);
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab_copy_fs_struct | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_audit_syscall_exit | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(copy_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(audit_syscall_exit, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_copy_fs_struct $cr_addr
+#define CR_KCODE_audit_syscall_exit $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+  elif test x"${HAVE_2_6_12_AUDIT_SYSCALL_EXIT}" = x"1"; then
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for put_fs_struct" >&5
-echo $ECHO_N "checking kernel symbol table for put_fs_struct... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for audit_syscall_exit" >&5
+echo $ECHO_N "checking kernel symbol table for audit_syscall_exit... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_put_fs_struct+set}" = set; then
+    if test "${cr_cv_ksymtab_audit_syscall_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_put_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}put_fs_struct$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_put_fs_struct"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_put_fs_struct\$" >/dev/null ; then
-        cr_cv_ksymtab_put_fs_struct=0
+    cr_cv_ksymtab_audit_syscall_exit=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}audit_syscall_exit$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_audit_syscall_exit"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_audit_syscall_exit\$" >/dev/null ; then
+        cr_cv_ksymtab_audit_syscall_exit=0
       fi
 
 
@@ -50656,7 +54655,7 @@
 int
 main ()
 {
-int x = sizeof(&put_fs_struct);
+int x = sizeof(&audit_syscall_exit);
   ;
   return 0;
 }
@@ -50686,7 +54685,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_put_fs_struct="Y$cr_cv_ksymtab_put_fs_struct"
+	 cr_cv_ksymtab_audit_syscall_exit="Y$cr_cv_ksymtab_audit_syscall_exit"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -50694,7 +54693,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_put_fs_struct="N$cr_cv_ksymtab_put_fs_struct"
+	 cr_cv_ksymtab_audit_syscall_exit="N$cr_cv_ksymtab_audit_syscall_exit"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -50703,46 +54702,47 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_put_fs_struct"; then
+  if test -z "$cr_cv_ksymtab_audit_syscall_exit"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_put_fs_struct" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol put_fs_struct but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol put_fs_struct but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_audit_syscall_exit" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern void audit_syscall_exit(struct task_struct *task, int failed, long return_code);
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab_put_fs_struct | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_audit_syscall_exit | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(put_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(audit_syscall_exit, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_put_fs_struct $cr_addr
+#define CR_KCODE_audit_syscall_exit $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-if test -z "$cr_addr"; then
+  elif test x"${HAVE_2_6_6_AUDIT_SYSCALL_EXIT}" = x"1"; then
 
 
-  echo "$as_me:$LINENO: checking kernel symbol table for free_fs_struct" >&5
-echo $ECHO_N "checking kernel symbol table for free_fs_struct... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking kernel symbol table for audit_syscall_exit" >&5
+echo $ECHO_N "checking kernel symbol table for audit_syscall_exit... $ECHO_C" >&6
   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
   # if a declaration was found or not, and the address or 0 as the rest.
-    if test "${cr_cv_ksymtab_free_fs_struct+set}" = set; then
+    if test "${cr_cv_ksymtab_audit_syscall_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cr_cv_ksymtab_free_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_fs_struct$/ {s/ .*//p;q;}"`
-    if test -n "$cr_cv_ksymtab_free_fs_struct"; then
-      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_free_fs_struct\$" >/dev/null ; then
-        cr_cv_ksymtab_free_fs_struct=0
+    cr_cv_ksymtab_audit_syscall_exit=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}audit_syscall_exit$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_audit_syscall_exit"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_audit_syscall_exit\$" >/dev/null ; then
+        cr_cv_ksymtab_audit_syscall_exit=0
       fi
 
 
@@ -50771,7 +54771,7 @@
 int
 main ()
 {
-int x = sizeof(&free_fs_struct);
+int x = sizeof(&audit_syscall_exit);
   ;
   return 0;
 }
@@ -50801,7 +54801,7 @@
   CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_free_fs_struct="Y$cr_cv_ksymtab_free_fs_struct"
+	 cr_cv_ksymtab_audit_syscall_exit="Y$cr_cv_ksymtab_audit_syscall_exit"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -50809,7 +54809,7 @@
 CC=$SAVE_CC
 	 CFLAGS=$SAVE_CFLAGS
 	 CPPFLAGS=$SAVE_CPPFLAGS
-	 cr_cv_ksymtab_free_fs_struct="N$cr_cv_ksymtab_free_fs_struct"
+	 cr_cv_ksymtab_audit_syscall_exit="N$cr_cv_ksymtab_audit_syscall_exit"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -50818,34 +54818,41 @@
 fi
 
   cr_addr=''
-  if test -z "$cr_cv_ksymtab_free_fs_struct"; then
+  if test -z "$cr_cv_ksymtab_audit_syscall_exit"; then
     cr_result='not found'
   else
-    if expr "$cr_cv_ksymtab_free_fs_struct" : N >/dev/null; then
-      { { echo "$as_me:$LINENO: error: Found symbol free_fs_struct but no declaration -- please file a bug report." >&5
-echo "$as_me: error: Found symbol free_fs_struct but no declaration -- please file a bug report." >&2;}
-   { (exit 1); exit 1; }; }
+    if expr "$cr_cv_ksymtab_audit_syscall_exit" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+extern void audit_syscall_exit(struct task_struct *task, int return_code);
+_EOF
+
     fi
-    cr_result=`echo $cr_cv_ksymtab_free_fs_struct | tr -d 'YN'`
+    cr_result=`echo $cr_cv_ksymtab_audit_syscall_exit | tr -d 'YN'`
     if test $cr_result = 0; then
       cr_result=exported
       cr_addr=0
     else
       cr_addr="0x$cr_result"
-      echo "_CR_IMPORT_KCODE(free_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+      echo "_CR_IMPORT_KCODE(audit_syscall_exit, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
     fi
 
 cat >>confdefs.h <<_ACEOF
-#define CR_KCODE_free_fs_struct $cr_addr
+#define CR_KCODE_audit_syscall_exit $cr_addr
 _ACEOF
 
   fi
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
+  else
+    : # Unreachable?
+    { { echo "$as_me:$LINENO: error: failed to determine arguments to audit_syscall_exit()" >&5
+echo "$as_me: error: failed to determine arguments to audit_syscall_exit()" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
   if test -z "$cr_addr"; then
-    { { echo "$as_me:$LINENO: error: failed to find either symbol put_fs_struct or free_fs_struct" >&5
-echo "$as_me: error: failed to find either symbol put_fs_struct or free_fs_struct" >&2;}
+    { { echo "$as_me:$LINENO: error: failed to find symbol audit_syscall_exit()" >&5
+echo "$as_me: error: failed to find symbol audit_syscall_exit()" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -51195,7 +55202,7 @@
     echo "$as_me:$LINENO: result: $cr_result" >&5
 echo "${ECHO_T}$cr_result" >&6
 
-if test $CR_ARCH = x86_64; then
+if test $CR_KARCH = x86_64; then
 
 
   echo "$as_me:$LINENO: checking kernel symbol table for load_gs_index" >&5
@@ -51342,7 +55349,7 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/percpu.h>
+		 #include <asm/pda.h>
 int
 main ()
 {
@@ -51450,7 +55457,7 @@
 		   #define FASTCALL(_decl) _decl
 		 #endif
 		 #include <linux/types.h>
-		 #include <asm/percpu.h>
+		 #include <asm/pda.h>
 int
 main ()
 {
@@ -51931,9 +55938,126 @@
 echo "${ECHO_T}$cr_result" >&6
 
       if test -z "$cr_addr"; then
-        { { echo "$as_me:$LINENO: error: failed to locate symbol per_cpu__old_rsp" >&5
-echo "$as_me: error: failed to locate symbol per_cpu__old_rsp" >&2;}
+
+
+  echo "$as_me:$LINENO: checking kernel symbol table for old_rsp" >&5
+echo $ECHO_N "checking kernel symbol table for old_rsp... $ECHO_C" >&6
+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+  # if a declaration was found or not, and the address or 0 as the rest.
+    if test "${cr_cv_ksymtab_old_rsp+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_cv_ksymtab_old_rsp=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}old_rsp$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_old_rsp"; then
+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_old_rsp\$" >/dev/null ; then
+        cr_cv_ksymtab_old_rsp=0
+      fi
+
+
+  SAVE_CC=$CC
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_CPPFLAGS=$CPPFLAGS
+  CC=$KCC
+  CFLAGS=""
+  CPPFLAGS="$KCFLAGS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+		 #include <linux/kernel.h>
+		 #ifndef FASTCALL
+		   #define FASTCALL(_decl) _decl
+		 #endif
+		 #include <linux/types.h>
+
+		#define IN_CONFIGURE 1
+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
+
+int
+main ()
+{
+int x = sizeof(&old_rsp);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
+  CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_old_rsp="Y$cr_cv_ksymtab_old_rsp"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+CC=$SAVE_CC
+	 CFLAGS=$SAVE_CFLAGS
+	 CPPFLAGS=$SAVE_CPPFLAGS
+	 cr_cv_ksymtab_old_rsp="N$cr_cv_ksymtab_old_rsp"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    fi
+
+fi
+
+  cr_addr=''
+  if test -z "$cr_cv_ksymtab_old_rsp"; then
+    cr_result='not found'
+  else
+    if expr "$cr_cv_ksymtab_old_rsp" : N >/dev/null; then
+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
+DECLARE_PER_CPU(unsigned long, old_rsp);
+_EOF
+
+    fi
+    cr_result=`echo $cr_cv_ksymtab_old_rsp | tr -d 'YN'`
+    if test $cr_result = 0; then
+      cr_result=exported
+      cr_addr=0
+    else
+      cr_addr="0x$cr_result"
+      echo "_CR_IMPORT_KDATA(old_rsp, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
+    fi
+
+cat >>confdefs.h <<_ACEOF
+#define CR_KDATA_old_rsp $cr_addr
+_ACEOF
+
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+        if test -z "$cr_addr"; then
+          { { echo "$as_me:$LINENO: error: failed to locate either symbol per_cpu__old_rsp or old_rsp" >&5
+echo "$as_me: error: failed to locate either symbol per_cpu__old_rsp or old_rsp" >&2;}
    { (exit 1); exit 1; }; }
+        fi
       fi
     fi
   fi
@@ -52787,6 +56911,39 @@
 
 if test "$cr_addr" = "0"; then
 
+
+
+  echo "$as_me:$LINENO: checking kernel symbol table for exported __register_chrdev" >&5
+echo $ECHO_N "checking kernel symbol table for exported __register_chrdev... $ECHO_C" >&6
+    if test "${cr_cv_ksymtab_exp___register_chrdev+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cr_cv_ksymtab_exp___register_chrdev=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__register_chrdev$/ {s/ .*//p;q;}"`
+    if test -n "$cr_cv_ksymtab_exp___register_chrdev" && eval $LINUX_SYMTAB_CMD | grep " __ksymtab___register_chrdev\$" >/dev/null; then
+      : # keep it
+    else
+      cr_cv_ksymtab_exp___register_chrdev=''
+    fi
+fi
+
+  if test -n "$cr_cv_ksymtab_exp___register_chrdev"; then
+    cr_result="$cr_cv_ksymtab_exp___register_chrdev"
+    cr_addr="0x$cr_cv_ksymtab_exp___register_chrdev"
+
+cat >>confdefs.h <<_ACEOF
+#define CR_EXPORTED_KCODE___register_chrdev $cr_addr
+_ACEOF
+
+  else
+    cr_result='not found'
+    cr_addr=0
+  fi
+    echo "$as_me:$LINENO: result: $cr_result" >&5
+echo "${ECHO_T}$cr_result" >&6
+
+  if test "$cr_addr" = "0"; then
+
   cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -52851,10 +57008,11 @@
   echo "  Kernel running currently = `uname -r`"
   echo "======================================================================"
 
-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - kernel does not export register_chrdev" >&5
-echo "$as_me: error: Unable to use kernel $LINUX_VER - kernel does not export register_chrdev" >&2;}
+   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - kernel does not export register_chrdev or __register_chrdev" >&5
+echo "$as_me: error: Unable to use kernel $LINUX_VER - kernel does not export register_chrdev or __register_chrdev" >&2;}
    { (exit 1); exit 1; }; }
 
+  fi
 fi
 
 
@@ -54042,7 +58200,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by blcr $as_me 0.8.2, which was
+This file was extended by blcr $as_me 0.8.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -54105,7 +58263,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-blcr config.status 0.8.2
+blcr config.status 0.8.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -54364,7 +58522,6 @@
 s,@AUTOMAKE@,$AUTOMAKE,;t t
 s,@AUTOHEADER@,$AUTOHEADER,;t t
 s,@MAKEINFO@,$MAKEINFO,;t t
-s,@AMTAR@,$AMTAR,;t t
 s,@install_sh@,$install_sh,;t t
 s,@STRIP@,$STRIP,;t t
 s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
@@ -54373,6 +58530,9 @@
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@am__leading_dot@,$am__leading_dot,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@am__tar@,$am__tar,;t t
+s,@am__untar@,$am__untar,;t t
 s,@PWD_PROG@,$PWD_PROG,;t t
 s,@TOP_BUILDDIR@,$TOP_BUILDDIR,;t t
 s,@TOP_SRCDIR@,$TOP_SRCDIR,;t t
@@ -54424,6 +58584,7 @@
 s,@CCDEPMODE@,$CCDEPMODE,;t t
 s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s,@SED@,$SED,;t t
 s,@EGREP@,$EGREP,;t t
 s,@ECHO@,$ECHO,;t t
 s,@AR@,$AR,;t t
@@ -54462,10 +58623,11 @@
 s,@CR_KERNEL@,$CR_KERNEL,;t t
 s,@CR_KERNEL_BASE@,$CR_KERNEL_BASE,;t t
 s,@CR_MODULE_DIR@,$CR_MODULE_DIR,;t t
-s,@KBUILD_MAKE_ARGS@,$KBUILD_MAKE_ARGS,;t t
 s,@LINUX_SYMTAB_FILE@,$LINUX_SYMTAB_FILE,;t t
 s,@LINUX_SYMTAB_CMD@,$LINUX_SYMTAB_CMD,;t t
 s,@LINUX_SYMTAB_CONF@,$LINUX_SYMTAB_CONF,;t t
+s,@CR_KARCH@,$CR_KARCH,;t t
+s,@KBUILD_MAKE_ARGS@,$KBUILD_MAKE_ARGS,;t t
 s,@CR_HAVE_SYSTEM_MAP_TRUE@,$CR_HAVE_SYSTEM_MAP_TRUE,;t t
 s,@CR_HAVE_SYSTEM_MAP_FALSE@,$CR_HAVE_SYSTEM_MAP_FALSE,;t t
 s,@CR_BUILD_MAN_TRUE@,$CR_BUILD_MAN_TRUE,;t t
@@ -55132,27 +59294,21 @@
   else
     continue
   fi
-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
   U=`sed -n 's/^U = //p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
diff -Nru blcr-0.8.2/configure.ac blcr-0.8.4/configure.ac
--- blcr-0.8.2/configure.ac	2009-06-15 22:33:56.000000000 +0000
+++ blcr-0.8.4/configure.ac	2011-10-11 22:11:37.000000000 +0000
@@ -22,7 +22,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: configure.ac,v 1.410.2.9 2009/06/15 22:33:56 phargrov Exp $
+# $Id: configure.ac,v 1.410.2.39 2011/10/11 22:11:37 phargrov Exp $
 #
 
 ################################################################################
@@ -47,7 +47,7 @@
 # AC_INIT wants to see constants, not shell vars, so we define these with m4.
 m4_define(RELEASE_MAJOR, 0)
 m4_define(RELEASE_MINOR, 8)
-m4_define(RELEASE_PATCH, 2)
+m4_define(RELEASE_PATCH, 4)
 
 m4_define(RELEASE_VERSION, RELEASE_MAJOR.RELEASE_MINOR.RELEASE_PATCH)
 AC_INIT([blcr],[RELEASE_VERSION], [http://ftg.lbl.gov/checkpoint])
@@ -66,7 +66,7 @@
 #       'make clean' and rebuild everything to see the new library names.
 LIBCR_MAJOR=0
 LIBCR_MINOR=5
-LIBCR_PATCH=2
+LIBCR_PATCH=3
 
 # 3. Kernel module version
 # ------------------------
@@ -81,7 +81,7 @@
 # Observe same rules as for library (ie patch->0 when changing minor, etc).
 CR_MODULE_MAJOR=0
 CR_MODULE_MINOR=10
-CR_MODULE_PATCH=1
+CR_MODULE_PATCH=2
 
 # Derived version variables ###
 #   - Exported, so you can use @CR_FOO@ to get them in any files that configure
@@ -126,7 +126,7 @@
 ################################################################################
 # Boilerplate for versions and copyrights in generated files
 ################################################################################
-AC_REVISION($Revision: 1.410.2.9 $)
+AC_REVISION($Revision: 1.410.2.39 $)
 AC_COPYRIGHT([[
     Berkeley Lab Checkpoint/Restart (BLCR) for Linux is Copyright (c)
     2008, The Regents of the University of California, through Lawrence
@@ -454,9 +454,10 @@
 AC_SUBST(CR_CLIENT_LDADD)
 
 # If building the tests, we can optionally test C++
-if test x"$cr_build_tests" = xyes; then
+# Note, however, that  bug 2619 reports that we can't call this conditionally.
+dnl if test x"$cr_build_tests" = xyes; then
   CR_PROG_CXX
-fi
+dnl fi
 
 ################################################################################
 # Check libraries
@@ -554,6 +555,9 @@
 # Check for atfork handling
 AC_CHECK_FUNCS([__register_atfork])
 
+# Check for call to disable NSCD
+AC_CHECK_FUNCS([__nss_disable_nscd])
+
 # Check for pthread_attr_setstacksize
 SAVE_LIBS="$LIBS"
 LIBS="-lpthread $LIBS"
@@ -834,14 +838,37 @@
 fi
 AC_MSG_RESULT([${CR_MODULE_DIR} ($cr_why)])
 
+# Checks for matching (we hope) symbol table
+CR_LINUX_SYMTAB
+
+# Setup CR_KARCH to enable 32-bit user-space on 64-bit kernels
+CR_KARCH=$CR_ARCH
+if test $cr_wordsize = 4; then
+  # Count pointer hex digits in the System.map to id a 64-bit kernel
+  # Based on logic provided by Alan Woodland
+  AC_PROG_EGREP
+  AC_MSG_CHECKING([if kernel and user-space wordsize match])
+  if eval $LINUX_SYMTAB_CMD | head | $EGREP '^[[a-f0-9]]{16}' >/dev/null 2>&1;then
+    AC_MSG_RESULT([no (32-bit user-space with 64-bit kernel)])
+    case $CR_KARCH in
+      i386)  CR_KARCH=x86_64;;
+      ppc)   CR_KARCH=ppc64;;
+      sparc) CR_KARCH=sparc64;;
+    esac
+  else
+    AC_MSG_RESULT([yes])
+  fi
+fi
+AC_SUBST(CR_KARCH)
+
 # Configure automake/kbuild glue
 CR_CHECK_KBUILD
 
 # Configure module compile flags and perform a sanity check
 CR_SET_KCFLAGS
 
-# Checks for matching (we hope) symbol table
-CR_LINUX_SYMTAB
+# Now we can check if SYMTAB matches the kernel
+CR_LINUX_SYMTAB_VALIDATE
 
 ## Check for optional kernel headers...
 CR_CHECK_KERNEL_HEADER([linux/syscalls.h])
@@ -851,11 +878,16 @@
 CR_CHECK_KERNEL_HEADER([linux/compile.h])
 CR_CHECK_KERNEL_HEADER([linux/fdtable.h])
 CR_CHECK_KERNEL_HEADER([linux/utrace.h])
+CR_CHECK_KERNEL_HEADER([linux/perf_event.h])
+CR_CHECK_KERNEL_HEADER([linux/audit.h])
 CR_CHECK_KERNEL_HEADER([asm/elf.h])
 CR_CHECK_KERNEL_HEADER([asm/desc.h],[#include <linux/sched.h>])
 CR_CHECK_KERNEL_HEADER([asm/vsyscall32.h])
 CR_CHECK_KERNEL_HEADER([asm/i387.h])
 
+CR_CHECK_KERNEL_HEADER([linux/utsrelease.h])
+CR_CHECK_KERNEL_HEADER([generated/utsrelease.h])
+
 ## Now we check for specific kernel features...
 
 CR_FIND_KSYM([timeval_to_jiffies],[CODE])
@@ -985,7 +1017,7 @@
 fi
 
 # put_task_struct() requires one of these:
-CR_FIND_KSYM([__put_task_struct],[CODE])
+CR_FIND_KSYM([__put_task_struct],[CODE],[extern void __put_task_struct(struct task_struct *);])
 CR_FIND_KSYM([__put_task_struct_cb],[CODE])
 
 CR_CHECK_KERNEL_MEMBER([mm.task_size],[#include <linux/sched.h>],
@@ -1002,7 +1034,7 @@
   [mm_context_t],[unsigned long],[vdso])
 CR_CHECK_KERNEL_MEMBER([thread_info.sysenter_return],[#include <linux/thread_info.h>],
   [struct thread_info],[void *],[sysenter_return])
-if test $CR_ARCH = arm; then
+if test $CR_KARCH = arm; then
   CR_CHECK_KERNEL_MEMBER([thread_info.tp_value],[#include <linux/thread_info.h>],
     [struct thread_info],[unsigned long],[tp_value])
   CR_FIND_KSYM([__kuser_helper_start],[CODE],[extern int __kuser_helper_start(void);])
@@ -1025,10 +1057,14 @@
 if test -n "${HAVE_MAP_VSYSCALL}"; then
   CR_FIND_KSYM([map_vsyscall],[CODE])
 fi
-if test $CR_ARCH = x86_64; then
+if test $CR_KARCH = x86_64; then
   CR_FIND_KSYM([syscall32_setup_pages],[CODE],
 	[extern int syscall32_setup_pages(void *, int);])
 fi
+if test $CR_KARCH = arm; then
+  CR_FIND_KSYM([vectors_user_mapping],[CODE],
+	[extern int vectors_user_mapping(void);])
+fi
 
 CR_FIND_KSYM([arch_pick_mmap_layout],[CODE])
 CR_FIND_KSYM([arch_get_unmaped_area],[CODE])
@@ -1062,7 +1098,7 @@
 # which must have a prototype in asm/pgtable.h (arch-specific)
 # If we support ia64 or mips in the future we'll need to add more cases here.
 # NOTE: don't try to factor the CR_FIND_KSYM() call; it requires a literal.
-case $CR_ARCH in
+case $CR_KARCH in
   sparc*)
     CR_FIND_KSYM([mem_map_zero],[DATA])
     ZERO_PAGE_SYMBOL=mem_map_zero
@@ -1093,7 +1129,7 @@
 CR_FIND_KSYM([do_sigaltstack],[CODE],
 	[extern int do_sigaltstack(const stack_t *, stack_t *, unsigned long);])
 
-if test $CR_ARCH = i386 -o $CR_ARCH = x86_64; then
+if test $CR_KARCH = i386 -o $CR_KARCH = x86_64; then
   CR_CHECK_KERNEL_TYPE([struct n_desc_struct],[
 	#include <linux/sched.h>
 	#include <asm/desc.h>])
@@ -1119,10 +1155,16 @@
 	[struct thread_struct],[unsigned long],[debugreg0])
   CR_CHECK_KERNEL_MEMBER([thread.debugregs],[#include <asm/processor.h>],
 	[struct thread_struct],[unsigned long],[debugreg[1]])
+  CR_CHECK_KERNEL_MEMBER([thread.ptrace_bps],[
+	#include <linux/perf_event.h>
+	#include <asm/processor.h>],
+	[struct thread_struct],[struct perf_event *],[ptrace_bps[1]])
   CR_CHECK_KERNEL_MEMBER([thread.i387],[#include <asm/processor.h>],
 	[struct thread_struct],[union i387_union],[i387])
   CR_CHECK_KERNEL_MEMBER([thread.xstate],[#include <asm/processor.h>],
 	[struct thread_struct],[union thread_xstate *],[xstate])
+  CR_CHECK_KERNEL_MEMBER([thread.fpu],[#include <asm/processor.h>],
+	[struct thread_struct],[struct fpu],[fpu])
 
   CR_CHECK_KERNEL_MEMBER([pt_regs.eflags],[#include <asm/ptrace.h>],[struct pt_regs],[unsigned long],[eflags])
   CR_CHECK_KERNEL_MEMBER([pt_regs.flags],[#include <asm/ptrace.h>],[struct pt_regs],[unsigned long],[flags])
@@ -1144,7 +1186,7 @@
   fi
 fi
 
-if test $CR_ARCH = i386; then
+if test $CR_KARCH = i386; then
   CR_CHECK_KERNEL_MEMBER([pt_regs.xcs],[#include <asm/ptrace.h>],[struct pt_regs],[int],[xcs])
   CR_CHECK_KERNEL_MEMBER([pt_regs.xfs],[#include <asm/ptrace.h>],[struct pt_regs],[int],[xfs])
   CR_CHECK_KERNEL_MEMBER([pt_regs.xgs],[#include <asm/ptrace.h>],[struct pt_regs],[int],[xgs])
@@ -1224,6 +1266,7 @@
 if test -z "${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
   CR_BAD_KERNEL([unable to determine how to map pid_nr -> struct task])
 fi
+CR_FIND_KSYM([find_task_by_pid_ns],[CODE])
 
 CR_CHECK_KERNEL_CALL([find_task_by_pid_type],[#include <linux/sched.h>])
 CR_CHECK_KERNEL_CALL([find_task_by_pid_type_ns],[#include <linux/sched.h>])
@@ -1341,6 +1384,20 @@
 CR_DEFINE(HAVE_KMEM_CACHE_T,[test x$cr_cv_kconfig_HAVE_KMEM_CACHE_T = xyes],
 	    [Define to 1 if the kmem_cache_t typedef exists and is not deprecated])
 
+# type of (struct fs_struct).lock
+CR_CHECK_KERNEL_MEMBER([fs_struct rwlock],[
+    #include <linux/sched.h>
+    #include <linux/fs_struct.h>
+  ],[struct fs_struct],[rwlock_t],[lock])
+CR_CHECK_KERNEL_MEMBER([fs_struct spinlock],[
+    #include <linux/sched.h>
+    #include <linux/fs_struct.h>
+  ],[struct fs_struct],[spinlock_t],[lock])
+if test "$HAVE_FS_STRUCT_RWLOCK$HAVE_FS_STRUCT_SPINLOCK" = "11" \
+     -o "$HAVE_FS_STRUCT_RWLOCK$HAVE_FS_STRUCT_SPINLOCK" = "00" ; then
+  CR_BAD_KERNEL([unrecognized type for fs_struct.lock])
+fi
+ 
 CR_CHECK_KERNEL_TYPE([gfp_t],[#include <linux/slab.h>])
 # OK if missing
 CR_CHECK_KERNEL_CALL([kzalloc],[#include <linux/slab.h>])
@@ -1355,6 +1412,11 @@
     #include <linux/pipe_fs_i.h>
   ],[struct pipe_inode_info],[char*],[base])
 # OK if missing.
+CR_CHECK_KERNEL_MEMBER([pipe_inode_info.buffers],[
+    #include <linux/wait.h>
+    #include <linux/pipe_fs_i.h>
+    ],[struct pipe_inode_info],[unsigned int],[buffers])
+# OK if missing.
 CR_CHECK_KERNEL_MEMBER([pipe_buf_operations.pin],[
     #include <linux/sched.h>
     #include <linux/pipe_fs_i.h>
@@ -1381,10 +1443,46 @@
 fi
 CR_FIND_KSYM([anon_pipe_buf_ops],[DATA],
 	[extern struct pipe_buf_operations anon_pipe_buf_ops;])
+CR_CHECK_KERNEL_CALL([pipe_fcntl],[
+    #include <linux/sched.h>
+    #include <linux/pipe_fs_i.h>
+  ])
+if test "${HAVE_PIPE_FCNTL}" = "1"; then
+    CR_FIND_KSYM([pipe_fcntl],[CODE], 
+      [long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg);])
+fi
+# Now try to define CR_F_SETPIPE_SZ and CR_F_GETPIPE_SZ, for the pipe test.
+#
+# We try the user space headers first.  If we don't find a definition, then we 
+# poke around the kernel headers for the definition.
+#
+# If we still don't have a definition at this point, the crut test also
+# uses an #ifdef F_SETPIPE_SZ before using CR_F_SETPIPE_SZ, so we have
+# one more chance.
+CR_CHECK_KERNEL_MACRO([F_SETPIPE_SZ],[#include <linux/fcntl.h>])
+CR_CHECK_KERNEL_MACRO([F_GETPIPE_SZ],[#include <linux/fcntl.h>])
+if test "${HAVE_F_SETPIPE_SZ}${HAVE_F_GETPIPE_SZ}" = "11"; then
+    CR_DEFINE_INT(CR_F_SETPIPE_SZ,[F_SETPIPE_SZ],[#include <fcntl.h>])
+    if test -z "${CR_F_SETPIPE_SZ}"; then 
+        CR_DEFINE_KERNEL_INT(
+                  CR_F_SETPIPE_SZ,[F_SETPIPE_SZ],[#include <linux/fcntl.h>])
+    fi
+    CR_DEFINE_INT(CR_F_GETPIPE_SZ,[F_GETPIPE_SZ],[#include <fcntl.h>])
+    if test -z "${CR_F_GETPIPE_SZ}"; then
+        CR_DEFINE_KERNEL_INT(
+                  CR_F_GETPIPE_SZ,[F_GETPIPE_SZ],[#include <linux/fcntl.h>])
+    fi
+fi
+# The user space headers may not define F_SETPIPE_SZ or F_GETPIPE_SZ,
+# and we need these values to run the unit test,
+# so we define CR_F_SETPIPE_SZ and CR_F_GETPIPE_SZ to hold the values
+# that we find in the kernel.
 
 # For O_DIRECT support
 CR_CHECK_KERNEL_MEMBER([file_operations.check_flags],[#include <linux/fs.h>],
 		       [struct file_operations],[],[check_flags])
+CR_CHECK_KERNEL_MEMBER([file.f_lock],[#include <linux/fs.h>],
+		       [struct file],[spinlock_t],[f_lock])
 CR_CHECK_KERNEL_MEMBER([inode.i_mapping],[#include <linux/fs.h>],
 		       [struct inode],[struct address_space*],[i_mapping])
 CR_CHECK_KERNEL_MEMBER([file.f_mapping],[#include <linux/fs.h>],
@@ -1394,6 +1492,9 @@
   CR_BAD_KERNEL([could not locate address_space in inode or file structs])
 fi
 
+CR_CHECK_KERNEL_MEMBER([file_operations.unlocked_ioctl],[#include <linux/fs.h>],
+		       [struct file_operations],[],[unlocked_ioctl])
+
 CR_CHECK_KERNEL_CALL_NARGS([do_generic_file_read],[#include <linux/fs.h>],
 	[NULL,NULL,NULL,NULL],[NULL,NULL,NULL,NULL,0])
 CR_CHECK_KERNEL_MEMBER([read_descriptor_t.arg.data],[#include <linux/fs.h>],
@@ -1486,17 +1587,60 @@
   fi
 fi
 
+# Check for auditing support
+CR_CHECK_KERNEL_MACRO([CONFIG_AUDITSYSCALL])
+if test -n "${HAVE_CONFIG_AUDITSYSCALL}"; then
+  CR_CHECK_KERNEL_CALL([audit_dummy_context], [#include <linux/audit.h>])
+  CR_CHECK_KERNEL_CALL_FULL([2.6.6 audit_syscall_exit],[audit_syscall_exit],[
+        #include <linux/audit.h>
+        #ifdef AUDITSC_RESULT
+          choke me
+        #endif
+    ],[ ],[NULL,0])
+  CR_CHECK_KERNEL_CALL_FULL([2.6.12 audit_syscall_exit],[audit_syscall_exit],[
+        #include <linux/audit.h>
+        #ifndef AUDITSC_RESULT
+          choke me
+        #endif
+    ],[ ],[NULL,AUDITSC_RESULT(0),0])
+  CR_CHECK_KERNEL_CALL_FULL([2.6.17 audit_syscall_exit],[audit_syscall_exit],[
+        #include <linux/audit.h>
+        #ifndef AUDITSC_RESULT
+          choke me
+        #endif
+    ],[ ],[AUDITSC_RESULT(0),0])
+  if test x"${HAVE_2_6_6_AUDIT_SYSCALL_EXIT}${HAVE_2_6_12_AUDIT_SYSCALL_EXIT}${HAVE_2_6_17_AUDIT_SYSCALL_EXIT}" != x"1"; then
+    AC_MSG_ERROR([failed to determine arguments to audit_syscall_exit()])
+  fi
+  if test x"${HAVE_2_6_17_AUDIT_SYSCALL_EXIT}" = x"1"; then
+    CR_FIND_KSYM([audit_syscall_exit],[CODE],
+        [extern void audit_syscall_exit(int failed, long return_code);])
+  elif test x"${HAVE_2_6_12_AUDIT_SYSCALL_EXIT}" = x"1"; then
+    CR_FIND_KSYM([audit_syscall_exit],[CODE],
+        [extern void audit_syscall_exit(struct task_struct *task, int failed, long return_code);])
+  elif test x"${HAVE_2_6_6_AUDIT_SYSCALL_EXIT}" = x"1"; then
+    CR_FIND_KSYM([audit_syscall_exit],[CODE],
+        [extern void audit_syscall_exit(struct task_struct *task, int return_code);])
+  else
+    : # Unreachable?
+    AC_MSG_ERROR([failed to determine arguments to audit_syscall_exit()])
+  fi
+  if test -z "$cr_addr"; then
+    AC_MSG_ERROR([failed to find symbol audit_syscall_exit()])
+  fi
+fi
+
 # For blcr
 CR_FIND_KSYM([set_fs_pwd],[CODE])
 # For vmadump4
 CR_FIND_KSYM([sys_mremap],[CODE],
 	[extern asmlinkage unsigned long sys_mremap(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr);])
 CR_FIND_KSYM([do_sigaction],[CODE])
-if test $CR_ARCH = x86_64; then
+if test $CR_KARCH = x86_64; then
   CR_FIND_KSYM([load_gs_index],[CODE])
 
-  CR_CHECK_KERNEL_CALL([read_pda],[#include <asm/percpu.h>])
-  CR_CHECK_KERNEL_CALL([write_pda],[#include <asm/percpu.h>])
+  CR_CHECK_KERNEL_CALL([read_pda],[#include <asm/pda.h>])
+  CR_CHECK_KERNEL_CALL([write_pda],[#include <asm/pda.h>])
   if test "$HAVE_READ_PDA$HAVE_WRITE_PDA" != "11"; then
     CR_CHECK_KERNEL_CALL([percpu_read],[#include <asm/percpu.h>])
     CR_CHECK_KERNEL_CALL([percpu_write],[#include <asm/percpu.h>])
@@ -1505,7 +1649,10 @@
     else
       CR_FIND_KSYM([per_cpu__old_rsp],[DATA],[DECLARE_PER_CPU(unsigned long, old_rsp);])
       if test -z "$cr_addr"; then
-        AC_MSG_ERROR([failed to locate symbol per_cpu__old_rsp])
+        CR_FIND_KSYM([old_rsp],[DATA],[DECLARE_PER_CPU(unsigned long, old_rsp);])
+        if test -z "$cr_addr"; then
+          AC_MSG_ERROR([failed to locate either symbol per_cpu__old_rsp or old_rsp])
+        fi
       fi
     fi
   fi
@@ -1536,7 +1683,10 @@
 # the System.map used to locate symbols and configure time.
 CR_FIND_EXPORTED_KSYM([register_chrdev],[CODE])
 if test "$cr_addr" = "0"; then
-  CR_BAD_KERNEL([kernel does not export register_chrdev])
+  CR_FIND_EXPORTED_KSYM([__register_chrdev],[CODE])
+  if test "$cr_addr" = "0"; then
+    CR_BAD_KERNEL([kernel does not export register_chrdev or __register_chrdev])
+  fi
 fi
 CR_FIND_EXPORTED_KSYM([register_blkdev],[CODE])
 if test "$cr_addr" = "0"; then
diff -Nru blcr-0.8.2/contrib/Makefile.in blcr-0.8.4/contrib/Makefile.in
--- blcr-0.8.2/contrib/Makefile.in	2009-06-17 03:56:45.000000000 +0000
+++ blcr-0.8.4/contrib/Makefile.in	2011-10-11 22:58:52.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = contrib
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -44,7 +45,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES = cr_insmod gen_cscope batch_build
 SCRIPTS = $(noinst_SCRIPTS)
@@ -114,6 +115,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -195,6 +197,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -214,6 +217,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -352,7 +357,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/cr_module/cr_chkpt_req.c blcr-0.8.4/cr_module/cr_chkpt_req.c
--- blcr-0.8.2/cr_module/cr_chkpt_req.c	2009-03-06 19:36:11.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_chkpt_req.c	2011-08-23 21:41:49.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_chkpt_req.c,v 1.264.6.2 2009/03/06 19:36:11 phargrov Exp $
+ * $Id: cr_chkpt_req.c,v 1.264.6.4 2011/08/23 21:41:49 phargrov Exp $
  */
 
 #include "cr_module.h"
@@ -321,9 +321,13 @@
 #elif HAVE_TASK_PTRACE
 	struct task_struct *child;
 	CR_DO_EACH_CHILD(child, task) {
-		if (child->ptrace & PT_PTRACED) {
+	    struct task_struct *thread = child;
+	    if (!thread_group_leader(child)) continue;
+	    do {
+		if (thread->ptrace & PT_PTRACED) {
 			return 1;
 		}
+	    } while_each_thread(child, thread);
 	} CR_WHILE_EACH_CHILD(child, task);
 	return 0;
 #else
@@ -573,23 +577,14 @@
 
 	if (!proc->mm || !proc->signal) {
 		result = -EPERM;	/* tried to checkpoint a kernel thread or something ?? */
-       	} else if (atomic_read(&proc->signal->count) == atomic_read(&proc->mm->mm_users)) {
-		/* NEW (nptl) pthreads (or single threaded) */
+	} else {
 		CR_DO_EACH_TASK_TGID(proc->tgid, task) {
 			result = add_task(req, task);
 			if (result) {
 				break;
 			}
 		} CR_WHILE_EACH_TASK_TGID(proc->tgid, task);
-	} else {
-		/* OLD (linuthreads) pthreads */
-		CR_DO_EACH_TASK_PROC(proc, task) {
-			result = add_task(req, task);
-			if (result) {
-				break;
-			}
-		} CR_WHILE_EACH_TASK_PROC(proc, task);
-	}
+	} 
 
 out:
 	return result;
@@ -730,12 +725,15 @@
 
 			/* Add all the children - we get their children in the list_for_each() */
 			CR_DO_EACH_CHILD(child, task) {
-
-				if (child->mm == root_mm) continue;	/* Already visited */
-				result = add_task(req, child);
+			    struct task_struct *thread = child;
+			    if (!thread_group_leader(child)) continue;
+			    do {
+				if (thread->mm == root_mm) continue;	/* Already visited */
+				result = add_task(req, thread);
 				if (result) {
 					goto out_fail;
 				}
+			    } while_each_thread(child, thread);
 			} CR_WHILE_EACH_CHILD(child, task);
 		}
 	}
diff -Nru blcr-0.8.2/cr_module/cr_context.h blcr-0.8.4/cr_module/cr_context.h
--- blcr-0.8.2/cr_module/cr_context.h	2008-11-24 04:11:16.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_context.h	2011-09-22 23:22:14.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_context.h,v 1.72 2008/11/24 04:11:16 phargrov Exp $
+ * $Id: cr_context.h,v 1.72.8.1 2011/09/22 23:22:14 eroman Exp $
  */
 
 /*
@@ -214,6 +214,7 @@
    unsigned int fifo_flags;
    int fifo_perms; /* for mknod */
    void *fifo_dentry; /* f_dentry value at checkpoint time */
+   long pipe_sz;    /* store the size of the pipe buffer */
 };
 
 /*
diff -Nru blcr-0.8.2/cr_module/cr_dump_self.c blcr-0.8.4/cr_module/cr_dump_self.c
--- blcr-0.8.2/cr_module/cr_dump_self.c	2009-03-26 04:22:43.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_dump_self.c	2011-08-24 02:23:58.000000000 +0000
@@ -21,12 +21,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_dump_self.c,v 1.228.8.1 2009/03/26 04:22:43 phargrov Exp $
+ * $Id: cr_dump_self.c,v 1.228.8.4 2011/08/24 02:23:58 phargrov Exp $
  */
 
 #include "cr_module.h"
 
-#include <linux/smp_lock.h>
 #include <linux/pipe_fs_i.h>
 #include <linux/binfmts.h>
 #include <linux/major.h>
@@ -168,11 +167,11 @@
         goto out_nomem;
     }
 
-    read_lock(&current->fs->lock);
+    cr_read_lock_fs(&current->fs->lock);
     umask = current->fs->umask;
     CR_PATH_GET_FS(root_path, current->fs->root);
     CR_PATH_GET_FS(pwd_path, current->fs->pwd);
-    read_unlock(&current->fs->lock);
+    cr_read_unlock_fs(&current->fs->lock);
 
     /* save umask */
     retval = cr_kwrite(eb, cf_filp, &umask, sizeof(umask));
@@ -738,9 +737,7 @@
     /* If !proc_req, the rest are meaningless */
 
     cf_head.clone_flags = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND;
-    if (atomic_read(&current->signal->count) > 1) {
-	cf_head.clone_flags |= CLONE_THREAD | CLONE_DETACHED;
-    }
+    cf_head.clone_flags |= CLONE_THREAD | CLONE_DETACHED;
 
     cf_head.tmp_fd = proc_req ? proc_req->tmp_fd : -1;
 
diff -Nru blcr-0.8.2/cr_module/cr_fops.c blcr-0.8.4/cr_module/cr_fops.c
--- blcr-0.8.2/cr_module/cr_fops.c	2008-08-16 00:17:09.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_fops.c	2011-09-29 21:22:09.000000000 +0000
@@ -21,11 +21,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_fops.c,v 1.69 2008/08/16 00:17:09 phargrov Exp $
+ * $Id: cr_fops.c,v 1.69.8.3 2011/09/29 21:22:09 phargrov Exp $
  */
 
 #include "cr_module.h"
 
+#if HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL
+  #include <linux/smp_lock.h>
+#endif
+
 /**
  * cr_hand_complete - wrapper/helper for CR_OP_HAND_DONE
  * @file: (struct file *) of the control node
@@ -127,11 +131,22 @@
  * the C/R control node.  It acts as a dispatcher to the functions
  * which do the real work.
  */
+#if HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL
+static long ctrl_unlocked_ioctl(struct file *file,
+		                unsigned int op, unsigned long arg)
+#else
 static int ctrl_ioctl(struct inode *inode, struct file *file,
 		      unsigned int op, unsigned long arg)
+#endif
 {
+	int result = -ENOTTY;
+
 	CR_KTRACE_FUNC_ENTRY("op=%08x arg=0x%lx", op, arg);
 
+#if HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL
+	lock_kernel();
+#endif
+
 	switch(op) {
 	//
 	// Calls from libcr:
@@ -139,62 +154,79 @@
 	// XXX: When adding cases here, also add to the ioctl32 init/cleanup
 	//      code below and to the big switch in cr_compat.c.
 	case CR_OP_HAND_CHKPT:
-		return cr_dump_self(file, arg);
+		result = cr_dump_self(file, arg);
+		break;
 
 	case CR_OP_HAND_ABORT:
-		return cr_hand_abort(file, arg);
+		result = cr_hand_abort(file, arg);
+		break;
 
 	case CR_OP_HAND_SUSP:
-		return cr_suspend(file, (struct timeval __user *)arg);
+		result = cr_suspend(file, (struct timeval __user *)arg);
+		break;
 
 	case CR_OP_HAND_PHASE1:
-		return cr_phase1_register(file, (int)arg);
+		result = cr_phase1_register(file, (int)arg);
+		break;
 
 	case CR_OP_HAND_PHASE2:
-		return cr_phase2_register(file, (int)arg);
+		result = cr_phase2_register(file, (int)arg);
+		break;
 
 	case CR_OP_HAND_SRC:
-		return cr_rstrt_src(file, (char __user *)arg);
+		result = cr_rstrt_src(file, (char __user *)arg);
+		break;
 
 	case CR_OP_HAND_CHKPT_INFO:
-		return cr_chkpt_info(file, (struct cr_chkpt_info __user *)arg);
+		result = cr_chkpt_info(file, (struct cr_chkpt_info __user *)arg);
+		break;
 
 	case CR_OP_HAND_DONE:
-		return cr_hand_complete(file, arg);
+		result = cr_hand_complete(file, arg);
+		break;
 
 
 	//
 	// Calls from cr_checkpoint:
 	//
 	case CR_OP_CHKPT_REQ:
-		return cr_chkpt_req(file, (struct cr_chkpt_args __user *)arg);
+		result = cr_chkpt_req(file, (struct cr_chkpt_args __user *)arg);
+		break;
 
 	case CR_OP_CHKPT_REAP:
-		return cr_chkpt_reap(file);
+		result = cr_chkpt_reap(file);
+		break;
 
 	case CR_OP_CHKPT_FWD:
-		return cr_chkpt_fwd(file, (struct cr_fwd_args __user *)arg);
+		result = cr_chkpt_fwd(file, (struct cr_fwd_args __user *)arg);
+		break;
 
 	case CR_OP_CHKPT_LOG:
-		return cr_chkpt_log(file, (struct cr_log_args __user *)arg);
+		result = cr_chkpt_log(file, (struct cr_log_args __user *)arg);
+		break;
 
 	//
 	// Calls from cr_restart:
 	//
 	case CR_OP_RSTRT_REQ:
-		return cr_rstrt_request_restart(file, (struct cr_rstrt_args __user *)arg);
+		result = cr_rstrt_request_restart(file, (struct cr_rstrt_args __user *)arg);
+		break;
 
 	case CR_OP_RSTRT_REAP:
-		return cr_rstrt_reap(file);
+		result = cr_rstrt_reap(file);
+		break;
 
 	case CR_OP_RSTRT_CHILD:
-		return cr_rstrt_child(file);
+		result = cr_rstrt_child(file);
+		break;
 
 	case CR_OP_RSTRT_PROCS:
-		return cr_rstrt_procs(file, (struct cr_procs_tbl __user *)arg);
+		result = cr_rstrt_procs(file, (struct cr_procs_tbl __user *)arg);
+		break;
 
 	case CR_OP_RSTRT_LOG:
-		return cr_rstrt_log(file, (struct cr_log_args __user *)arg);
+		result = cr_rstrt_log(file, (struct cr_log_args __user *)arg);
+		break;
 
 	//
 	// General calls
@@ -215,13 +247,19 @@
 		    CR_WARN("request from pid %d for unsupported version %d.%d",
 			    (int)current->pid, (int)major, (int)minor);
 		}
-		return match ? 0 : -CR_EVERSION;
+		result = match ? 0 : -CR_EVERSION;
+		break;
 	    }
 
 	default:
 		CR_KTRACE_BADPARM("unknown op %x", _IOC_NR(op));
-		return -ENOTTY;
 	}
+
+
+#if HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL
+	unlock_kernel();
+#endif
+	return result;
 }
 
 static int ctrl_open(struct inode * inode, struct file * file)
@@ -285,7 +323,11 @@
 	owner:		THIS_MODULE,
 	open:		ctrl_open,
 	release:	ctrl_release,
+#if HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL
+	unlocked_ioctl:	ctrl_unlocked_ioctl,
+#else
 	ioctl:		ctrl_ioctl,
+#endif
 	poll:		ctrl_poll,
 #if defined(CONFIG_COMPAT) && defined(HAVE_COMPAT_IOCTL)
 	compat_ioctl:	cr_compat_ctrl_ioctl,
diff -Nru blcr-0.8.2/cr_module/cr_io.c blcr-0.8.4/cr_module/cr_io.c
--- blcr-0.8.2/cr_module/cr_io.c	2009-03-26 04:22:43.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_io.c	2009-06-26 18:19:51.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_io.c,v 1.77.4.2 2009/03/26 04:22:43 phargrov Exp $
+ * $Id: cr_io.c,v 1.77.4.3 2009/06/26 18:19:51 phargrov Exp $
  */
 
 /*
@@ -896,7 +896,7 @@
 cr_dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
 {
     struct file *filp;
-    int acc_mask = ("\000\004\002\006"[(flags)&O_ACCMODE]); /* ICK (from linux/fs/namei.c) */
+    int acc_mask = ("\004\002\006\006"[flags&O_ACCMODE]); /* ACC_MODE(open_to_namei_flags()) */
     int err;
 
     err = cr_permission(dentry->d_inode, acc_mask, NULL);
diff -Nru blcr-0.8.2/cr_module/cr_kcompat.h blcr-0.8.4/cr_module/cr_kcompat.h
--- blcr-0.8.2/cr_module/cr_kcompat.h	2009-06-12 20:37:03.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_kcompat.h	2011-08-23 23:37:19.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_kcompat.h,v 1.247.8.2 2009/06/12 20:37:03 phargrov Exp $
+ * $Id: cr_kcompat.h,v 1.247.8.5 2011/08/23 23:37:19 phargrov Exp $
  *
  * This file tries to hide as much as practical the differences among Linux
  * kernel versions.  Preferably this is done by back-porting new features, but
@@ -274,7 +274,7 @@
 #elif HAVE_2_ARG_FIND_PID
   #define cr_have_pid(T,P) (find_pid((T),(P)) != NULL)
 #else
-  #error
+  #define cr_have_pid(T,P) (pid_task(find_vpid(P),(T)) != NULL)
 #endif
 
 // Process table iterators
@@ -583,4 +583,19 @@
   #error "no cr_do_pipe() definition"
 #endif
 
+#if !defined(DECLARE_MUTEX)
+  #define DECLARE_MUTEX(m) DEFINE_SEMAPHORE(m)
+  #define init_MUTEX(m) sema_init(m, 1)
+#endif
+
+#if HAVE_FS_STRUCT_RWLOCK
+  #define cr_read_lock_fs   read_lock
+  #define cr_read_unlock_fs read_unlock
+#elif HAVE_FS_STRUCT_SPINLOCK
+  #define cr_read_lock_fs   spin_lock
+  #define cr_read_unlock_fs spin_unlock
+#else
+  #error "fs_struct.lock has unknown type"
+#endif
+
 #endif /* _CR_KCOMPAT_H */
diff -Nru blcr-0.8.2/cr_module/cr_mmaps.c blcr-0.8.4/cr_module/cr_mmaps.c
--- blcr-0.8.2/cr_module/cr_mmaps.c	2009-03-26 04:22:43.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_mmaps.c	2011-08-13 01:16:38.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_mmaps.c,v 1.36.8.1 2009/03/26 04:22:43 phargrov Exp $
+ * $Id: cr_mmaps.c,v 1.36.8.4 2011/08/13 01:16:38 eroman Exp $
  *
  * This file handles special memory mappings
  *
@@ -114,12 +114,13 @@
     struct file *filp;
     const char *name;
 
-    mode = 0;
+    mode = (desc->flags & VM_MAYSHARE) ? (S_IWUSR | S_IRUSR) : 0;
     if (desc->flags & VM_MAYREAD)  mode |= S_IRUSR;
     if (desc->flags & VM_MAYWRITE) mode |= S_IWUSR;
     if (desc->flags & VM_MAYEXEC)  mode |= S_IXUSR;
 
-    switch (desc->flags & (VM_MAYREAD|VM_MAYWRITE)) {
+    if (desc->flags & VM_MAYSHARE) flags = O_RDWR;
+    else switch (desc->flags & (VM_MAYREAD|VM_MAYWRITE)) {
     case VM_MAYREAD:	 flags = O_RDONLY; break;
     case VM_MAYWRITE:	 flags = O_WRONLY; break;
     default:		 flags = O_RDWR; break;
@@ -224,7 +225,11 @@
 	if (!filp || (map_addr != desc->start)) {
 fail:
 	    CR_ERR_PROC_REQ(proc_req, "Failed to locate newborn mmap()ed space");
-	    retval = -EINVAL;
+            if ((map_addr != desc->start) && IS_ERR((void *) map_addr)) {
+                retval = map_addr;
+            } else {
+               retval = -EINVAL;
+            }
 	    goto err;
 	}
     }
@@ -280,6 +285,7 @@
 	retval = cr_fstat(proc_req->req->map, map->vm_file);
 	if (retval) {
 	    CR_ERR_PROC_REQ(proc_req, "mmaps_maps: fstat of mapped file failed");
+	    up_read(&mm->mmap_sem);
 	    goto err;
 	}
 	count += !!vmad_is_special_mmap(map, flags);
diff -Nru blcr-0.8.2/cr_module/cr_module.h blcr-0.8.4/cr_module/cr_module.h
--- blcr-0.8.2/cr_module/cr_module.h	2009-06-07 03:27:36.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_module.h	2010-08-12 21:58:32.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_module.h,v 1.285.4.2 2009/06/07 03:27:36 phargrov Exp $
+ * $Id: cr_module.h,v 1.285.4.4 2010/08/12 21:58:32 phargrov Exp $
  */
 
 #ifndef _CR_MODULE_H
@@ -31,7 +31,9 @@
 #include "blcr_config.h"	// Configuration
 
 #include <linux/module.h>
+#ifdef CR_NEED_AUTOCONF_H
 #include <linux/autoconf.h>
+#endif
 
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -266,8 +268,8 @@
         cr_location_t           src;
 	atomic_t                ref_count;
 	struct task_struct     *cr_restart_task;
-	struct file            *cr_restart_stdin;
-	struct file            *cr_restart_stdout;
+	struct file            *dpipe_in;
+	struct file            *dpipe_out;
 	int	                need_procs;
 	cr_rstrt_state_t        state;
 	wait_queue_head_t	wait;		// place for requester to wait for state changes
diff -Nru blcr-0.8.2/cr_module/cr_pipes.c blcr-0.8.4/cr_module/cr_pipes.c
--- blcr-0.8.2/cr_module/cr_pipes.c	2009-06-12 20:37:03.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_pipes.c	2011-09-28 23:10:22.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_pipes.c,v 1.225.8.2 2009/06/12 20:37:03 phargrov Exp $
+ * $Id: cr_pipes.c,v 1.225.8.7 2011/09/28 23:10:22 eroman Exp $
  */
 
 #include "cr_module.h"
@@ -29,12 +29,22 @@
 
 #include <linux/pipe_fs_i.h>
 
-#if !HAVE_PIPE_INODE_INFO_BASE && ((PIPE_BUFFERS * PAGE_SIZE) > CR_KMALLOC_MAX)
-  #define CR_ALLOC_PIPEBUF(_sz)	vmalloc(_sz)
-  #define CR_FREE_PIPEBUF(_buf)	vfree(_buf)
+
+#if HAVE_PIPE_INODE_INFO_BASE
+  #define CR_ALLOC_PIPEBUF(_sz) kmalloc((_sz),GFP_KERNEL)
+  #define CR_FREE_PIPEBUF(_buf) kfree(_buf)
 #else
-  #define CR_ALLOC_PIPEBUF(_sz)	kmalloc((_sz),GFP_KERNEL)
-  #define CR_FREE_PIPEBUF(_buf)	kfree(_buf)
+  #define CR_ALLOC_PIPEBUF(_sz) vmalloc(_sz)
+  #define CR_FREE_PIPEBUF(_buf) vfree(_buf)
+  #if HAVE_PIPE_INODE_INFO_BUFFERS
+    static __inline__ unsigned int cr_pipe_buffers(struct pipe_inode_info *p) {
+      return p->buffers;
+    }
+  #else
+    static __inline__ unsigned int cr_pipe_buffers(struct pipe_inode_info *p) {
+      return PIPE_BUFFERS;
+    }
+  #endif
 #endif
 
 #if HAVE_INODE_SEM
@@ -334,6 +344,12 @@
 	goto out_up;
     }
 
+    if ((buf_len) > PIPE_SIZE) {
+        /* should never happen */
+        retval = -ENOSPC;
+        goto out_up;
+    }
+
     if (buf_len) {
 	memcpy((void *)PIPE_BASE(*p_inode), buf, buf_len);
         PIPE_LEN(*p_inode) = buf_len;
@@ -351,6 +367,14 @@
 	    goto out_up;
 	}
 
+        if (buf_len > cr_pipe_buffers(pipe)*PAGE_SIZE) {
+            /* cr_restore_open_fifo should have done this already. */
+            retval = -ENOSPC;
+            goto out_up;
+            /* Do this here instead of calling pipe_fcntl? 
+             * pipe_set_size(pipe, nr_pages); */
+        }
+
 	nrbufs = 0;
 	p = buf;
 	while (buf_len) {
@@ -485,6 +509,31 @@
     return (err < 0) ? ERR_PTR(err) : p_filp;
 }
 
+#if HAVE_PIPE_FCNTL
+static long cr_pipe_size_init(cr_errbuf_t *eb, struct file *pipe_filp, 
+                              long new_size)
+{
+    static long filp_size;
+
+    /* check the current size */
+    filp_size = pipe_fcntl(pipe_filp, F_GETPIPE_SZ, 0);
+
+    if (filp_size != new_size) {
+        /* resize the thing, this can shrink the pipe, as well as grow it */
+        filp_size = pipe_fcntl(pipe_filp, F_SETPIPE_SZ, new_size);
+
+        if (filp_size < 0) {
+            CR_ERR_EB(eb, "pipe_fcntl: failed with err=%ld", filp_size);
+        } else if (filp_size < new_size) {
+            CR_ERR_EB(eb, "Unable to set pipe size");
+            filp_size = -ENOSPC;
+        }
+    }
+
+    return filp_size;
+}
+#endif
+
 extern int 
 cr_restore_open_fifo(cr_rstrt_proc_req_t *proc_req,
 	struct cr_file_info *file_info, int do_not_restore_flag)
@@ -520,14 +569,31 @@
 	    sys_close(file_info->fd);
 	}
     } else if (!do_not_restore_flag) {
-	/* Deal with a dangling pipe by effectively dup()ing from cr_restart */
-	struct file *old_filp, *filp;
+	/* Deal with a dangling pipe by dup()ing dpipe_{in,out} */
+	struct file *filp;
+	retval = -EBADF;
 	switch (cf_fifo.fifo_flags & O_ACCMODE) {
 	case O_RDONLY:
-	    old_filp = req->cr_restart_stdin;
+	    filp = req->dpipe_in;
+	    if (!filp) {
+		CR_ERR_REQ(req, "No alternate input file when restoring an external pipe");
+		goto out;
+	    }
+	    if (!(filp->f_mode & FMODE_READ)) {
+		CR_ERR_REQ(req, "Alternate input file non-readable when restoring an external pipe");
+		goto out;
+	    }
 	    break;
 	case O_WRONLY:
-	    old_filp = req->cr_restart_stdout;
+	    filp = req->dpipe_out;
+	    if (!filp) {
+		CR_ERR_REQ(req, "No alternate output file when restoring an external pipe");
+		goto out;
+	    }
+	    if (!(filp->f_mode & FMODE_WRITE)) {
+		CR_ERR_REQ(req, "Alternate output file non-writable when restoring an external pipe");
+		goto out;
+	    }
 	    break;
 	default:
 	    CR_ERR_REQ(req, "Invalid access mode %d while restoring external pipe",
@@ -535,12 +601,8 @@
 	    retval = -EINVAL;
 	    goto out;
 	}
-	filp = cr_filp_reopen(old_filp, cf_fifo.fifo_flags);
-	if (IS_ERR(filp)) {
-	    retval = PTR_ERR(filp);
-	    CR_ERR_REQ(req, "Error %d from cr_filp_reopen() while restoring external pipe", retval);
-	    goto out;
-	}
+	CRI_ASSERT(filp != NULL);
+	get_file(filp);
 	retval = cr_fd_claim(file_info->fd);
 	if (retval < 0) {
 	    CR_ERR_REQ(req, "File descriptor %d in use.", file_info->fd);
@@ -579,6 +641,21 @@
             goto out_free;
         }
 
+#if HAVE_PIPE_FCNTL
+        /* resize the pipe buffers while it's still easy. */
+        if (cf_fifo.pipe_sz < cf_fifo.fifo_len) {
+            /* should never ever happen, abort */
+	    CR_ERR_REQ(req, "bad pipe info: (pipe_sz < fifo_len)!");
+            goto out_free;
+        }
+
+        retval = cr_pipe_size_init(eb, p_filp, cf_fifo.pipe_sz);
+        if ((retval < cf_fifo.pipe_sz) || (retval < 0)) {
+	    CR_ERR_REQ(req, "failed to resize pipe buffers");
+            goto out_free;
+        }
+#endif
+
 	/* now read the pipe buffer data, and optionally restore it */
 	retval = cr_restore_pipe_buf(eb, cf_filp, p_filp->f_dentry->d_inode,
                                      cf_fifo.fifo_len, do_not_restore_flag);
@@ -684,6 +761,7 @@
     cf_fifo.fifo_id = inode;
     cf_fifo.fifo_dentry = filp->f_dentry;
     cf_fifo.fifo_len = -1;
+    cf_fifo.pipe_sz = -1;
     cf_fifo.fifo_internal = cr_fifo_is_internal(proc_req->req, inode);
 
     /* Note: cf_fifo.fifo_internal check makes us skip the pipebuf save for external pipes
@@ -712,7 +790,7 @@
 	    int i, curbuf;
 	    char *p;
 
-	    buf = CR_ALLOC_PIPEBUF(PIPE_BUFFERS * PAGE_SIZE);
+	    buf = CR_ALLOC_PIPEBUF(cr_pipe_buffers(pipe)*PAGE_SIZE);
 	    if (!buf) {
 	        retval = -ENOMEM;
 	        cr_pipe_unlock(inode);
@@ -749,8 +827,10 @@
 #endif
 	        p += pbuf->len;
 	        cf_fifo.fifo_len += pbuf->len;
-	        curbuf = (curbuf + 1) & (PIPE_BUFFERS-1);
+	        curbuf = (curbuf + 1) & (cr_pipe_buffers(pipe)-1);
 	    }
+
+
 	}
     #endif
 	cr_pipe_unlock(inode);
@@ -767,6 +847,14 @@
     cf_fifo.fifo_flags = filp->f_flags;
     cf_fifo.fifo_version = filp->f_version;
 
+    /* write out the pipe size, for fcntl(F_SETPIPE_SZ).  Do this without
+     * holding the mutex, since pipe_fcntl tries to acquire it. */
+#if HAVE_PIPE_FCNTL
+    cf_fifo.pipe_sz = pipe_fcntl(filp, F_GETPIPE_SZ, 0);
+#else
+    cf_fifo.pipe_sz = cf_fifo.fifo_len;
+#endif
+
     /* write out fifo structure */
     retval = cr_kwrite(eb, cf_filp, &cf_fifo, sizeof(cf_fifo));
     if (retval != sizeof(cf_fifo)) {
diff -Nru blcr-0.8.2/cr_module/cr_rstrt_req.c blcr-0.8.4/cr_module/cr_rstrt_req.c
--- blcr-0.8.2/cr_module/cr_rstrt_req.c	2009-06-07 03:27:36.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_rstrt_req.c	2011-09-17 00:16:29.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_rstrt_req.c,v 1.393.4.2 2009/06/07 03:27:36 phargrov Exp $
+ * $Id: cr_rstrt_req.c,v 1.393.4.11 2011/09/17 00:16:29 phargrov Exp $
  */
 
 #include "cr_module.h"
@@ -31,6 +31,9 @@
 #include <linux/mman.h>
 #include <linux/major.h>
 #include <asm/uaccess.h>
+#if HAVE_LINUX_AUDIT_H
+#include <linux/audit.h>
+#endif
 
 #include <linux/binfmts.h>
 
@@ -79,15 +82,14 @@
 	goto out_modput;
     }
 
-    req = cr_kmem_cache_zalloc(*req, cr_rstrt_req_cachep, GFP_ATOMIC);
+    CR_NO_LOCKS();
+    req = cr_kmem_cache_zalloc(*req, cr_rstrt_req_cachep, GFP_KERNEL);
     if (req) {
 	CR_KTRACE_ALLOC("Alloc cr_rstrt_req_t %p", req);
         atomic_set(&req->ref_count, 1);
 	req->requester = current->tgid;
 	get_task_struct(current);
 	req->cr_restart_task = current;
-	req->cr_restart_stdin = fget(0);
-	req->cr_restart_stdout = fget(1);
 	req->state = CR_RSTRT_STATE_REQUESTER;
 	init_waitqueue_head(&req->wait);
 	cr_barrier_init(&req->barrier, 1);
@@ -101,6 +103,33 @@
 	INIT_LIST_HEAD(&req->linkage);
 	CR_INIT_WORK(&req->work, &rstrt_watchdog);
 	req->errbuf = cr_errbuf_alloc();
+	{
+	    struct files_struct *files = current->files;
+	    cr_fdtable_t *fdt;
+	    struct file *tmp;
+
+#if !HAVE_STRUCT_FDTABLE
+	    spin_lock(&files->file_lock);
+#endif
+	    rcu_read_lock();
+	    fdt = cr_fdtable(files);
+	    /* Dup stdin, unless marked CLOEXEC */
+	    tmp = fcheck_files(files, 0);
+	    if (tmp && !FD_ISSET(0, fdt->close_on_exec)) {
+		req->dpipe_in = tmp;
+		get_file(tmp);
+	    }
+	    /* Dup stdout, unless marked CLOEXEC */
+	    tmp = fcheck_files(files, 1);
+	    if (tmp && !FD_ISSET(1, fdt->close_on_exec)) {
+		req->dpipe_out = tmp;
+		get_file(tmp);
+	    }
+	    rcu_read_unlock();
+#if !HAVE_STRUCT_FDTABLE
+	    spin_unlock(&files->file_lock);
+#endif
+	}
     } else {
 	goto out_freemap;
     }
@@ -141,8 +170,8 @@
 	cr_loc_put(&req->src, req->file0);
 	cr_loc_free(&req->src);
 	CR_KTRACE_REFCNT("fput()'ing stdin/out");
-	fput(req->cr_restart_stdin);
-	fput(req->cr_restart_stdout);
+	if (req->dpipe_in) fput(req->dpipe_in);
+	if (req->dpipe_out) fput(req->dpipe_out);
 	CR_KTRACE_REFCNT("put_task_struct(cr_restart_task)");
 	put_task_struct(req->cr_restart_task);
 	cr_release_objectmap(req->map);
@@ -1085,6 +1114,7 @@
     list_for_each_entry(entry, &req->linkage, list) {
 	struct task_struct *task = entry->tl_task;
 	int is_leader = (entry->link.pid == entry->link.tgid);
+	int need_set_links = !(list_empty(&task->sibling));
 
 	/* thread_group is already correct by virtue of how we create threads */
 	CRI_ASSERT(is_leader == thread_group_leader(task));
@@ -1094,7 +1124,7 @@
 #ifdef CR_REAL_PARENT
 	CR_REAL_PARENT(task) = entry->link.real_parent;
 #endif
-	SET_LINKS(task);
+	if (need_set_links) { SET_LINKS(task); }
 
 	if (pid_flags & CR_RSTRT_RESTORE_PID) {
 	    cr_change_pid(task, PIDTYPE_PID, entry->link.pid);
@@ -1793,7 +1823,8 @@
       struct file *filp;
       filp = fcheck(fd);
       if (filp) {
-        CR_KTRACE_LOW_LVL("fd=%d filp=%p filp->dentry=%p d_count=%d d_inode=%p", fd, filp, filp->f_dentry, atomic_read(&filp->f_dentry->d_count), filp->f_dentry->d_inode);
+        CR_KTRACE_LOW_LVL("fd=%d filp=%p filp->dentry=%p d_inode=%p",
+                          fd, filp, filp->f_dentry, filp->f_dentry->d_inode);
       }
     }
     spin_unlock(&current->files->file_lock);
@@ -2250,6 +2281,51 @@
     return 0;
 }
 
+static inline int cr_free_audit_context(void)
+{
+#if HAVE_CONFIG_AUDITSYSCALL
+  #if HAVE_AUDIT_DUMMY_CONTEXT
+    if (!audit_dummy_context())
+  #else
+    if (current->audit_context)
+  #endif
+    { /* tell auditing that the ioctl() call is finished with. */
+        CR_KTRACE_LOW_LVL("Finishing audit entry.");
+        /* This ioctl() is never supposed to return, so I don't think it 
+         * matters what return values we set here.  (We report errors 
+         * through the request structure)  We're just going to make up a
+         * successful return code to go with the audit context.  
+         *
+         * We do this early to avoid later calls to sys_linkat() from
+         * invoking audit_getname()
+         *
+         * In the RHEL55 2.6.18 kernel, 
+         * we're causing a BUG() by overflowing the names[] entries
+         * in the audit_context structure.  getname() and audit_getname()
+         * add name entries every time they're called.
+         * This call to audit_syscall_exit() frees the names, and
+         * tears down the audit context attached to our process.
+         */
+    #if HAVE_2_6_17_AUDIT_SYSCALL_EXIT
+	/* linux-2.6.17 through ... */
+        audit_syscall_exit(AUDITSC_RESULT(0), 0);
+    #elif HAVE_2_6_12_AUDIT_SYSCALL_EXIT
+	/* linux-2.6.12 through 2.6.16 */
+        audit_syscall_exit(current, AUDITSC_RESULT(0), 0);
+    #elif HAVE_2_6_6_AUDIT_SYSCALL_EXIT
+	/* linux-2.6.6 through 2.6.11 */
+        audit_syscall_exit(current, 0);
+    #else
+        #error "Don't know how to call audit_syscall_exit()"
+    #endif
+        return 0;
+    }
+#endif
+
+    /* just return success, there's nothing to do */
+    return 0;
+}
+
 // cr_rstrt_child
 //
 // Invoked by a freshly created child process.
@@ -2318,6 +2394,15 @@
 	goto out_release;
     }
 
+    /* deallocate audit context */
+    if (cr_free_audit_context() < 0) {
+        CR_ERR_PROC_REQ(proc_req, "Unable to deallocate audit context!");
+        retval = -EINVAL;
+        req->die = 1;
+        up(&proc_req->serial_mutex);
+        goto out_release;
+    }
+
     /* Initialize parts of req relevant to restoring task linkage */
     if (!test_and_set_bit(0, &proc_req->done_linkage)) {
 	/* First load the linkage */
diff -Nru blcr-0.8.2/cr_module/cr_watchdog.c blcr-0.8.4/cr_module/cr_watchdog.c
--- blcr-0.8.2/cr_module/cr_watchdog.c	2008-08-21 05:22:49.000000000 +0000
+++ blcr-0.8.4/cr_module/cr_watchdog.c	2011-02-17 19:44:12.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_watchdog.c,v 1.7 2008/08/21 05:22:49 phargrov Exp $
+ * $Id: cr_watchdog.c,v 1.7.8.1 2011/02/17 19:44:12 phargrov Exp $
  */
 
 #include "cr_module.h"
@@ -32,7 +32,7 @@
 // Interval for the watchdog to wakeup HZ = 1s
 #define CR_WD_INTERVAL	(HZ)
 
-#if HAVE_STRUCT_DELAYED_WORK
+#if HAVE_STRUCT_DELAYED_WORK && defined(DECLARE_DELAYED_WORK)
   typedef struct work_struct * cr_work_arg_t;
   #define CR_DECLARE_DELAYED_WORK DECLARE_DELAYED_WORK
 #else /* struct work_struct */
diff -Nru blcr-0.8.2/cr_module/Makefile.am blcr-0.8.4/cr_module/Makefile.am
--- blcr-0.8.2/cr_module/Makefile.am	2008-09-03 00:29:00.000000000 +0000
+++ blcr-0.8.4/cr_module/Makefile.am	2010-03-08 21:55:47.000000000 +0000
@@ -31,13 +31,13 @@
 
 BPROC_VERSION	= "4.0.0pre8"
 vmadump_dir	= $(top_srcdir)/vmadump4
-vmad_sources	= $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_ARCH@.c
+vmad_sources	= $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_KARCH@.c
 vmad_include	= -I$(vmadump_dir) -D__NR_vmadump=-1 -DBPROC_VERSION='$(BPROC_VERSION)'
 
 cr_sources	= $(my_sources) $(vmad_sources)
 INCLUDES =	-I$(top_builddir)/include	\
 		-I$(top_srcdir)/include		\
-		-I$(srcdir)/arch/@CR_ARCH@	\
+		-I$(srcdir)/arch/@CR_KARCH@	\
 		$(vmad_include)
 
 # echo an arbitrary make/environment variable (needed by kbuild glue)
diff -Nru blcr-0.8.2/cr_module/Makefile.in blcr-0.8.4/cr_module/Makefile.in
--- blcr-0.8.2/cr_module/Makefile.in	2009-06-17 03:56:45.000000000 +0000
+++ blcr-0.8.4/cr_module/Makefile.in	2011-10-11 22:58:52.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = cr_module
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -41,7 +42,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -119,6 +120,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -200,6 +202,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -219,6 +222,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -281,12 +286,12 @@
 
 BPROC_VERSION = "4.0.0pre8"
 vmadump_dir = $(top_srcdir)/vmadump4
-vmad_sources = $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_ARCH@.c
+vmad_sources = $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_KARCH@.c
 vmad_include = -I$(vmadump_dir) -D__NR_vmadump=-1 -DBPROC_VERSION='$(BPROC_VERSION)'
 cr_sources = $(my_sources) $(vmad_sources)
 INCLUDES = -I$(top_builddir)/include	\
 		-I$(top_srcdir)/include		\
-		-I$(srcdir)/arch/@CR_ARCH@	\
+		-I$(srcdir)/arch/@CR_KARCH@	\
 		$(vmad_include)
 
 EXTRA_DIST = arch license.txt $(my_sources)
@@ -341,7 +346,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -353,7 +364,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -361,7 +372,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -382,7 +399,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -407,14 +424,16 @@
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -424,9 +443,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -477,15 +498,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -514,7 +537,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/debian/changelog blcr-0.8.4/debian/changelog
--- blcr-0.8.2/debian/changelog	2010-12-15 13:59:42.000000000 +0000
+++ blcr-0.8.4/debian/changelog	2011-10-12 17:37:38.000000000 +0000
@@ -1,9 +1,12 @@
-blcr (0.8.2-15ubuntu1) natty; urgency=low
+blcr (0.8.4-0ubuntu0+ppa1) natty; urgency=low
 
-  * debian/patches/04_arm_it_instruction.patch: Add IT instruction
-    to fix armel FTBFS.
+  * Update to upstream 0.8.4 release
+    - Includes our 01_fix_recent.diff, 02_fix_i386_on_amd64.diff, 03_fix_2.6.32, 06_ubuntu_linux-rt_support 08_fix_to_2.6.34
+  * Adds support for kernels upto and including 2.6.38 (Closes: #614560) LP: #700036
+  * Include armhf patch in Debian (Closes: #622720)
+  * Switched linux-headers depends to newer packages (Closes: #628871)
 
- -- Jani Monoses <jani@ubuntu.com>  Wed, 15 Dec 2010 15:59:10 +0200
+ -- Alan Woodland <awoodland@debian.org>  Wed, 12 Oct 2011 12:55:23 +0100
 
 blcr (0.8.2-15) unstable; urgency=low
 
diff -Nru blcr-0.8.2/debian/control blcr-0.8.4/debian/control
--- blcr-0.8.2/debian/control	2010-09-28 14:47:30.000000000 +0000
+++ blcr-0.8.4/debian/control	2011-10-12 12:20:22.000000000 +0000
@@ -46,7 +46,7 @@
 Package: blcr-dkms
 Architecture: all
 Section: kernel
-Depends: dkms, make, linux-headers-2.6-686 | linux-headers-2.6-amd64 | linux-headers-generic | linux-headers, ${misc:Depends}
+Depends: dkms, make, linux-headers-686-pae | linux-headers-amd64 | linux-headers-generic | linux-headers, ${misc:Depends}
 Recommends: blcr-util
 Replaces: blcr-source
 Description: DKMS support for BLCR kernel module
diff -Nru blcr-0.8.2/debian/patches/01_fix_recent.diff blcr-0.8.4/debian/patches/01_fix_recent.diff
--- blcr-0.8.2/debian/patches/01_fix_recent.diff	2010-04-11 13:45:59.000000000 +0000
+++ blcr-0.8.4/debian/patches/01_fix_recent.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_recent.dpatch by  <root@debian-unstable>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream patch to provide recent kernel support.
-## DP: URL: https://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.2+kernel-2.6.31.patch01
-## DP: SA: http://www.nersc.gov/hypermail/checkpoint/1299.html
-
-@DPATCH@
-diff -urNad blcr-0.8.2~/acinclude.m4 blcr-0.8.2/acinclude.m4
---- blcr-0.8.2~/acinclude.m4	2009-06-12 21:37:01.000000000 +0100
-+++ blcr-0.8.2/acinclude.m4	2009-11-09 10:41:12.000000000 +0000
-@@ -953,8 +953,9 @@
- # When complete sets LINUX_SYMTAB_CMD such that
- # "eval $LINUX_SYMTAB_CMD" will produce a System.map on stdout.
- cr_stripped_maps=''
-+m4_define([cr_ksymtab_patt],[[-e '[TD] sys_open' -e '[AB] _end']])
- AC_DEFUN([_CR_CHECK_SYSTEM_MAP],[
--  if test -n "$1" -a -r "$1" && grep ' [[AB]] _end' <"$1" >/dev/null 2>/dev/null; then
-+  if test -n "$1" -a -r "$1" && grep cr_ksymtab_patt <"$1" >/dev/null 2>/dev/null; then
-     if grep -B1 '[[AB]] _end' <"$1" | grep _stext >/dev/null 2>/dev/null; then
-       # Reject "stripped" files (such as in FC2)
-       # Recognized (poorly) by _stext and _end as last two entries.
-@@ -968,7 +969,7 @@
- ])
- AC_DEFUN([_CR_CHECK_VMLINUX],[
-   AC_REQUIRE([AC_PROG_NM])
--  if test -n "$1" -a -r "$1" && ($NM "$1" | grep ' [[AB]] _end') >/dev/null 2>/dev/null; then
-+  if test -n "$1" -a -r "$1" && ($NM "$1" | grep cr_ksymtab_patt) >/dev/null 2>/dev/null; then
-     LINUX_VMLINUX="$1"
-     LINUX_SYMTAB_FILE="$1"
-     LINUX_SYMTAB_CMD="$NM $1 2>/dev/null"
-diff -urNad blcr-0.8.2~/config/kbuild.mak.in blcr-0.8.2/config/kbuild.mak.in
---- blcr-0.8.2~/config/kbuild.mak.in	2008-08-04 19:39:29.000000000 +0100
-+++ blcr-0.8.2/config/kbuild.mak.in	2009-11-09 10:41:12.000000000 +0000
-@@ -26,7 +26,7 @@
- # Remove headers from the list of sources, and sort to remove possible duplicates
- DOT_C := $(sort $(filter %.c,$(SOURCES)))
- 
--ifeq ($(TOPDIR),)
-+ifeq ($(srctree),)
- # not within KBUILD - implement automake's standard goals
- 
- all: $(LINUX_OBJ)/.config prepare
-diff -urNad blcr-0.8.2~/configure.ac blcr-0.8.2/configure.ac
---- blcr-0.8.2~/configure.ac	2009-06-15 23:33:56.000000000 +0100
-+++ blcr-0.8.2/configure.ac	2009-11-09 10:41:12.000000000 +0000
-@@ -454,9 +454,10 @@
- AC_SUBST(CR_CLIENT_LDADD)
- 
- # If building the tests, we can optionally test C++
--if test x"$cr_build_tests" = xyes; then
-+# Note, however, that  bug 2619 reports that we can't call this conditionally.
-+dnl if test x"$cr_build_tests" = xyes; then
-   CR_PROG_CXX
--fi
-+dnl fi
- 
- ################################################################################
- # Check libraries
-@@ -1230,6 +1231,7 @@
- if test -z "${HAVE_2_ARG_FIND_PID}${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
-   CR_BAD_KERNEL([unable to determine how to map (type, pid_nr) -> struct task])
- fi
-+CR_FIND_KSYM([find_task_by_pid_ns],[CODE])
- 
- CR_CHECK_KERNEL_CALL([alloc_pid],[#include <linux/sched.h>])
- if test -n "${HAVE_ALLOC_PID}"; then
-diff -urNad blcr-0.8.2~/cr_module/cr_kcompat.h blcr-0.8.2/cr_module/cr_kcompat.h
---- blcr-0.8.2~/cr_module/cr_kcompat.h	2009-06-12 21:37:03.000000000 +0100
-+++ blcr-0.8.2/cr_module/cr_kcompat.h	2009-11-09 10:41:12.000000000 +0000
-@@ -274,7 +274,8 @@
- #elif HAVE_2_ARG_FIND_PID
-   #define cr_have_pid(T,P) (find_pid((T),(P)) != NULL)
- #else
--  #error
-+  // XXX: untested!
-+  #define cr_have_pid(T,P) (pid_task(find_vpid(P),(T)) != NULL)
- #endif
- 
- // Process table iterators
diff -Nru blcr-0.8.2/debian/patches/02_fix_i386_on_amd64.diff blcr-0.8.4/debian/patches/02_fix_i386_on_amd64.diff
--- blcr-0.8.2/debian/patches/02_fix_i386_on_amd64.diff	2010-04-11 13:46:00.000000000 +0000
+++ blcr-0.8.4/debian/patches/02_fix_i386_on_amd64.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_i386_on_amd64.dpatch by  <awoodland@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add support for kernel architecture not being the same as userland
-
-@DPATCH@
-diff -urNad blcr-0.8.2~/config/kbuild.mak.in blcr-0.8.2/config/kbuild.mak.in
---- blcr-0.8.2~/config/kbuild.mak.in	2008-08-04 19:39:29.000000000 +0100
-+++ blcr-0.8.2/config/kbuild.mak.in	2009-10-22 19:19:53.000000000 +0100
-@@ -1,7 +1,7 @@
- # Here are the configuration bits needed in the "caller" to use this file
- #SUBDIR = vmadump4
- #TARGET = vmadump
--#SOURCES = vmadump_common.c vmadump_@CR_ARCH@.c optional.h
-+#SOURCES = vmadump_common.c vmadump_@CR_KARCH@.c optional.h
- #[optional]EXTRA_CFLAGS = -I$(top_builddir)/include -I$(top_builddir) -I$(srcdir)
- #[optional]IMPORTS_FROM = /some/other/kbuild/module/dir /and/another
- #
-diff -urNad blcr-0.8.2~/configure.ac blcr-0.8.2/configure.ac
---- blcr-0.8.2~/configure.ac	2009-10-22 19:19:39.000000000 +0100
-+++ blcr-0.8.2/configure.ac	2009-10-22 19:19:53.000000000 +0100
-@@ -844,6 +844,22 @@
- # Checks for matching (we hope) symbol table
- CR_LINUX_SYMTAB
- 
-+# Set and substitute CR_KARCH to enable i386 userland on x86_64 kernels
-+CR_KARCH=$CR_ARCH
-+if test $CR_ARCH = i386; then
-+       # probe the System.map to find out if we need to change CR_KARCH at all.
-+       # All this does is count the number of *digits* in a hex formatted address
-+       AC_MSG_NOTICE([Testing if KARCH is the same as ARCH])
-+       symlen=`$LINUX_SYMTAB_CMD | head -n1 | sed 's/ .*$//;s/\(.\)/\1\n/g;s/\n$//'|wc -l`
-+       if test $symlen -eq 16; then
-+               AC_MSG_NOTICE([Changing KARCH to x86_64])
-+               CR_KARCH=x86_64
-+       else
-+               AC_MSG_NOTICE([Not touching KARCH])
-+       fi
-+fi
-+AC_SUBST([CR_KARCH], $CR_KARCH)
-+
- ## Check for optional kernel headers...
- CR_CHECK_KERNEL_HEADER([linux/syscalls.h])
- CR_CHECK_KERNEL_HEADER([linux/pspace.h])
-@@ -1026,7 +1042,7 @@
- if test -n "${HAVE_MAP_VSYSCALL}"; then
-   CR_FIND_KSYM([map_vsyscall],[CODE])
- fi
--if test $CR_ARCH = x86_64; then
-+if test $CR_KARCH = x86_64; then
-   CR_FIND_KSYM([syscall32_setup_pages],[CODE],
- 	[extern int syscall32_setup_pages(void *, int);])
- fi
-@@ -1094,7 +1110,7 @@
- CR_FIND_KSYM([do_sigaltstack],[CODE],
- 	[extern int do_sigaltstack(const stack_t *, stack_t *, unsigned long);])
- 
--if test $CR_ARCH = i386 -o $CR_ARCH = x86_64; then
-+if test $CR_KARCH = i386 -o $CR_KARCH = x86_64; then
-   CR_CHECK_KERNEL_TYPE([struct n_desc_struct],[
- 	#include <linux/sched.h>
- 	#include <asm/desc.h>])
-@@ -1145,7 +1161,7 @@
-   fi
- fi
- 
--if test $CR_ARCH = i386; then
-+if test $CR_KARCH = i386; then
-   CR_CHECK_KERNEL_MEMBER([pt_regs.xcs],[#include <asm/ptrace.h>],[struct pt_regs],[int],[xcs])
-   CR_CHECK_KERNEL_MEMBER([pt_regs.xfs],[#include <asm/ptrace.h>],[struct pt_regs],[int],[xfs])
-   CR_CHECK_KERNEL_MEMBER([pt_regs.xgs],[#include <asm/ptrace.h>],[struct pt_regs],[int],[xgs])
-@@ -1493,7 +1509,7 @@
- CR_FIND_KSYM([sys_mremap],[CODE],
- 	[extern asmlinkage unsigned long sys_mremap(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr);])
- CR_FIND_KSYM([do_sigaction],[CODE])
--if test $CR_ARCH = x86_64; then
-+if test $CR_KARCH = x86_64; then
-   CR_FIND_KSYM([load_gs_index],[CODE])
- 
-   CR_CHECK_KERNEL_CALL([read_pda],[#include <asm/percpu.h>])
-diff -urNad blcr-0.8.2~/cr_module/Makefile.am blcr-0.8.2/cr_module/Makefile.am
---- blcr-0.8.2~/cr_module/Makefile.am	2008-09-03 01:29:00.000000000 +0100
-+++ blcr-0.8.2/cr_module/Makefile.am	2009-10-22 19:19:53.000000000 +0100
-@@ -31,13 +31,13 @@
- 
- BPROC_VERSION	= "4.0.0pre8"
- vmadump_dir	= $(top_srcdir)/vmadump4
--vmad_sources	= $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_ARCH@.c
-+vmad_sources	= $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_KARCH@.c
- vmad_include	= -I$(vmadump_dir) -D__NR_vmadump=-1 -DBPROC_VERSION='$(BPROC_VERSION)'
- 
- cr_sources	= $(my_sources) $(vmad_sources)
- INCLUDES =	-I$(top_builddir)/include	\
- 		-I$(top_srcdir)/include		\
--		-I$(srcdir)/arch/@CR_ARCH@	\
-+		-I$(srcdir)/arch/@CR_KARCH@	\
- 		$(vmad_include)
- 
- # echo an arbitrary make/environment variable (needed by kbuild glue)
diff -Nru blcr-0.8.2/debian/patches/03_fix_2.6.32 blcr-0.8.4/debian/patches/03_fix_2.6.32
--- blcr-0.8.2/debian/patches/03_fix_2.6.32	2010-04-11 13:46:18.000000000 +0000
+++ blcr-0.8.4/debian/patches/03_fix_2.6.32	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-Index: blcr-0.8.2/blcr_imports/module.c
-===================================================================
---- blcr-0.8.2.orig/blcr_imports/module.c	2009-12-20 18:27:40.000000000 +0000
-+++ blcr-0.8.2/blcr_imports/module.c	2009-12-20 18:27:20.000000000 +0000
-@@ -81,7 +81,13 @@
- 
- 	/* Check current kernel against System.map used at configure time */
- 	{
-+#if defined(CR_EXPORTED_KCODE_register_chrdev)
- 	    unsigned long offset1 = CR_EXPORTED_KCODE_register_chrdev - (unsigned long)&register_chrdev;
-+#elif defined(CR_EXPORTED_KCODE___register_chrdev)
-+	    unsigned long offset1 = CR_EXPORTED_KCODE___register_chrdev - (unsigned long)&__register_chrdev;
-+#else
-+	    #error "No register_chrdev symbol for validation of System.map"
-+#endif
- 	    unsigned long offset2 = CR_EXPORTED_KCODE_register_blkdev - (unsigned long)&register_blkdev;
- 	    if (
- #if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PHYSICAL_ALIGN)
-Index: blcr-0.8.2/configure.ac
-===================================================================
---- blcr-0.8.2.orig/configure.ac	2009-12-20 18:27:39.000000000 +0000
-+++ blcr-0.8.2/configure.ac	2009-12-20 18:27:20.000000000 +0000
-@@ -1554,7 +1554,10 @@
- # the System.map used to locate symbols and configure time.
- CR_FIND_EXPORTED_KSYM([register_chrdev],[CODE])
- if test "$cr_addr" = "0"; then
--  CR_BAD_KERNEL([kernel does not export register_chrdev])
-+  CR_FIND_EXPORTED_KSYM([__register_chrdev],[CODE])
-+  if test "$cr_addr" = "0"; then
-+    CR_BAD_KERNEL([kernel does not export register_chrdev or __register_chrdev])
-+  fi
- fi
- CR_FIND_EXPORTED_KSYM([register_blkdev],[CODE])
- if test "$cr_addr" = "0"; then
-Index: blcr-0.8.2/include/blcr_ksyms.h
-===================================================================
---- blcr-0.8.2.orig/include/blcr_ksyms.h	2009-12-20 19:49:37.000000000 +0000
-+++ blcr-0.8.2/include/blcr_ksyms.h	2009-12-20 19:51:03.000000000 +0000
-@@ -55,7 +55,11 @@
- 
- #if defined(__i386__) || defined(__x86_64__)
-   #ifdef CONFIG_RELOCATABLE
--    #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE_register_chrdev + register_chrdev)
-+    #ifndef CR_EXPORTED_KCODE___register_chrdev
-+      #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE_register_chrdev + register_chrdev)
-+    #else
-+      #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE___register_chrdev + __register_chrdev)
-+    #endif
-   #else
-     #define _CR_RELOC_KSYM(_addr) _addr
-   #endif
diff -Nru blcr-0.8.2/debian/patches/04_arm_it_instruction blcr-0.8.4/debian/patches/04_arm_it_instruction
--- blcr-0.8.2/debian/patches/04_arm_it_instruction	1970-01-01 00:00:00.000000000 +0000
+++ blcr-0.8.4/debian/patches/04_arm_it_instruction	2011-10-12 12:15:36.000000000 +0000
@@ -0,0 +1,18 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: blcr-0.8.2/libcr/arch/arm/cr_atomic.h
+===================================================================
+--- blcr-0.8.2.orig/libcr/arch/arm/cr_atomic.h	2010-12-15 15:59:04.000000000 +0200
++++ blcr-0.8.2/libcr/arch/arm/cr_atomic.h	2010-12-15 15:59:03.000000000 +0200
+@@ -166,7 +166,9 @@
+ 	"	adr	lr, 1f		@ lr = return addr	\n"
+ 	"	sub	pc, r3, #" _STRINGIFY(cri_kuser_offset) "\n"
+ #endif
+-	"1:	ldrcc   ip, [r2]        @ if (!swapped) ip=*p   \n"
++	"1:	        \n"
++	"       ite cc                  @ needed in Thumb2 mode \n"
++	"       ldrcc   ip, [r2]        @ if (!swapped) ip=*p   \n"
+ 	"       eorcs   ip, r4, #1      @ else ip=oldval^1      \n"
+ 	"       teq     r4, ip          @ if (ip == oldval)     \n"
+ 	"       beq     0b              @    then retry           "
diff -Nru blcr-0.8.2/debian/patches/04_arm_it_instruction.patch blcr-0.8.4/debian/patches/04_arm_it_instruction.patch
--- blcr-0.8.2/debian/patches/04_arm_it_instruction.patch	2010-12-15 13:59:09.000000000 +0000
+++ blcr-0.8.4/debian/patches/04_arm_it_instruction.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
-Index: blcr-0.8.2/libcr/arch/arm/cr_atomic.h
-===================================================================
---- blcr-0.8.2.orig/libcr/arch/arm/cr_atomic.h	2010-12-15 15:59:04.000000000 +0200
-+++ blcr-0.8.2/libcr/arch/arm/cr_atomic.h	2010-12-15 15:59:03.000000000 +0200
-@@ -166,7 +166,9 @@
- 	"	adr	lr, 1f		@ lr = return addr	\n"
- 	"	sub	pc, r3, #" _STRINGIFY(cri_kuser_offset) "\n"
- #endif
--	"1:	ldrcc   ip, [r2]        @ if (!swapped) ip=*p   \n"
-+	"1:	        \n"
-+	"       ite cc                  @ needed in Thumb2 mode \n"
-+	"       ldrcc   ip, [r2]        @ if (!swapped) ip=*p   \n"
- 	"       eorcs   ip, r4, #1      @ else ip=oldval^1      \n"
- 	"       teq     r4, ip          @ if (ip == oldval)     \n"
- 	"       beq     0b              @    then retry           "
diff -Nru blcr-0.8.2/debian/patches/06_ubuntu_linux-rt_support blcr-0.8.4/debian/patches/06_ubuntu_linux-rt_support
--- blcr-0.8.2/debian/patches/06_ubuntu_linux-rt_support	2010-04-11 13:46:18.000000000 +0000
+++ blcr-0.8.4/debian/patches/06_ubuntu_linux-rt_support	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-Index: blcr-0.8.2/configure.ac
-===================================================================
---- blcr-0.8.2.orig/configure.ac	2010-03-09 11:28:24.000000000 +0000
-+++ blcr-0.8.2/configure.ac	2010-03-09 11:28:53.000000000 +0000
-@@ -1002,7 +1002,7 @@
- fi
- 
- # put_task_struct() requires one of these:
--CR_FIND_KSYM([__put_task_struct],[CODE])
-+CR_FIND_KSYM([__put_task_struct],[CODE],[extern void __put_task_struct(struct task_struct *);])
- CR_FIND_KSYM([__put_task_struct_cb],[CODE])
- 
- CR_CHECK_KERNEL_MEMBER([mm.task_size],[#include <linux/sched.h>],
-Index: blcr-0.8.2/cr_module/cr_kcompat.h
-===================================================================
---- blcr-0.8.2.orig/cr_module/cr_kcompat.h	2010-03-09 11:29:27.000000000 +0000
-+++ blcr-0.8.2/cr_module/cr_kcompat.h	2010-03-09 11:29:45.000000000 +0000
-@@ -584,4 +584,9 @@
-   #error "no cr_do_pipe() definition"
- #endif
- 
-+#if !defined(DECLARE_MUTEX)
-+  #define DECLARE_MUTEX(m) DEFINE_SEMAPHORE(m)
-+  #define init_MUTEX(m) sema_init(m, 1)
-+#endif
-+
- #endif /* _CR_KCOMPAT_H */
diff -Nru blcr-0.8.2/debian/patches/07_fix_cross_pbuilder blcr-0.8.4/debian/patches/07_fix_cross_pbuilder
--- blcr-0.8.2/debian/patches/07_fix_cross_pbuilder	2010-10-12 09:42:55.000000000 +0000
+++ blcr-0.8.4/debian/patches/07_fix_cross_pbuilder	2011-10-12 12:04:01.000000000 +0000
@@ -1,7 +1,7 @@
-Index: blcr-0.8.2/configure.ac
+Index: blcr-0.8.4/configure.ac
 ===================================================================
---- blcr-0.8.2.orig/configure.ac	2010-10-12 10:39:32.000000000 +0100
-+++ blcr-0.8.2/configure.ac	2010-10-12 10:42:49.000000000 +0100
+--- blcr-0.8.4.orig/configure.ac	2011-10-11 23:11:37.000000000 +0100
++++ blcr-0.8.4/configure.ac	2011-10-12 13:03:55.000000000 +0100
 @@ -215,6 +215,7 @@
      ;;
    x86_64)
@@ -10,7 +10,7 @@
      cr_wordsize=8
      ;;
    ppc64|powerpc64)
-@@ -683,7 +684,7 @@
+@@ -686,7 +687,7 @@
  CR_LIBARCH=$CR_ARCH
  if test $ac_cv_sizeof_void_p != $cr_wordsize; then
    if test $cr_wordsize = 8; then
diff -Nru blcr-0.8.2/debian/patches/08_fix_to_2.6.34 blcr-0.8.4/debian/patches/08_fix_to_2.6.34
--- blcr-0.8.2/debian/patches/08_fix_to_2.6.34	2010-09-28 14:02:48.000000000 +0000
+++ blcr-0.8.4/debian/patches/08_fix_to_2.6.34	1970-01-01 00:00:00.000000000 +0000
@@ -1,388 +0,0 @@
-Index: blcr-0.8.2/acinclude.m4
-===================================================================
---- blcr-0.8.2.orig/acinclude.m4	2010-09-28 15:02:44.000000000 +0100
-+++ blcr-0.8.2/acinclude.m4	2010-09-28 15:01:26.000000000 +0100
-@@ -246,8 +246,8 @@
-     my ($srcdir, $cpp_cmd) = @ARGV;
-     my $stamp = time;
-     $cpp_cmd =~ s/([#()])/\\$1/g; # quote problematic shell metachars
--    FILE: foreach my $file qw/version.h utsrelease.h/ {
--      my $path = "$srcdir/include/linux/$file";
-+    FILE: foreach my $file qw(linux/version.h linux/utsrelease.h generated/utsrelease.h) {
-+      my $path = "$srcdir/include/$file";
-       next FILE unless (-f $path);
-       open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
-       LINE: while (<F>) {
-@@ -577,6 +577,14 @@
-   done])
-   KCFLAGS="$cr_cvname"
-   popdef([cr_cvname])[]dnl
-+  AC_MSG_CHECKING([if autoconf.h is included implicitly])
-+  if echo "$KCFLAGS" | grep 'include [[^ ]]*/autoconf\.h' >/dev/null 2>&1; then
-+    AC_MSG_RESULT([yes]);
-+  else
-+    AC_MSG_RESULT([no]);
-+    AC_DEFINE([CR_NEED_AUTOCONF_H], [1])
-+    AH_TEMPLATE([CR_NEED_AUTOCONF_H], [Define to 1 if linux/autoconf.h must be included explicitly])
-+  fi
-   # Do these init steps early, in case first CR_FIND_KSYM is a conditional call
-   AC_REQUIRE([_CR_KSYM_INIT_PATTS])
-   AC_REQUIRE([_CR_KSYM_INIT_FILES])
-@@ -1046,7 +1054,9 @@
-   # XXX: Currently just check SMPness. Can this be more aggressive?
-   AC_MSG_CHECKING([for SMP kernel source])
-   CR_CACHED_KERNEL_COMPILE([smp_source],[
--	#include <linux/autoconf.h>
-+	#ifdef CR_NEED_AUTOCONF_H
-+	  #include <linux/autoconf.h>
-+	#endif
- 	#ifndef CONFIG_SMP
- 	    choke me
- 	#endif
-@@ -1074,11 +1084,11 @@
- AC_DEFUN([_CR_KSYM_INIT_PATTS],[
-   case "$CR_ARCH" in
-     ppc64)
--      CR_KSYM_PATTERN_DATA=['[bBdDrRtT] ']
-+      CR_KSYM_PATTERN_DATA=['[bBdDgGrRsStTvV] ']
-       CR_KSYM_PATTERN_CODE=['[dD] ']   dnl Function descriptor is data
-       ;;
-     *)
--      CR_KSYM_PATTERN_DATA=['[bBdDrRtT] ']
-+      CR_KSYM_PATTERN_DATA=['[bBdDgGrRsStTvV] ']
-       CR_KSYM_PATTERN_CODE=['[tT] ']
-       ;;
-   esac
-@@ -1249,8 +1259,10 @@
-   pushdef([cr_cvname],cr_cv_kconfig_kmalloc_max)[]dnl
-   AC_CACHE_CHECK([[kernel for maximum kmalloc() allocation]],cr_cvname,[
-     cr_kmalloc_default="131072 (default)"
-+    cr_header="${LINUX_OBJ}/include/generated/autoconf.h"
-+    test -e "$cr_header" || cr_header="${LINUX_OBJ}/include/linux/autoconf.h"
-     cr_cvname=`eval "$CPP $CPPFLAGS -I${LINUX_OBJ}/include \
--			-include ${LINUX_OBJ}/include/linux/autoconf.h\
-+			-include ${cr_header} \
- 			${LINUX_OBJ}/include/linux/kmalloc_sizes.h" 2>/dev/null | \
- 		$PERL -n -e 'BEGIN {$max=0;}' \
- 			 -e ['if (/CACHE\s*\(\s*([0-9]+)\s*\)/ && ($][1 > $max)) { $max = $][1; }'] \
-Index: blcr-0.8.2/blcr_imports/module.c
-===================================================================
---- blcr-0.8.2.orig/blcr_imports/module.c	2010-09-28 15:02:44.000000000 +0100
-+++ blcr-0.8.2/blcr_imports/module.c	2010-09-28 15:01:26.000000000 +0100
-@@ -26,7 +26,9 @@
- 
- #include "blcr_config.h"
- 
-+#ifdef CR_NEED_AUTOCONF_H
- #include <linux/autoconf.h>
-+#endif
- #if defined(CONFIG_SMP) && ! defined(__SMP__)
-   #define __SMP__
- #endif
-@@ -56,7 +58,11 @@
- #endif
- #include <linux/version.h>
- #ifndef UTS_RELEASE
-+ #if HAVE_LINUX_UTSRELEASE_H
-   #include <linux/utsrelease.h>
-+ #elif HAVE_GENERATED_UTSRELEASE_H
-+  #include <generated/utsrelease.h>
-+ #endif
- #endif
- #if HAVE_LINUX_COMPILE_H
-   #include <linux/compile.h>
-Index: blcr-0.8.2/configure.ac
-===================================================================
---- blcr-0.8.2.orig/configure.ac	2010-09-28 15:02:44.000000000 +0100
-+++ blcr-0.8.2/configure.ac	2010-09-28 15:01:26.000000000 +0100
-@@ -868,11 +868,15 @@
- CR_CHECK_KERNEL_HEADER([linux/compile.h])
- CR_CHECK_KERNEL_HEADER([linux/fdtable.h])
- CR_CHECK_KERNEL_HEADER([linux/utrace.h])
-+CR_CHECK_KERNEL_HEADER([linux/perf_event.h])
- CR_CHECK_KERNEL_HEADER([asm/elf.h])
- CR_CHECK_KERNEL_HEADER([asm/desc.h],[#include <linux/sched.h>])
- CR_CHECK_KERNEL_HEADER([asm/vsyscall32.h])
- CR_CHECK_KERNEL_HEADER([asm/i387.h])
- 
-+CR_CHECK_KERNEL_HEADER([linux/utsrelease.h])
-+CR_CHECK_KERNEL_HEADER([generated/utsrelease.h])
-+
- ## Now we check for specific kernel features...
- 
- CR_FIND_KSYM([timeval_to_jiffies],[CODE])
-@@ -1136,6 +1140,10 @@
- 	[struct thread_struct],[unsigned long],[debugreg0])
-   CR_CHECK_KERNEL_MEMBER([thread.debugregs],[#include <asm/processor.h>],
- 	[struct thread_struct],[unsigned long],[debugreg[1]])
-+  CR_CHECK_KERNEL_MEMBER([thread.ptrace_bps],[
-+	#include <linux/perf_event.h>
-+	#include <asm/processor.h>],
-+	[struct thread_struct],[struct perf_event *],[ptrace_bps[1]])
-   CR_CHECK_KERNEL_MEMBER([thread.i387],[#include <asm/processor.h>],
- 	[struct thread_struct],[union i387_union],[i387])
-   CR_CHECK_KERNEL_MEMBER([thread.xstate],[#include <asm/processor.h>],
-@@ -1523,7 +1531,10 @@
-     else
-       CR_FIND_KSYM([per_cpu__old_rsp],[DATA],[DECLARE_PER_CPU(unsigned long, old_rsp);])
-       if test -z "$cr_addr"; then
--        AC_MSG_ERROR([failed to locate symbol per_cpu__old_rsp])
-+        CR_FIND_KSYM([old_rsp],[DATA],[DECLARE_PER_CPU(unsigned long, old_rsp);])
-+        if test -z "$cr_addr"; then
-+          AC_MSG_ERROR([failed to locate either symbol per_cpu__old_rsp or old_rsp])
-+        fi
-       fi
-     fi
-   fi
-Index: blcr-0.8.2/cr_module/cr_chkpt_req.c
-===================================================================
---- blcr-0.8.2.orig/cr_module/cr_chkpt_req.c	2010-09-28 15:02:43.000000000 +0100
-+++ blcr-0.8.2/cr_module/cr_chkpt_req.c	2010-09-28 15:01:26.000000000 +0100
-@@ -321,9 +321,13 @@
- #elif HAVE_TASK_PTRACE
- 	struct task_struct *child;
- 	CR_DO_EACH_CHILD(child, task) {
--		if (child->ptrace & PT_PTRACED) {
-+	    struct task_struct *thread = child;
-+	    if (!thread_group_leader(child)) continue;
-+	    do {
-+		if (thread->ptrace & PT_PTRACED) {
- 			return 1;
- 		}
-+	    } while_each_thread(child, thread);
- 	} CR_WHILE_EACH_CHILD(child, task);
- 	return 0;
- #else
-@@ -730,12 +734,15 @@
- 
- 			/* Add all the children - we get their children in the list_for_each() */
- 			CR_DO_EACH_CHILD(child, task) {
--
--				if (child->mm == root_mm) continue;	/* Already visited */
--				result = add_task(req, child);
-+			    struct task_struct *thread = child;
-+			    if (!thread_group_leader(child)) continue;
-+			    do {
-+				if (thread->mm == root_mm) continue;	/* Already visited */
-+				result = add_task(req, thread);
- 				if (result) {
- 					goto out_fail;
- 				}
-+			    } while_each_thread(child, thread);
- 			} CR_WHILE_EACH_CHILD(child, task);
- 		}
- 	}
-Index: blcr-0.8.2/cr_module/cr_module.h
-===================================================================
---- blcr-0.8.2.orig/cr_module/cr_module.h	2010-09-28 15:02:43.000000000 +0100
-+++ blcr-0.8.2/cr_module/cr_module.h	2010-09-28 15:01:26.000000000 +0100
-@@ -31,7 +31,9 @@
- #include "blcr_config.h"	// Configuration
- 
- #include <linux/module.h>
-+#ifdef CR_NEED_AUTOCONF_H
- #include <linux/autoconf.h>
-+#endif
- 
- #include <linux/kernel.h>
- #include <linux/types.h>
-Index: blcr-0.8.2/cr_module/cr_rstrt_req.c
-===================================================================
---- blcr-0.8.2.orig/cr_module/cr_rstrt_req.c	2010-09-28 15:02:43.000000000 +0100
-+++ blcr-0.8.2/cr_module/cr_rstrt_req.c	2010-09-28 15:01:26.000000000 +0100
-@@ -1085,6 +1085,7 @@
-     list_for_each_entry(entry, &req->linkage, list) {
- 	struct task_struct *task = entry->tl_task;
- 	int is_leader = (entry->link.pid == entry->link.tgid);
-+	int need_set_links = !(list_empty(&task->sibling));
- 
- 	/* thread_group is already correct by virtue of how we create threads */
- 	CRI_ASSERT(is_leader == thread_group_leader(task));
-@@ -1094,7 +1095,7 @@
- #ifdef CR_REAL_PARENT
- 	CR_REAL_PARENT(task) = entry->link.real_parent;
- #endif
--	SET_LINKS(task);
-+	if (need_set_links) { SET_LINKS(task); }
- 
- 	if (pid_flags & CR_RSTRT_RESTORE_PID) {
- 	    cr_change_pid(task, PIDTYPE_PID, entry->link.pid);
-Index: blcr-0.8.2/include/blcr_imports.h.in
-===================================================================
---- blcr-0.8.2.orig/include/blcr_imports.h.in	2010-09-28 15:02:43.000000000 +0100
-+++ blcr-0.8.2/include/blcr_imports.h.in	2010-09-28 15:01:26.000000000 +0100
-@@ -33,7 +33,9 @@
- #ifndef _BLCR_IMPORTS_H
- #define _BLCR_IMPORTS_H	1
- 
-+#ifdef CR_NEED_AUTOCONF_H
- #include <linux/autoconf.h>
-+#endif
- #if defined(CONFIG_SMP) && ! defined(__SMP__)
-   #define __SMP__
- #endif
-Index: blcr-0.8.2/vmadump4/vmadump_alpha.c
-===================================================================
---- blcr-0.8.2.orig/vmadump4/vmadump_alpha.c	2010-09-28 15:02:45.000000000 +0100
-+++ blcr-0.8.2/vmadump4/vmadump_alpha.c	2010-09-28 15:01:26.000000000 +0100
-@@ -21,7 +21,9 @@
-  *-----------------------------------------------------------------------*/
- #define __NO_VERSION__
- 
-+#ifdef CR_NEED_AUTOCONF_H
- #include <linux/autoconf.h>
-+#endif
- #if defined(CONFIG_SMP) && ! defined(__SMP__)
- #define __SMP__
- #endif
-Index: blcr-0.8.2/vmadump4/vmadump_i386.c
-===================================================================
---- blcr-0.8.2.orig/vmadump4/vmadump_i386.c	2010-09-28 15:02:45.000000000 +0100
-+++ blcr-0.8.2/vmadump4/vmadump_i386.c	2010-09-28 15:01:26.000000000 +0100
-@@ -190,7 +190,7 @@
- 
-     /* XXX FIX ME: RESTORE DEBUG INFORMATION ?? */
-     /* Here we read it but ignore it. */
--    r = vmadump_restore_debugreg(ctx, file, threadtmp);
-+    r = vmadump_restore_debugreg(ctx, file);
-     if (r < 0) goto bad_read;
- 
-     /* Restore TLS information */
-Index: blcr-0.8.2/vmadump4/vmadump_x86.h
-===================================================================
---- blcr-0.8.2.orig/vmadump4/vmadump_x86.h	2010-09-28 15:02:45.000000000 +0100
-+++ blcr-0.8.2/vmadump4/vmadump_x86.h	2010-09-28 15:01:26.000000000 +0100
-@@ -26,6 +26,9 @@
- 
- #include <asm/desc.h>
- #include <asm/i387.h>
-+#if HAVE_LINUX_PERF_EVENT_H
-+  #include <linux/perf_event.h>
-+#endif
- 
- /* set_used_math() first appears in 2.6.11 */
- #ifndef set_used_math
-@@ -214,42 +217,38 @@
- /* Save debugging state */
- static
- long vmadump_store_debugreg(cr_chkpt_proc_req_t *ctx, struct file *file) {
-+    struct thread_struct *const thread = &current->thread;
-+    unsigned long debugregs[6];
-     long r, bytes = 0;
- 
- #if HAVE_THREAD_DEBUGREGS
--    r = write_kern(ctx, file, &current->thread.debugreg,
--		   sizeof(current->thread.debugreg));
--    if (r != sizeof(current->thread.debugreg)) goto err;
--    bytes += r;
-+    {	int i;
-+	for (i=0; i<6; ++i) debugregs[i] = thread->debugreg[i];
-+    }
- #elif HAVE_THREAD_DEBUGREG0
--    r = write_kern(ctx, file, &current->thread.debugreg0,
--		   sizeof(current->thread.debugreg0));
--    if (r != sizeof(current->thread.debugreg0)) goto err;
--    bytes += r;
--    r = write_kern(ctx, file, &current->thread.debugreg1,
--		   sizeof(current->thread.debugreg1));
--    if (r != sizeof(current->thread.debugreg1)) goto err;
--    bytes += r;
--    r = write_kern(ctx, file, &current->thread.debugreg2,
--		   sizeof(current->thread.debugreg2));
--    if (r != sizeof(current->thread.debugreg2)) goto err;
--    bytes += r;
--    r = write_kern(ctx, file, &current->thread.debugreg3,
--		   sizeof(current->thread.debugreg3));
--    if (r != sizeof(current->thread.debugreg3)) goto err;
--    bytes += r;
--    r = write_kern(ctx, file, &current->thread.debugreg6,
--		   sizeof(current->thread.debugreg6));
--    if (r != sizeof(current->thread.debugreg6)) goto err;
--    bytes += r;
--    r = write_kern(ctx, file, &current->thread.debugreg7,
--		   sizeof(current->thread.debugreg7));
--    if (r != sizeof(current->thread.debugreg7)) goto err;
--    bytes += r;
-+    debugregs[0] = thread->debugreg0;
-+    debugregs[1] = thread->debugreg1;
-+    debugregs[2] = thread->debugreg2;
-+    debugregs[3] = thread->debugreg3;
-+    debugregs[4] = thread->debugreg6;
-+    debugregs[5] = thread->debugreg7;
-+#elif HAVE_THREAD_PTRACE_BPS
-+    {	int i;
-+	for (i=0; i<4; ++i) {
-+	    struct perf_event *bp = thread->ptrace_bps[i];
-+	    debugregs[i] = bp ? bp->hw.info.address : 0;
-+	}
-+	debugregs[4] = thread->debugreg6;
-+	debugregs[5] = thread->ptrace_dr7; /* XXX: is this correct? */
-+    }
- #else
-     #error
- #endif
- 
-+    r = write_kern(ctx, file, &debugregs, sizeof(debugregs));
-+    if (r != sizeof(debugregs)) goto err;
-+    bytes += r;
-+
-     return bytes;
- 
-  err:
-@@ -259,29 +258,12 @@
- 
- /* Read (but don't restore) debugging state */
- static
--int vmadump_restore_debugreg(cr_rstrt_proc_req_t *ctx, struct file *file,
--                             struct thread_struct *threadtmp) {
-+int vmadump_restore_debugreg(cr_rstrt_proc_req_t *ctx, struct file *file) {
-+    unsigned long debugregs[6];
-     int r;
- 
--#if HAVE_THREAD_DEBUGREGS
--    r = read_kern(ctx, file, threadtmp->debugreg, sizeof(threadtmp->debugreg));
--    if (r != sizeof(threadtmp->debugreg)) goto bad_read;
--#elif HAVE_THREAD_DEBUGREG0
--    r = read_kern(ctx, file, &threadtmp->debugreg0, sizeof(threadtmp->debugreg0));
--    if (r != sizeof(threadtmp->debugreg0)) goto bad_read;
--    r = read_kern(ctx, file, &threadtmp->debugreg1, sizeof(threadtmp->debugreg1));
--    if (r != sizeof(threadtmp->debugreg1)) goto bad_read;
--    r = read_kern(ctx, file, &threadtmp->debugreg2, sizeof(threadtmp->debugreg2));
--    if (r != sizeof(threadtmp->debugreg2)) goto bad_read;
--    r = read_kern(ctx, file, &threadtmp->debugreg3, sizeof(threadtmp->debugreg3));
--    if (r != sizeof(threadtmp->debugreg3)) goto bad_read;
--    r = read_kern(ctx, file, &threadtmp->debugreg6, sizeof(threadtmp->debugreg6));
--    if (r != sizeof(threadtmp->debugreg6)) goto bad_read;
--    r = read_kern(ctx, file, &threadtmp->debugreg7, sizeof(threadtmp->debugreg7));
--    if (r != sizeof(threadtmp->debugreg7)) goto bad_read;
--#else
--    #error
--#endif
-+    r = read_kern(ctx, file, &debugregs, sizeof(debugregs));
-+    if (r != sizeof(debugregs)) goto bad_read;
- 
-     return 0;
- 
-Index: blcr-0.8.2/vmadump4/vmadump_x86_64.c
-===================================================================
---- blcr-0.8.2.orig/vmadump4/vmadump_x86_64.c	2010-09-28 15:02:45.000000000 +0100
-+++ blcr-0.8.2/vmadump4/vmadump_x86_64.c	2010-09-28 15:01:26.000000000 +0100
-@@ -21,7 +21,9 @@
-  *
-  * THIS VERSION MODIFIED FOR BLCR <http://ftg.lbl.gov/checkpoint>
-  *-----------------------------------------------------------------------*/
-+#ifdef CR_NEED_AUTOCONF_H
- #include <linux/autoconf.h>
-+#endif
- #if defined(CONFIG_SMP) && ! defined(__SMP__)
- #define __SMP__
- #endif
-@@ -202,7 +204,7 @@
- 	
-     /* XXX FIX ME: RESTORE DEBUG INFORMATION ?? */
-     /* Here we read it but ignore it. */
--    r = vmadump_restore_debugreg(ctx, file, threadtmp);
-+    r = vmadump_restore_debugreg(ctx, file);
-     if (r < 0) goto bad_read;
- 
-     /* user(r)sp, since we don't use the ptrace entry path in BLCR */
diff -Nru blcr-0.8.2/debian/patches/11_bashisms blcr-0.8.4/debian/patches/11_bashisms
--- blcr-0.8.2/debian/patches/11_bashisms	2010-05-18 16:21:12.000000000 +0000
+++ blcr-0.8.4/debian/patches/11_bashisms	2011-10-12 12:04:43.000000000 +0000
@@ -1,38 +1,38 @@
-Index: blcr-0.8.2/autogen.sh
+Index: blcr-0.8.4/autogen.sh
 ===================================================================
---- blcr-0.8.2.orig/autogen.sh	2008-04-29 19:53:37.000000000 +0100
-+++ blcr-0.8.2/autogen.sh	2010-05-18 12:23:34.000000000 +0100
+--- blcr-0.8.4.orig/autogen.sh	2011-08-24 00:22:04.000000000 +0100
++++ blcr-0.8.4/autogen.sh	2011-10-12 13:04:39.000000000 +0100
 @@ -1,4 +1,4 @@
 -#! /bin/sh 
 +#! /bin/bash
  #
  #   Berkeley Lab Checkpoint/Restart (BLCR) for Linux is Copyright (c)
  #   2008, The Regents of the University of California, through Lawrence
-Index: blcr-0.8.2/config/install-sh
+Index: blcr-0.8.4/config/install-sh
 ===================================================================
---- blcr-0.8.2.orig/config/install-sh	2010-05-18 12:22:48.000000000 +0100
-+++ blcr-0.8.2/config/install-sh	2010-05-18 17:20:43.000000000 +0100
+--- blcr-0.8.4.orig/config/install-sh	2011-10-11 23:58:52.000000000 +0100
++++ blcr-0.8.4/config/install-sh	2011-10-12 13:04:39.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  # install - install a program, script, or datafile
  
- scriptversion=2004-02-15.20
-Index: blcr-0.8.2/contrib/batch_build.in
+ scriptversion=2005-05-14.22
+Index: blcr-0.8.4/contrib/batch_build.in
 ===================================================================
---- blcr-0.8.2.orig/contrib/batch_build.in	2007-03-05 21:57:17.000000000 +0000
-+++ blcr-0.8.2/contrib/batch_build.in	2010-05-18 12:23:34.000000000 +0100
+--- blcr-0.8.4.orig/contrib/batch_build.in	2007-03-05 21:57:17.000000000 +0000
++++ blcr-0.8.4/contrib/batch_build.in	2011-10-12 13:04:39.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  # Given a list of kernel build directories on the command line,
  # this script will try to compile blcr against each of them.
  # This depends on having a System.map file in the kernel dir
-Index: blcr-0.8.2/acinclude.m4
+Index: blcr-0.8.4/acinclude.m4
 ===================================================================
---- blcr-0.8.2.orig/acinclude.m4	2010-05-18 17:20:50.000000000 +0100
-+++ blcr-0.8.2/acinclude.m4	2010-05-18 17:21:09.000000000 +0100
-@@ -338,7 +338,7 @@
+--- blcr-0.8.4.orig/acinclude.m4	2011-09-29 23:46:50.000000000 +0100
++++ blcr-0.8.4/acinclude.m4	2011-10-12 13:04:39.000000000 +0100
+@@ -340,7 +340,7 @@
    fi
    # Check that version is acceptible (exact match, or a prefix with the next char non-numeric)
    case "$cr_linux_obj_ver" in
diff -Nru blcr-0.8.2/debian/patches/99_rerun_autoconf blcr-0.8.4/debian/patches/99_rerun_autoconf
--- blcr-0.8.2/debian/patches/99_rerun_autoconf	2010-10-12 09:44:47.000000000 +0000
+++ blcr-0.8.4/debian/patches/99_rerun_autoconf	2011-10-12 12:19:19.000000000 +0000
@@ -1,14 +1,14 @@
-Index: blcr-0.8.2/Makefile.in
+Index: blcr-0.8.4/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/Makefile.in	2010-10-12 10:44:40.000000000 +0100
-+++ blcr-0.8.2/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/Makefile.in	2011-10-11 23:58:56.000000000 +0100
++++ blcr-0.8.4/Makefile.in	2011-10-12 13:18:44.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -32,17 +32,15 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -33,7 +31,9 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
+@@ -35,6 +33,7 @@
  POST_UNINSTALL = :
-+build_triplet = @build@
+ build_triplet = @build@
  host_triplet = @host@
 +subdir = .
  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/blcr_config.h.in \
  	$(top_srcdir)/blcr_imports/kbuild/Makefile.in \
-@@ -42,106 +42,92 @@
+@@ -43,107 +42,92 @@
  	./config/config.guess ./config/config.sub ./config/depcomp \
  	./config/install-sh ./config/ltmain.sh ./config/missing \
  	COPYING COPYING.LIB NEWS
@@ -54,9 +52,8 @@
  	$(ACLOCAL_M4)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 - configure.lineno configure.status.lineno
--mkinstalldirs = $(mkdir_p)
 + configure.lineno config.status.lineno
-+mkinstalldirs = $(install_sh) -d
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = blcr_config.h
  CONFIG_CLEAN_FILES = cr_module/kbuild/Makefile \
  	blcr_imports/kbuild/Makefile config/kbuild.mak
@@ -183,7 +180,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -191,11 +188,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -162,20 +148,20 @@
+@@ -164,20 +148,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -217,7 +215,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -183,12 +169,11 @@
+@@ -185,12 +170,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -231,7 +229,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -204,70 +189,91 @@
+@@ -206,17 +190,26 @@
  
  # Our rpm specfile wants to query some vars
  LINUX_VER = @LINUX_VER@
@@ -241,6 +239,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -257,21 +256,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -230,16 +223,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -285,11 +278,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -251,28 +242,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -312,7 +301,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -331,7 +319,7 @@
  
  ###
  # Optional directories
-@@ -336,19 +342,19 @@
+@@ -341,19 +344,19 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -357,7 +345,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -363,22 +369,23 @@
+@@ -368,22 +371,23 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -388,7 +376,7 @@
  	rm -f stamp-h1
  	touch $@
  
-@@ -398,8 +405,7 @@
+@@ -403,8 +407,7 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -398,29 +386,22 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -408,7 +414,13 @@
+@@ -413,7 +416,7 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
+-	@failcom='exit 1'; \
 +	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -419,16 +431,21 @@
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -430,16 +433,15 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
 -	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
+ 	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -428,26 +409,19 @@
  
 -mostlyclean-recursive clean-recursive distclean-recursive \
 -maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
+-	@failcom='exit 1'; \
 +$(RECURSIVE_CLEAN_TARGETS):
 +	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -448,16 +465,16 @@
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -465,16 +467,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
 -	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
+ 	  || eval $$failcom; \
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -461,7 +435,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -465,97 +482,122 @@
+@@ -482,14 +484,14 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -477,19 +451,13 @@
 -	tags=; \
 +	set x; \
  	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
+@@ -501,84 +503,103 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
+ 	    test ! -f $$subdir/TAGS || \
 -	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	    test ! -f $$subdir/TAGS || \
 +	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
@@ -499,14 +467,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -514,7 +482,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) blcr_config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -600,9 +568,11 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || mkdir "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
 +	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
+-	    distdir=`$(am__cd) $(distdir) && pwd`; \
+-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 -	    (cd $$subdir && \
 +	  fi; \
 +	done
@@ -618,8 +588,8 @@
 +	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 +	    ($(am__cd) $$subdir && \
  	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="../$(top_distdir)" \
--	        distdir="../$(distdir)/$$subdir" \
+-	        top_distdir="$$top_distdir" \
+-	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
 +		am__remove_distdir=: \
@@ -628,11 +598,11 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -563,21 +605,31 @@
+@@ -586,11 +607,13 @@
  	$(MAKE) $(AM_MAKEFLAGS) \
  	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
  	  dist-hook
--	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+-	-find $(distdir) -type d ! -perm -755 -exec chmod a+rwx,go+rx {} \; -o \
 +	-test -n "$(am__skip_mode_fix)" \
 +	|| find "$(distdir)" -type d ! -perm -755 \
 +		-exec chmod u+rwx,go+rx {} \; -o \
@@ -643,61 +613,45 @@
 +	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 +	|| chmod -R a+r "$(distdir)"
  dist-gzip: distdir
--	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ 	$(am__remove_distdir)
+@@ -599,6 +622,14 @@
+ 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
  	$(am__remove_distdir)
  
- dist-bzip2: distdir
--	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
-+
 +dist-lzma: distdir
 +	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 +	$(am__remove_distdir)
 +
 +dist-xz: distdir
 +	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
- 	$(am__remove_distdir)
- 
++	$(am__remove_distdir)
++
  dist-tarZ: distdir
--	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
-+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- 	$(am__remove_distdir)
- 
- dist-shar: distdir
-@@ -590,7 +642,7 @@
- 	$(am__remove_distdir)
- 
- dist dist-all: distdir
--	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
  	$(am__remove_distdir)
- 
- # This target untars the dist file and tries a VPATH configuration.  Then
-@@ -599,13 +651,17 @@
+@@ -622,13 +653,17 @@
  distcheck: dist
  	case '$(DIST_ARCHIVES)' in \
  	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 +	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
  	*.tar.bz2*) \
--	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
 +	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 +	*.tar.lzma*) \
 +	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 +	*.tar.xz*) \
 +	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
  	*.tar.Z*) \
--	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
-+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
  	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 +	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
  	*.zip*) \
  	  unzip $(distdir).zip ;;\
  	esac
-@@ -613,9 +669,11 @@
+@@ -636,9 +671,11 @@
  	mkdir $(distdir)/_build
  	mkdir $(distdir)/_inst
  	chmod a-w $(distdir)
@@ -710,7 +664,7 @@
  	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
  	    $(DISTCHECK_CONFIGURE_FLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) \
-@@ -637,13 +695,15 @@
+@@ -660,13 +697,15 @@
  	  && rm -rf "$$dc_destdir" \
  	  && $(MAKE) $(AM_MAKEFLAGS) dist \
  	  && rm -rf $(DIST_ARCHIVES) \
@@ -729,17 +683,15 @@
  	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
  	   || { echo "ERROR: files left after uninstall:" ; \
  	        if test -n "$(DESTDIR)"; then \
-@@ -685,7 +745,8 @@
- clean-generic:
+@@ -709,6 +748,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
  
  maintainer-clean-generic:
-@@ -707,18 +768,38 @@
+@@ -730,18 +770,38 @@
  
  html: html-recursive
  
@@ -778,7 +730,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -739,26 +820,28 @@
+@@ -762,27 +822,29 @@
  
  ps-am:
  
@@ -792,36 +744,41 @@
 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \
 -	am--refresh check check-am check-local clean clean-generic \
 -	clean-libtool clean-local clean-recursive ctags \
--	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
--	dist-tarZ dist-zip distcheck distclean distclean-generic \
--	distclean-hdr distclean-libtool distclean-local \
--	distclean-recursive distclean-tags distcleancheck distdir \
 +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 +	all all-am all-local am--refresh check check-am check-local \
 +	clean clean-generic clean-libtool clean-local ctags \
-+	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
+ 	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
+-	dist-shar dist-tarZ dist-zip distcheck distclean \
+-	distclean-generic distclean-hdr distclean-libtool \
+-	distclean-local distclean-recursive distclean-tags \
+-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-data-local install-exec \
+-	install-exec-am install-exec-local install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-generic mostlyclean-libtool \
+-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am uninstall-local
 +	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
 +	distclean distclean-generic distclean-hdr distclean-libtool \
 +	distclean-local distclean-tags distcleancheck distdir \
- 	distuninstallcheck dvi dvi-am html html-am info info-am \
- 	install install-am install-data install-data-am \
--	install-data-local install-exec install-exec-am \
--	install-exec-local install-info install-info-am install-man \
++	distuninstallcheck dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am \
 +	install-data-local install-dvi install-dvi-am install-exec \
 +	install-exec-am install-exec-local install-html \
 +	install-html-am install-info install-info-am install-man \
 +	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	installdirs-am maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
--	tags tags-recursive uninstall uninstall-am uninstall-info-am \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am maintainer-clean maintainer-clean-generic \
 +	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 +	ps ps-am tags tags-recursive uninstall uninstall-am \
- 	uninstall-local
++	uninstall-local
  
  
-@@ -863,6 +946,7 @@
+ # Clean out CVS droppings
+@@ -886,6 +948,7 @@
  	@echo $($(VARNAME)) | sed 's/"/\\"/'g
  
  .PHONY: dist-srpm dist-oscar rpms examples util libcr tests bonus-check echoval $(module_phony)
@@ -829,29 +786,28 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/aclocal.m4
+Index: blcr-0.8.4/aclocal.m4
 ===================================================================
---- blcr-0.8.2.orig/aclocal.m4	2010-10-12 10:44:40.000000000 +0100
-+++ blcr-0.8.2/aclocal.m4	2010-10-12 10:44:09.000000000 +0100
+--- blcr-0.8.4.orig/aclocal.m4	2011-10-11 23:58:41.000000000 +0100
++++ blcr-0.8.4/aclocal.m4	2011-10-12 13:18:38.000000000 +0100
 @@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
+-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
  
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005  Free Software Foundation, Inc.
 +# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -11,103 +11,196 @@
+@@ -11,103 +11,206 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
 +m4_ifndef([AC_AUTOCONF_VERSION],
 +  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-+[m4_warning([this file was generated for autoconf 2.67.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
++[m4_warning([this file was generated for autoconf 2.68.
 +You have another version of autoconf.  It may work, but is not guaranteed to.
 +If you have problems, you may need to regenerate the build system entirely.
 +To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -859,7 +815,8 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +#
 +#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
++#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
++#                 Inc.
 +#   Written by Gordon Matzigkeit, 1996
 +#
 +# This file is free software; the Free Software Foundation gives
@@ -868,7 +825,8 @@
 +
 +m4_define([_LT_COPYING], [dnl
 +#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
++#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
++#                 Inc.
 +#   Written by Gordon Matzigkeit, 1996
 +#
 +#   This file is part of GNU Libtool.
@@ -895,8 +853,8 @@
 +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 +])
  
--# serial 47 AC_PROG_LIBTOOL
-+# serial 56 LT_INIT
+-# serial 48 AC_PROG_LIBTOOL
++# serial 57 LT_INIT
  
  
 -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -973,6 +931,7 @@
 +# ------------------
 +AC_DEFUN([LT_INIT],
 +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
++AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 +AC_BEFORE([$0], [LT_LANG])dnl
 +AC_BEFORE([$0], [LT_OUTPUT])dnl
 +AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -989,6 +948,8 @@
 +AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 +m4_require([_LT_PROG_LTMAIN])dnl
 +
++_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
++
 +dnl Parse OPTIONS
 +_LT_SET_OPTIONS([$0], [$1])
  
@@ -1008,6 +969,13 @@
 +# Only expand once:
 +m4_define([LT_INIT])
 +])# LT_INIT
++
++# Old names:
++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
++dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
  
 -# AC_LIBTOOL_SETUP
 -# ----------------
@@ -1017,13 +985,6 @@
 -AC_REQUIRE([AC_ENABLE_STATIC])dnl
 -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+# Old names:
-+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-+
 +
 +# _LT_CC_BASENAME(CC)
 +# -------------------
@@ -1037,7 +998,7 @@
 +    *) break;;
 +  esac
 +done
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +])
 +
 +
@@ -1057,6 +1018,13 @@
 +m4_defun([_LT_SETUP],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
  AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
++AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+ 
 +_LT_DECL([], [host_alias], [0], [The host system])dnl
 +_LT_DECL([], [host], [0])dnl
 +_LT_DECL([], [host_os], [0])dnl
@@ -1065,11 +1033,7 @@
 +_LT_DECL([], [build], [0])dnl
 +_LT_DECL([], [build_os], [0])dnl
 +dnl
- AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_LD])dnl
--AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
--AC_REQUIRE([AC_PROG_NM])dnl
--
++AC_REQUIRE([AC_PROG_CC])dnl
 +AC_REQUIRE([LT_PATH_LD])dnl
 +AC_REQUIRE([LT_PATH_NM])dnl
 +dnl
@@ -1080,17 +1044,20 @@
 -AC_REQUIRE([AC_EXEEXT])dnl
 +test -z "$LN_S" && LN_S="ln -s"
 +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-+dnl
+ dnl
 +AC_REQUIRE([LT_CMD_MAX_LEN])dnl
 +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
 +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
- dnl
++dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_CHECK_SHELL_FEATURES])dnl
++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 +m4_require([_LT_CMD_RELOAD])dnl
 +m4_require([_LT_CHECK_MAGIC_METHOD])dnl
++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 +m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
++m4_require([_LT_WITH_SYSROOT])dnl
 +
 +_LT_CONFIG_LIBTOOL_INIT([
 +# See if we are running on zsh, and set the options which allow our
@@ -1111,32 +1078,28 @@
 -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 -_LT_AC_PROG_ECHO_BACKSLASH
 +m4_require([_LT_TAG_COMPILER])dnl
-+_LT_PROG_ECHO_BACKSLASH
  
  case $host_os in
  aix3*)
-@@ -123,5851 +216,7818 @@
+@@ -121,451 +224,1109 @@
+   ;;
+ esac
  
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
 -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
- 
- # Same as above, but do not quote variable references.
+-
+-# Same as above, but do not quote variable references.
 -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
- 
- # Sed substitution to delay expansion of an escaped shell variable in a
- # double_quote_subst'ed string.
- delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
- 
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
- # Sed substitution to avoid accidental globbing in evaled expressions
- no_glob_subst='s/\*/\\\*/g'
- 
+-
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+-
 -# Constants:
 -rm="rm -f"
 -
@@ -1145,8 +1108,7 @@
 +ofile=libtool
  can_build_shared=yes
  
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
+ # All known linkers require a `.a' archive for static linking (except MSVC,
  # which needs '.lib').
  libext=a
 -ltmain="$ac_aux_dir/ltmain.sh"
@@ -1167,8 +1129,8 @@
 -test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
+ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 -test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
  test -z "$LD" && LD=ld
 -test -z "$LN_S" && LN_S="ln -s"
 -test -z "$MAGIC_CMD" && MAGIC_CMD=file
@@ -1187,15 +1149,16 @@
 -if test -n "$RANLIB"; then
 -  case $host_os in
 -  openbsd*)
--    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
 -    ;;
 -  *)
--    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
 -    ;;
 -  esac
 -  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 -fi
-+_LT_CC_BASENAME([$compiler])
+-
+ _LT_CC_BASENAME([$compiler])
  
  # Only perform the check for file, if the check method requires it
 +test -z "$MAGIC_CMD" && MAGIC_CMD=file
@@ -1235,6 +1198,39 @@
 -AC_LIBTOOL_LANG_C_CONFIG
 -_LT_AC_TAGCONFIG
 -])# AC_LIBTOOL_SETUP
++# _LT_PREPARE_SED_QUOTE_VARS
++# --------------------------
++# Define a few sed substitution that help us do robust quoting.
++m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
++[# Backslashify metacharacters that are still active within
++# double-quoted strings.
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+ 
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+ 
+-# _LT_AC_SYS_COMPILER
+-# -------------------
+-AC_DEFUN([_LT_AC_SYS_COMPILER],
+-[AC_REQUIRE([AC_PROG_CC])dnl
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+ 
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++])
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-])# _LT_AC_SYS_COMPILER
 +# _LT_PROG_LTMAIN
 +# ---------------
 +# Note that this code is called both from `configure', and `config.status'
@@ -1248,22 +1244,26 @@
 +])# _LT_PROG_LTMAIN
  
  
--# _LT_AC_SYS_COMPILER
+-# _LT_CC_BASENAME(CC)
 -# -------------------
--AC_DEFUN([_LT_AC_SYS_COMPILER],
--[AC_REQUIRE([AC_PROG_CC])dnl
- 
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
+-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+-AC_DEFUN([_LT_CC_BASENAME],
+-[for cc_temp in $1""; do
+-  case $cc_temp in
+-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
 +# So that we can recreate a full libtool script including additional
 +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
 +# in macros and then make a single call at the end using the `libtool'
 +# label.
- 
--# Allow CC to be a program name with arguments.
--compiler=$CC
--])# _LT_AC_SYS_COMPILER
- 
++
++
 +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
 +# ----------------------------------------
 +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
@@ -1272,6 +1272,66 @@
 +          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
 +                     [$1
 +])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_INIT])
++
++
++# _LT_CONFIG_LIBTOOL([COMMANDS])
++# ------------------------------
++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL],
++[m4_ifval([$1],
++          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
++                     [$1
++])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
++
++
++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
++# -----------------------------------------------------
++m4_defun([_LT_CONFIG_SAVE_COMMANDS],
++[_LT_CONFIG_LIBTOOL([$1])
++_LT_CONFIG_LIBTOOL_INIT([$2])
+ ])
+ 
+ 
+-# _LT_COMPILER_BOILERPLATE
+-# ------------------------
+-# Check for compiler boilerplate output or warnings with
+-# the simple compiler test code.
+-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_compiler_boilerplate=`cat conftest.err`
+-$rm conftest*
+-])# _LT_COMPILER_BOILERPLATE
++# _LT_FORMAT_COMMENT([COMMENT])
++# -----------------------------
++# Add leading comment marks to the start of each line, and a trailing
++# full-stop to the whole comment if one is not present already.
++m4_define([_LT_FORMAT_COMMENT],
++[m4_ifval([$1], [
++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
++              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
++)])
+ 
+ 
+-# _LT_LINKER_BOILERPLATE
+-# ----------------------
+-# Check for linker boilerplate output or warnings with
+-# the simple link test code.
+-AC_DEFUN([_LT_LINKER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
+-])# _LT_LINKER_BOILERPLATE
+ 
  
 -# _LT_AC_SYS_LIBPATH_AIX
 -# ----------------------
@@ -1290,9 +1350,23 @@
 -}'`; fi],[])
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 -])# _LT_AC_SYS_LIBPATH_AIX
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
  
++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
++# -------------------------------------------------------------------
++# CONFIGNAME is the name given to the value in the libtool script.
++# VARNAME is the (base) name used in the configure script.
++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
++# VARNAME.  Any other value will be used directly.
++m4_define([_LT_DECL],
++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
++    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
++	[m4_ifval([$1], [$1], [$2])])
++    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
++    m4_ifval([$4],
++	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
++    lt_dict_add_subkey([lt_decl_dict], [$2],
++	[tagged?], [m4_ifval([$5], [yes], [no])])])
++])
  
 -# _LT_AC_SHELL_INIT(ARG)
 -# ----------------------
@@ -1303,27 +1377,29 @@
 -$1
 -AC_DIVERT_POP
 -])# _LT_AC_SHELL_INIT
-+# _LT_CONFIG_LIBTOOL([COMMANDS])
-+# ------------------------------
-+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-+                     [$1
-+])])])
+ 
++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
++# --------------------------------------------------------
++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
 +
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
 +
++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_tag_varnames],
++[_lt_decl_filter([tagged?], [yes], $@)])
 +
-+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-+# -----------------------------------------------------
-+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-+[_LT_CONFIG_LIBTOOL([$1])
-+_LT_CONFIG_LIBTOOL_INIT([$2])
++
++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
++# ---------------------------------------------------------
++m4_define([_lt_decl_filter],
++[m4_case([$#],
++  [0], [m4_fatal([$0: too few arguments: $#])],
++  [1], [m4_fatal([$0: too few arguments: $#: $1])],
++  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
++  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
++  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
 +])
  
- 
 -# _LT_AC_PROG_ECHO_BACKSLASH
 -# --------------------------
 -# Add some code to the start of the generated configure script which
@@ -1332,16 +1408,7 @@
 -[_LT_AC_SHELL_INIT([
 -# Check that we are running under the correct shell.
 -SHELL=${CONFIG_SHELL-/bin/sh}
-+# _LT_FORMAT_COMMENT([COMMENT])
-+# -----------------------------
-+# Add leading comment marks to the start of each line, and a trailing
-+# full-stop to the whole comment if one is not present already.
-+m4_define([_LT_FORMAT_COMMENT],
-+[m4_ifval([$1], [
-+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-+)])
- 
+-
 -case X$ECHO in
 -X*--fallback-echo)
 -  # Remove one level of quotation (which was required for Make).
@@ -1363,6 +1430,41 @@
 -  # Restart under the correct shell.
 -  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
 -fi
++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
++# --------------------------------------------------
++m4_define([lt_decl_quote_varnames],
++[_lt_decl_filter([value], [1], $@)])
++
++
++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
++# ---------------------------------------------------
++m4_define([lt_decl_dquote_varnames],
++[_lt_decl_filter([value], [2], $@)])
++
++
++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
++# ---------------------------------------------------
++m4_define([lt_decl_varnames_tagged],
++[m4_assert([$# <= 2])dnl
++_$0(m4_quote(m4_default([$1], [[, ]])),
++    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
++    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
++m4_define([_lt_decl_varnames_tagged],
++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
++
++
++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_all_varnames],
++[_$0(m4_quote(m4_default([$1], [[, ]])),
++     m4_if([$2], [],
++	   m4_quote(lt_decl_varnames),
++	m4_quote(m4_shift($@))))[]dnl
++])
++m4_define([_lt_decl_all_varnames],
++[lt_join($@, lt_decl_varnames_tagged([$1],
++			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
++])
  
 -if test "X[$]1" = X--fallback-echo; then
 -  # used as fallback echo
@@ -1375,37 +1477,28 @@
  
 -# The HP-UX ksh and POSIX shell print the target directory to stdout
 -# if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++# _LT_CONFIG_STATUS_DECLARE([VARNAME])
++# ------------------------------------
++# Quote a variable value, and forward it to `config.status' so that its
++# declaration there will have the same value as in `configure'.  VARNAME
++# must have a single quote delimited value for this to work.
++m4_define([_LT_CONFIG_STATUS_DECLARE],
++[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
  
 -if test -z "$ECHO"; then
 -if test "X${echo_test_string+set}" != Xset; then
 -# find a string as large as possible, as long as the shell can cope with it
 -  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
 -    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
+-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+-       echo_test_string=`eval $cmd` &&
 -       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
 -    then
 -      break
 -    fi
 -  done
 -fi
-+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-+# -------------------------------------------------------------------
-+# CONFIGNAME is the name given to the value in the libtool script.
-+# VARNAME is the (base) name used in the configure script.
-+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-+# VARNAME.  Any other value will be used directly.
-+m4_define([_LT_DECL],
-+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-+	[m4_ifval([$1], [$1], [$2])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-+    m4_ifval([$4],
-+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2],
-+	[tagged?], [m4_ifval([$5], [yes], [no])])])
-+])
  
 -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
 -   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
@@ -1417,6 +1510,17 @@
 -  #   echo "$something" | sed 's/\\/\\\\/g'
 -  #
 -  # So, first we look for a working echo in the user's PATH.
++# _LT_CONFIG_STATUS_DECLARATIONS
++# ------------------------------
++# We delimit libtool config variables with single quotes, so when
++# we write them to config.status, we have to be sure to quote all
++# embedded single quotes properly.  In configure, this macro expands
++# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
++#
++#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
++    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
  
 -  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 -  for dir in $PATH /usr/ucb; do
@@ -1430,27 +1534,6 @@
 -    fi
 -  done
 -  IFS="$lt_save_ifs"
-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-+# --------------------------------------------------------
-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-+
-+
-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_tag_varnames],
-+[_lt_decl_filter([tagged?], [yes], $@)])
-+
-+
-+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-+# ---------------------------------------------------------
-+m4_define([_lt_decl_filter],
-+[m4_case([$#],
-+  [0], [m4_fatal([$0: too few arguments: $#])],
-+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-+])
  
 -  if test "X$echo" = Xecho; then
 -    # We didn't find a better echo, so look for alternatives.
@@ -1492,6 +1575,13 @@
 -      else
 -	# maybe with a smaller string...
 -	prev=:
++# _LT_LIBTOOL_TAGS
++# ----------------
++# Output comment and list of tags supported by the script
++m4_defun([_LT_LIBTOOL_TAGS],
++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
++available_tags="_LT_TAGS"dnl
++])
  
 -	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
 -	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
@@ -1500,41 +1590,6 @@
 -	  fi
 -	  prev="$cmd"
 -	done
-+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-+# --------------------------------------------------
-+m4_define([lt_decl_quote_varnames],
-+[_lt_decl_filter([value], [1], $@)])
-+
-+
-+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_dquote_varnames],
-+[_lt_decl_filter([value], [2], $@)])
-+
-+
-+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_varnames_tagged],
-+[m4_assert([$# <= 2])dnl
-+_$0(m4_quote(m4_default([$1], [[, ]])),
-+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-+m4_define([_lt_decl_varnames_tagged],
-+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-+
-+
-+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_all_varnames],
-+[_$0(m4_quote(m4_default([$1], [[, ]])),
-+     m4_if([$2], [],
-+	   m4_quote(lt_decl_varnames),
-+	m4_quote(m4_shift($@))))[]dnl
-+])
-+m4_define([_lt_decl_all_varnames],
-+[lt_join($@, lt_decl_varnames_tagged([$1],
-+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-+])
  
 -	if test "$prev" != 'sed 50q "[$]0"'; then
 -	  echo_test_string=`eval $prev`
@@ -1549,94 +1604,6 @@
 -  fi
 -fi
 -fi
- 
--# Copy echo and quote the copy suitably for passing to libtool from
--# the Makefile, instead of quoting the original, which is used later.
--ECHO=$echo
--if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
--   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
--fi
-+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-+# ------------------------------------
-+# Quote a variable value, and forward it to `config.status' so that its
-+# declaration there will have the same value as in `configure'.  VARNAME
-+# must have a single quote delimited value for this to work.
-+m4_define([_LT_CONFIG_STATUS_DECLARE],
-+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
- 
--AC_SUBST(ECHO)
--])])# _LT_AC_PROG_ECHO_BACKSLASH
- 
-+# _LT_CONFIG_STATUS_DECLARATIONS
-+# ------------------------------
-+# We delimit libtool config variables with single quotes, so when
-+# we write them to config.status, we have to be sure to quote all
-+# embedded single quotes properly.  In configure, this macro expands
-+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-+#
-+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
- 
--# _LT_AC_LOCK
--# -----------
--AC_DEFUN([_LT_AC_LOCK],
--[AC_ARG_ENABLE([libtool-lock],
--    [AC_HELP_STRING([--disable-libtool-lock],
--	[avoid locking (might break parallel builds)])])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
--# Some flags need to be propagated to the compiler or linker for good
--# libtool support.
--case $host in
--ia64-*-hpux*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.$ac_objext` in
--    *ELF-32*)
--      HPUX_IA64_MODE="32"
--      ;;
--    *ELF-64*)
--      HPUX_IA64_MODE="64"
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--*-*-irix6*)
--  # Find out which ABI we are using.
--  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--   if test "$lt_cv_prog_gnu_ld" = yes; then
--    case `/usr/bin/file conftest.$ac_objext` in
--    *32-bit*)
--      LD="${LD-ld} -melf32bsmip"
--      ;;
--    *N32*)
--      LD="${LD-ld} -melf32bmipn32"
--      ;;
--    *64-bit*)
--      LD="${LD-ld} -melf64bmip"
--      ;;
--    esac
--   else
--    case `/usr/bin/file conftest.$ac_objext` in
--    *32-bit*)
--      LD="${LD-ld} -32"
--      ;;
--    *N32*)
--      LD="${LD-ld} -n32"
-+# _LT_LIBTOOL_TAGS
-+# ----------------
-+# Output comment and list of tags supported by the script
-+m4_defun([_LT_LIBTOOL_TAGS],
-+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-+available_tags="_LT_TAGS"dnl
-+])
-+
-+
 +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
 +# -----------------------------------
 +# Extract the dictionary values for VARNAME (optionally with TAG) and
@@ -1656,8 +1623,16 @@
 +    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
 +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
 +])
-+
-+
+ 
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
+-ECHO=$echo
+-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+-fi
+ 
+-AC_SUBST(ECHO)
+-])])# _LT_AC_PROG_ECHO_BACKSLASH
 +# _LT_LIBTOOL_CONFIG_VARS
 +# -----------------------
 +# Produce commented declarations of non-tagged libtool config variables
@@ -1668,14 +1643,31 @@
 +[m4_foreach([_lt_var],
 +    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
 +    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-+
-+
+ 
+ 
+-# _LT_AC_LOCK
+-# -----------
+-AC_DEFUN([_LT_AC_LOCK],
+-[AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 +# _LT_LIBTOOL_TAG_VARS(TAG)
 +# -------------------------
 +m4_define([_LT_LIBTOOL_TAG_VARS],
 +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
 +    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-+
+ 
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-ia64-*-hpux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *ELF-32*)
+-      HPUX_IA64_MODE="32"
 +
 +# _LT_TAGVAR(VARNAME, [TAGNAME])
 +# ------------------------------
@@ -1721,109 +1713,103 @@
 +LTCFLAGS='$LTCFLAGS'
 +compiler='$compiler_DEFAULT'
 +
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
++{
++  eval 'cat <<_LTECHO_EOF
++\$[]1
++_LTECHO_EOF'
++}
++
 +# Quote evaled strings.
 +for var in lt_decl_all_varnames([[ \
 +]], lt_decl_quote_varnames); do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    *[[\\\\\\\`\\"\\\$]]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
        ;;
--    *64-bit*)
--      LD="${LD-ld} -64"
+-    *ELF-64*)
+-      HPUX_IA64_MODE="64"
 +    *)
 +      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
        ;;
      esac
--   fi
 -  fi
 -  rm -rf conftest*
 -  ;;
-+done
- 
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+-*-*-irix6*)
 -  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
+-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
 -  if AC_TRY_EVAL(ac_compile); then
--    case "`/usr/bin/file conftest.o`" in
+-   if test "$lt_cv_prog_gnu_ld" = yes; then
+-    case `/usr/bin/file conftest.$ac_objext` in
 -    *32-bit*)
--      case $host in
--        x86_64-*linux*)
--          LD="${LD-ld} -m elf_i386"
--          ;;
--        ppc64-*linux*|powerpc64-*linux*)
--          LD="${LD-ld} -m elf32ppclinux"
--          ;;
--        s390x-*linux*)
--          LD="${LD-ld} -m elf_s390"
--          ;;
--        sparc64-*linux*)
--          LD="${LD-ld} -m elf32_sparc"
--          ;;
--      esac
+-      LD="${LD-ld} -melf32bsmip"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -melf32bmipn32"
++done
++
 +# Double-quote double-evaled strings.
 +for var in lt_decl_all_varnames([[ \
 +]], lt_decl_dquote_varnames); do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    *[[\\\\\\\`\\"\\\$]]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
        ;;
 -    *64-bit*)
--      case $host in
--        x86_64-*linux*)
--          LD="${LD-ld} -m elf_x86_64"
--          ;;
--        ppc*-*linux*|powerpc*-*linux*)
--          LD="${LD-ld} -m elf64ppc"
--          ;;
--        s390*-*linux*)
--          LD="${LD-ld} -m elf64_s390"
--          ;;
--        sparc*-*linux*)
--          LD="${LD-ld} -m elf64_sparc"
--          ;;
--      esac
+-      LD="${LD-ld} -melf64bmip"
+-      ;;
+-    esac
+-   else
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
 +    *)
 +      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
        ;;
      esac
--  fi
--  rm -rf conftest*
 +done
 +
-+# Fix-up fallback echo if it was mangled by the above quoting rules.
-+case \$lt_ECHO in
-+*'\\\[$]0 --fallback-echo"')dnl "
-+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-   ;;
-+esac
- 
--*-*-sco3.2v5*)
--  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
--  SAVE_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -belf"
--  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
--    [AC_LANG_PUSH(C)
--     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
--     AC_LANG_POP])
--  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
--    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
--    CFLAGS="$SAVE_CFLAGS"
--  fi
--  ;;
--AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
--[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
--  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
--  AC_CHECK_TOOL(AS, as, false)
--  AC_CHECK_TOOL(OBJDUMP, objdump, false)
--  ;;
--  ])
--esac
 +_LT_OUTPUT_LIBTOOL_INIT
 +])
- 
--need_locks="$enable_libtool_lock"
- 
--])# _LT_AC_LOCK
++
++# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
++# ------------------------------------
++# Generate a child script FILE with all initialization necessary to
++# reuse the environment learned by the parent script, and make the
++# file executable.  If COMMENT is supplied, it is inserted after the
++# `#!' sequence but before initialization text begins.  After this
++# macro, additional text can be appended to FILE to form the body of
++# the child script.  The macro ends with non-zero status if the
++# file could not be fully written (such as if the disk is full).
++m4_ifdef([AS_INIT_GENERATED],
++[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
++[m4_defun([_LT_GENERATED_FILE_INIT],
++[m4_require([AS_PREPARE])]dnl
++[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
++[lt_write_fail=0
++cat >$1 <<_ASEOF || lt_write_fail=1
++#! $SHELL
++# Generated by $as_me.
++$2
++SHELL=\${CONFIG_SHELL-$SHELL}
++export SHELL
++_ASEOF
++cat >>$1 <<\_ASEOF || lt_write_fail=1
++AS_SHELL_SANITIZE
++_AS_PREPARE
++exec AS_MESSAGE_FD>&1
++_ASEOF
++test $lt_write_fail = 0 && chmod +x $1[]dnl
++m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
++
 +# LT_OUTPUT
 +# ---------
 +# This macro allows early generation of the libtool script (before
@@ -1832,20 +1818,11 @@
 +AC_DEFUN([LT_OUTPUT],
 +[: ${CONFIG_LT=./config.lt}
 +AC_MSG_NOTICE([creating $CONFIG_LT])
-+cat >"$CONFIG_LT" <<_LTEOF
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate a libtool stub with the current configuration.
-+
-+lt_cl_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_LTEOF
++_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
++[# Run this file to recreate a libtool stub with the current configuration.])
 +
 +cat >>"$CONFIG_LT" <<\_LTEOF
-+AS_SHELL_SANITIZE
-+_AS_PREPARE
- 
-+exec AS_MESSAGE_FD>&1
++lt_cl_silent=false
 +exec AS_MESSAGE_LOG_FD>>config.log
 +{
 +  echo
@@ -1871,44 +1848,10 @@
 +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 +configured by $[0], generated by m4_PACKAGE_STRING.
 +
-+Copyright (C) 2008 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
 +This config.lt script is free software; the Free Software Foundation
 +gives unlimited permision to copy, distribute and modify it."
- 
--# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
--# ----------------------------------------------------------------
--# Check whether the given compiler option works
--AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
--[AC_REQUIRE([LT_AC_PROG_SED])
--AC_CACHE_CHECK([$1], [$2],
--  [$2=no
--  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="$3"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
--   # The option is referenced via a variable to avoid confusing sed.
--   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
--   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
--   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
--   (eval "$lt_compile" 2>conftest.err)
--   ac_status=$?
--   cat conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
--   if (exit $ac_status) && test -s "$ac_outfile"; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s conftest.err; then
--       $2=yes
--     fi
--   fi
--   $rm conftest*
--])
++
 +while test $[#] != 0
 +do
 +  case $[1] in
@@ -1920,54 +1863,21 @@
 +      debug=: ;;
 +    --quiet | --q* | --silent | --s* | -q )
 +      lt_cl_silent=: ;;
- 
--if test x"[$]$2" = xyes; then
--    ifelse([$5], , :, [$5])
--else
--    ifelse([$6], , :, [$6])
--fi
--])# AC_LIBTOOL_COMPILER_OPTION
++
 +    -*) AC_MSG_ERROR([unrecognized option: $[1]
 +Try \`$[0] --help' for more information.]) ;;
- 
++
 +    *) AC_MSG_ERROR([unrecognized argument: $[1]
 +Try \`$[0] --help' for more information.]) ;;
 +  esac
 +  shift
 +done
- 
--# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--#                          [ACTION-SUCCESS], [ACTION-FAILURE])
--# ------------------------------------------------------------
--# Check whether the given compiler option works
--AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
--[AC_CACHE_CHECK([$1], [$2],
--  [$2=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS $3"
--   printf "$lt_simple_link_test_code" > conftest.$ac_ext
--   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test -s conftest.err; then
--       # Append any errors to the config.log.
--       cat conftest.err 1>&AS_MESSAGE_LOG_FD
--     else
--       $2=yes
--     fi
--   fi
--   $rm conftest*
--   LDFLAGS="$save_LDFLAGS"
--])
++
 +if $lt_cl_silent; then
 +  exec AS_MESSAGE_FD>/dev/null
 +fi
 +_LTEOF
- 
--if test x"[$]$2" = xyes; then
--    ifelse([$4], , :, [$4])
--else
--    ifelse([$5], , :, [$5])
++
 +cat >>"$CONFIG_LT" <<_LTEOF
 +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
 +_LTEOF
@@ -1983,27 +1893,16 @@
 +# appending to config.log, which fails on DOS, as config.log is still kept
 +# open by configure.  Here we exec the FD to /dev/null, effectively closing
 +# config.log, so it can be properly (re)opened and appended to by config.lt.
-+if test "$no_create" != yes; then
-+  lt_cl_success=:
-+  test "$silent" = yes &&
-+    lt_config_lt_args="$lt_config_lt_args --quiet"
-+  exec AS_MESSAGE_LOG_FD>/dev/null
-+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-+  exec AS_MESSAGE_LOG_FD>>config.log
-+  $lt_cl_success || AS_EXIT(1)
- fi
--])# AC_LIBTOOL_LINKER_OPTION
++lt_cl_success=:
++test "$silent" = yes &&
++  lt_config_lt_args="$lt_config_lt_args --quiet"
++exec AS_MESSAGE_LOG_FD>/dev/null
++$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
++exec AS_MESSAGE_LOG_FD>>config.log
++$lt_cl_success || AS_EXIT(1)
 +])# LT_OUTPUT
- 
- 
--# AC_LIBTOOL_SYS_MAX_CMD_LEN
--# --------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
--[# find the maximum length of command line arguments
--AC_MSG_CHECKING([the maximum length of command line arguments])
--AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
--  i=0
--  testring="ABCD"
++
++
 +# _LT_CONFIG(TAG)
 +# ---------------
 +# If TAG is the built-in tag, create an initial libtool script with a
@@ -2020,38 +1919,14 @@
 +    if test -n "${ZSH_VERSION+set}" ; then
 +      setopt NO_GLOB_SUBST
 +    fi
- 
--  case $build_os in
--  msdosdjgpp*)
--    # On DJGPP, this test can blow up pretty badly due to problems in libc
--    # (any single argument exceeding 2000 bytes causes a buffer overrun
--    # during glob expansion).  Even if it were fixed, the result of this
--    # check would be larger than it should be.
--    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
--    ;;
++
 +    cfgfile="${ofile}T"
 +    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
 +    $RM "$cfgfile"
- 
--  gnu*)
--    # Under GNU Hurd, this test is not required because there is
--    # no limit to the length of command line arguments.
--    # Libtool will interpret -1 as no limit whatsoever
--    lt_cv_sys_max_cmd_len=-1;
--    ;;
++
 +    cat <<_LT_EOF >> "$cfgfile"
 +#! $SHELL
- 
--  cygwin* | mingw*)
--    # On Win9x/ME, this test blows up -- it succeeds, but takes
--    # about 5 minutes as the teststring grows exponentially.
--    # Worse, since 9x/ME are not pre-emptively multitasking,
--    # you end up with a "frozen" computer, even though with patience
--    # the test eventually succeeds (with a max line length of 256k).
--    # Instead, let's just punt: use the minimum linelength reported by
--    # all of the supported platforms: 8192 (on NT/2K/XP).
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
++
 +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
 +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
@@ -2059,35 +1934,12 @@
 +#
 +_LT_COPYING
 +_LT_LIBTOOL_TAGS
- 
--  amigaos*)
--    # On AmigaOS with pdksh, this test takes hours, literally.
--    # So we just punt and use a minimum line length of 8192.
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
++
 +# ### BEGIN LIBTOOL CONFIG
 +_LT_LIBTOOL_CONFIG_VARS
 +_LT_LIBTOOL_TAG_VARS
 +# ### END LIBTOOL CONFIG
- 
-- *)
--    # If test is not a shell built-in, we'll probably end up computing a
--    # maximum length that is only half of the actual maximum length, but
--    # we can't tell.
--    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
--	       = "XX$testring") >/dev/null 2>&1 &&
--	    new_result=`expr "X$testring" : ".*" 2>&1` &&
--	    lt_cv_sys_max_cmd_len=$new_result &&
--	    test $i != 17 # 1/2 MB should be enough
--    do
--      i=`expr $i + 1`
--      testring=$testring$testring
--    done
--    testring=
--    # Add a significant safety factor because C++ compilers can tack on massive
--    # amounts of additional arguments before passing them to the linker.
--    # It appears as though 1/2 is a usable value.
--    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++
 +_LT_EOF
 +
 +  case $host_os in
@@ -2101,58 +1953,26 @@
 +  export COLLECT_NAMES
 +fi
 +_LT_EOF
-     ;;
-   esac
--])
--if test -n $lt_cv_sys_max_cmd_len ; then
--  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
--else
--  AC_MSG_RESULT(none)
--fi
--])# AC_LIBTOOL_SYS_MAX_CMD_LEN
- 
++    ;;
++  esac
++
 +  _LT_PROG_LTMAIN
- 
--# _LT_AC_CHECK_DLFCN
--# --------------------
--AC_DEFUN([_LT_AC_CHECK_DLFCN],
--[AC_CHECK_HEADERS(dlfcn.h)dnl
--])# _LT_AC_CHECK_DLFCN
++
 +  # We use sed instead of cat because bash on DJGPP gets confused if
 +  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
 +  # text mode, it properly converts lines to CR/LF.  This bash problem
 +  # is reportedly fixed, but why not run on old versions too?
-+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
- 
-+  _LT_PROG_XSI_SHELLFNS
- 
--# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
--#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
--# ------------------------------------------------------------------
--AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
--[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
--if test "$cross_compiling" = yes; then :
--  [$4]
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--[#line __oline__ "configure"
--#include "confdefs.h"
-+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
- 
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
-+  mv -f "$cfgfile" "$ofile" ||
++  sed '$q' "$ltmain" >> "$cfgfile" \
++     || (rm -f "$cfgfile"; exit 1)
++
++  _LT_PROG_REPLACE_SHELLFNS
++
++   mv -f "$cfgfile" "$ofile" ||
 +    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 +  chmod +x "$ofile"
 +],
 +[cat <<_LT_EOF >> "$ofile"
- 
--#include <stdio.h>
++
 +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
 +dnl in a comment (ie after a #).
 +# ### BEGIN LIBTOOL TAG CONFIG: $1
@@ -2182,38 +2002,8 @@
 +# C support is built-in for now
 +m4_define([_LT_LANG_C_enabled], [])
 +m4_define([_LT_TAGS], [])
- 
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
- 
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
++
++
 +# LT_LANG(LANG)
 +# -------------
 +# Enable libtool support for the given language if not already enabled.
@@ -2230,16 +2020,8 @@
 +    [_LT_LANG($1)],
 +    [m4_fatal([$0: unsupported language: "$1"])])])dnl
 +])# LT_LANG
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
- 
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
++
++
 +# _LT_LANG(LANGNAME)
 +# ------------------
 +m4_defun([_LT_LANG],
@@ -2249,32 +2031,8 @@
 +  m4_define([_LT_LANG_]$1[_enabled], [])dnl
 +  _LT_LANG_$1_CONFIG($1)])dnl
 +])# _LT_LANG
- 
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
- 
--    exit (status);
--}]
--EOF
--  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) $1 ;;
--      x$lt_dlneed_uscore) $2 ;;
--      x$lt_unknown|x*) $3 ;;
--    esac
--  else :
--    # compilation failed
--    $3
--  fi
--fi
--rm -fr conftest*
--])# _LT_AC_TRY_DLOPEN_SELF
++
++
 +# _LT_LANG_DEFAULT_CONFIG
 +# -----------------------
 +m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -2315,101 +2073,36 @@
 +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
 +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
 +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
++AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
 +dnl AC_DEFUN([AC_LIBTOOL_F77], [])
 +dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 +dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
- 
- 
--# AC_LIBTOOL_DLOPEN_SELF
--# -------------------
--AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
--[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
--if test "x$enable_dlopen" != xyes; then
--  enable_dlopen=unknown
--  enable_dlopen_self=unknown
--  enable_dlopen_self_static=unknown
--else
--  lt_cv_dlopen=no
--  lt_cv_dlopen_libs=
++dnl AC_DEFUN([AC_LIBTOOL_RC], [])
++
++
 +# _LT_TAG_COMPILER
 +# ----------------
 +m4_defun([_LT_TAG_COMPILER],
 +[AC_REQUIRE([AC_PROG_CC])dnl
- 
--  case $host_os in
--  beos*)
--    lt_cv_dlopen="load_add_on"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ;;
++
 +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
 +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
 +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
 +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
- 
--  mingw* | pw32*)
--    lt_cv_dlopen="LoadLibrary"
--    lt_cv_dlopen_libs=
--   ;;
++
 +# If no C compiler was specified, use CC.
 +LTCC=${LTCC-"$CC"}
- 
--  cygwin*)
--    lt_cv_dlopen="dlopen"
--    lt_cv_dlopen_libs=
--   ;;
++
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
--  darwin*)
--  # if libdl is installed we need to link against it
--    AC_CHECK_LIB([dl], [dlopen],
--		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
--    lt_cv_dlopen="dyld"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ])
--   ;;
++
 +# Allow CC to be a program name with arguments.
 +compiler=$CC
 +])# _LT_TAG_COMPILER
- 
--  *)
--    AC_CHECK_FUNC([shl_load],
--	  [lt_cv_dlopen="shl_load"],
--      [AC_CHECK_LIB([dld], [shl_load],
--	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
--	[AC_CHECK_FUNC([dlopen],
--	      [lt_cv_dlopen="dlopen"],
--	  [AC_CHECK_LIB([dl], [dlopen],
--		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
--	    [AC_CHECK_LIB([svld], [dlopen],
--		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
--	      [AC_CHECK_LIB([dld], [dld_link],
--		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
--	      ])
--	    ])
--	  ])
--	])
--      ])
--    ;;
--  esac
- 
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
--  else
--    enable_dlopen=no
--  fi
--
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
--    save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++
 +# _LT_COMPILER_BOILERPLATE
 +# ------------------------
 +# Check for compiler boilerplate output or warnings with
@@ -2422,15 +2115,8 @@
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$RM conftest*
 +])# _LT_COMPILER_BOILERPLATE
- 
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--    AC_CACHE_CHECK([whether a program can dlopen itself],
--	  lt_cv_dlopen_self, [dnl
--	  _LT_AC_TRY_DLOPEN_SELF(
--	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
--	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++
++
 +# _LT_LINKER_BOILERPLATE
 +# ----------------------
 +# Check for linker boilerplate output or warnings with
@@ -2497,16 +2183,32 @@
 +	[lt_cv_ld_exported_symbols_list=yes],
 +	[lt_cv_ld_exported_symbols_list=no])
 +	LDFLAGS="$save_LDFLAGS"
-     ])
--
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
--      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
--    	  lt_cv_dlopen_self_static, [dnl
--	  _LT_AC_TRY_DLOPEN_SELF(
--	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
--	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
--      ])
++    ])
++    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
++      [lt_cv_ld_force_load=no
++      cat > conftest.c << _LT_EOF
++int forced_loaded() { return 2;}
++_LT_EOF
++      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
++      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
++      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
++      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
++      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
++      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
++      cat > conftest.c << _LT_EOF
++int main() { return 0;}
++_LT_EOF
++      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
++      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
++      _lt_result=$?
++      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
++	lt_cv_ld_force_load=yes
++      else
++	cat conftest.err >&AS_MESSAGE_LOG_FD
++      fi
++        rm -f conftest.err libconftest.a conftest conftest.c
++        rm -rf conftest.dSYM
++    ])
 +    case $host_os in
 +    rhapsody* | darwin1.[[012]])
 +      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -2534,27 +2236,16 @@
 +    else
 +      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +    fi
-+    if test "$DSYMUTIL" != ":"; then
++    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
 +      _lt_dsymutil='~$DSYMUTIL $lib || :'
 +    else
 +      _lt_dsymutil=
-     fi
--
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
-     ;;
-   esac
++    fi
++    ;;
++  esac
 +])
- 
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
- 
--  case $lt_cv_dlopen_self_static in
--  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
--  *) enable_dlopen_self_static=unknown ;;
++
++
 +# _LT_DARWIN_LINKER_FEATURES
 +# --------------------------
 +# Checks for linker and compiler features on darwin
@@ -2565,18 +2256,19 @@
 +  _LT_TAGVAR(hardcode_direct, $1)=no
 +  _LT_TAGVAR(hardcode_automatic, $1)=yes
 +  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
++  if test "$lt_cv_ld_force_load" = "yes"; then
++    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++  else
++    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
++  fi
 +  _LT_TAGVAR(link_all_deplibs, $1)=yes
 +  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
 +  case $cc_basename in
 +     ifort*) _lt_dar_can_shared=yes ;;
 +     *) _lt_dar_can_shared=$GCC ;;
-   esac
--fi
--])# AC_LIBTOOL_DLOPEN_SELF
--
++  esac
 +  if test "$_lt_dar_can_shared" = "yes"; then
-+    output_verbose_link_cmd=echo
++    output_verbose_link_cmd=func_echo_all
 +    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
 +    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
 +    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -2591,418 +2283,143 @@
 +  _LT_TAGVAR(ld_shlibs, $1)=no
 +  fi
 +])
- 
--# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
--# ---------------------------------
--# Check to see if options -c and -o are simultaneously supported by compiler
--AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
--  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
--  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+# _LT_SYS_MODULE_PATH_AIX
-+# -----------------------
++
++# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
++# ----------------------------------
 +# Links a minimal program and checks the executable
 +# for the system default hardcoded library path. In most cases,
 +# this is /usr/lib:/lib, but when the MPI compilers are used
 +# the location of the communication and MPI libs are included too.
 +# If we don't find anything, use the default library path according
 +# to the aix ld manual.
++# Store the results from the different compilers for each TAGNAME.
++# Allow to override them for all tags through lt_cv_aix_libpath.
 +m4_defun([_LT_SYS_MODULE_PATH_AIX],
 +[m4_require([_LT_DECL_SED])dnl
-+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi],[])
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++if test "${lt_cv_aix_libpath+set}" = set; then
++  aix_libpath=$lt_cv_aix_libpath
++else
++  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
++  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
++  lt_aix_libpath_sed='[
++      /Import File Strings/,/^$/ {
++	  /^0/ {
++	      s/^0  *\([^ ]*\) *$/\1/
++	      p
++	  }
++      }]'
++  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  # Check for a 64-bit object if we didn't find anything.
++  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
++    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  fi],[])
++  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
++    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
++  fi
++  ])
++  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
++fi
 +])# _LT_SYS_MODULE_PATH_AIX
- 
--   lt_compiler_flag="-o out/conftest2.$ac_objext"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
--   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
--   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
--   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
--   (eval "$lt_compile" 2>out/conftest.err)
--   ac_status=$?
--   cat out/conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
--   if (exit $ac_status) && test -s out/conftest2.$ac_objext
--   then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test ! -s out/conftest.err; then
--       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
--     fi
--   fi
--   chmod u+w .
--   $rm conftest*
--   # SGI C++ compiler will create directory out/ii_files/ for
--   # template instantiation
--   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
--   $rm out/* && rmdir out
--   cd ..
--   rmdir conftest
--   $rm conftest*
--])
--])# AC_LIBTOOL_PROG_CC_C_O
- 
++
++
 +# _LT_SHELL_INIT(ARG)
 +# -------------------
 +m4_define([_LT_SHELL_INIT],
-+[ifdef([AC_DIVERSION_NOTICE],
-+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+	 [AC_DIVERT_PUSH(NOTICE)])
-+$1
-+AC_DIVERT_POP
-+])# _LT_SHELL_INIT
- 
--# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
--# -----------------------------------------
--# Check to see if we can do hard links to lock some files if needed
--AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
--[AC_REQUIRE([_LT_AC_LOCK])dnl
- 
--hard_links="nottested"
--if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
--  # do not overwrite the value of need_locks provided by the user
--  AC_MSG_CHECKING([if we can lock with hard links])
--  hard_links=yes
--  $rm conftest*
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  touch conftest.a
--  ln conftest.a conftest.b 2>&5 || hard_links=no
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  AC_MSG_RESULT([$hard_links])
--  if test "$hard_links" = no; then
--    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
--    need_locks=warn
--  fi
--else
--  need_locks=no
--fi
--])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
++[m4_divert_text([M4SH-INIT], [$1
++])])# _LT_SHELL_INIT
++
++
++
 +# _LT_PROG_ECHO_BACKSLASH
 +# -----------------------
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
++# Find how we can fake an echo command that does not interpret backslash.
++# In particular, with Autoconf 2.60 or later we add some code to the start
++# of the generated configure script which will find a shell with a builtin
++# printf (which we can use as an echo command).
 +m4_defun([_LT_PROG_ECHO_BACKSLASH],
-+[_LT_SHELL_INIT([
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
- 
-+case X$lt_ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+  ;;
-+esac
- 
--# AC_LIBTOOL_OBJDIR
--# -----------------
--AC_DEFUN([AC_LIBTOOL_OBJDIR],
--[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
--[rm -f .libs 2>/dev/null
--mkdir .libs 2>/dev/null
--if test -d .libs; then
--  lt_cv_objdir=.libs
-+ECHO=${lt_ECHO-echo}
-+if test "X[$]1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X[$]1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-+  # Yippee, $ECHO works!
-+  :
- else
--  # MS-DOS does not allow filenames that begin with a dot.
--  lt_cv_objdir=_libs
-+  # Restart under the correct shell.
-+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
- fi
--rmdir .libs 2>/dev/null])
--objdir=$lt_cv_objdir
--])# AC_LIBTOOL_OBJDIR
- 
-+if test "X[$]1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<_LT_EOF
-+[$]*
-+_LT_EOF
-+  exit 0
-+fi
- 
--# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
--# ----------------------------------------------
--# Check hardcoding attributes.
--AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
--[AC_MSG_CHECKING([how to hardcode library paths into programs])
--_LT_AC_TAGVAR(hardcode_action, $1)=
--if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
--   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
--   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
--  # We can hardcode non-existant directories.
--  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
--     # If the only mechanism to avoid hardcoding is shlibpath_var, we
--     # have to relink, otherwise we might link with an installed library
--     # when we should be linking with a yet-to-be-installed one
--     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
--     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
--    # Linking always hardcodes the temporary library directory.
--    _LT_AC_TAGVAR(hardcode_action, $1)=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-+if test -z "$lt_ECHO"; then
-+  if test "X${echo_test_string+set}" != Xset; then
-+    # find a string as large as possible, as long as the shell can cope with it
-+    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-+      then
-+        break
-+      fi
-+    done
-   fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
--fi
--AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
- 
--if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
--  # Fast installation is not supported
--  enable_fast_install=no
--elif test "$shlibpath_overrides_runpath" = yes ||
--     test "$enable_shared" = no; then
--  # Fast installation is not necessary
--  enable_fast_install=needless
--fi
--])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-+     test "X$echo_testing_string" = "X$echo_test_string"; then
-+    :
-+  else
-+    # The Solaris, AIX, and Digital Unix default echo programs unquote
-+    # backslashes.  This makes it impossible to quote backslashes using
-+    #   echo "$something" | sed 's/\\/\\\\/g'
-+    #
-+    # So, first we look for a working echo in the user's PATH.
- 
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for dir in $PATH /usr/ucb; do
-+      IFS="$lt_save_ifs"
-+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+         test "X$echo_testing_string" = "X$echo_test_string"; then
-+        ECHO="$dir/echo"
-+        break
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
- 
--# AC_LIBTOOL_SYS_LIB_STRIP
--# ------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
--[striplib=
--old_striplib=
--AC_MSG_CHECKING([whether stripping libraries is possible])
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  AC_MSG_RESULT([yes])
--else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--   darwin*)
--       if test -n "$STRIP" ; then
--         striplib="$STRIP -x"
--         AC_MSG_RESULT([yes])
--       else
--  AC_MSG_RESULT([no])
--fi
--       ;;
--   *)
--  AC_MSG_RESULT([no])
--    ;;
--  esac
--fi
--])# AC_LIBTOOL_SYS_LIB_STRIP
-+    if test "X$ECHO" = Xecho; then
-+      # We didn't find a better echo, so look for alternatives.
-+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-+         test "X$echo_testing_string" = "X$echo_test_string"; then
-+        # This shell has a builtin print -r that does the trick.
-+        ECHO='print -r'
-+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-+        # If we have ksh, try running configure again with it.
-+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+        export ORIGINAL_CONFIG_SHELL
-+        CONFIG_SHELL=/bin/ksh
-+        export CONFIG_SHELL
-+        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+      else
-+        # Try using printf.
-+        ECHO='printf %s\n'
-+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  # Cool, printf works
-+	  :
-+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	     test "X$echo_testing_string" = 'X\t' &&
-+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	     test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	  export CONFIG_SHELL
-+	  SHELL="$CONFIG_SHELL"
-+	  export SHELL
-+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-+        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	     test "X$echo_testing_string" = 'X\t' &&
-+	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	     test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-+        else
-+	  # maybe with a smaller string...
-+	  prev=:
- 
-+	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-+	    then
-+	      break
-+	    fi
-+	    prev="$cmd"
-+	  done
- 
--# AC_LIBTOOL_SYS_DYNAMIC_LINKER
--# -----------------------------
--# PORTME Fill in your ld.so characteristics
--AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
--[AC_MSG_CHECKING([dynamic linker characteristics])
--library_names_spec=
--libname_spec='lib$name'
--soname_spec=
--shrext=".so"
--postinstall_cmds=
--postuninstall_cmds=
--finish_cmds=
--finish_eval=
--shlibpath_var=
--shlibpath_overrides_runpath=unknown
--version_type=none
--dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
--  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
--    # if the path contains ";" then we assume it to be the separator
--    # otherwise default to the standard path separator (i.e. ":") - it is
--    # assumed that no part of a normal pathname contains ";" but that should
--    # okay in the real world where ";" in dirpaths is itself problematic.
--    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
--  else
--    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+	  if test "$prev" != 'sed 50q "[$]0"'; then
-+	    echo_test_string=`eval $prev`
-+	    export echo_test_string
-+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+	  else
-+	    # Oops.  We lost completely, so just stick with echo.
-+	    ECHO=echo
-+	  fi
-+        fi
-+      fi
-+    fi
-   fi
--else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
--need_lib_prefix=unknown
--hardcode_into_libs=no
- 
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--need_version=unknown
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+lt_ECHO=$ECHO
-+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
++
++AC_MSG_CHECKING([how to print strings])
++# Test print first, because it will be a builtin if present.
++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
++   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
++  ECHO='print -r --'
++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
++  ECHO='printf %s\n'
++else
++  # Use this function as a fallback that always works.
++  func_fallback_echo ()
++  {
++    eval 'cat <<_LTECHO_EOF
++$[]1
++_LTECHO_EOF'
++  }
++  ECHO='func_fallback_echo'
 +fi
- 
--case $host_os in
--aix3*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
--  shlibpath_var=LIBPATH
-+AC_SUBST(lt_ECHO)
-+])
++
++# func_echo_all arg...
++# Invoke $ECHO with all args, space-separated.
++func_echo_all ()
++{
++    $ECHO "$*" 
++}
++
++case "$ECHO" in
++  printf*) AC_MSG_RESULT([printf]) ;;
++  print*) AC_MSG_RESULT([print -r]) ;;
++  *) AC_MSG_RESULT([cat]) ;;
++esac
++
++m4_ifdef([_AS_DETECT_SUGGESTED],
++[_AS_DETECT_SUGGESTED([
++  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
++    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
++    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
++    PATH=/empty FPATH=/empty; export PATH FPATH
++    test "X`printf %s $ECHO`" = "X$ECHO" \
++      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
++
 +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-+_LT_DECL([], [ECHO], [1],
-+    [An echo program that does not interpret backslashes])
++_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
 +])# _LT_PROG_ECHO_BACKSLASH
- 
--  # AIX 3 has no versioning support, so we append a major version to the name.
--  soname_spec='${libname}${release}${shared_ext}$major'
--  ;;
- 
--aix4* | aix5*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  hardcode_into_libs=yes
--  if test "$host_cpu" = ia64; then
--    # AIX 5 supports IA64
--    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
--    shlibpath_var=LD_LIBRARY_PATH
--  else
--    # With GCC up to 2.95.x, collect2 would create an import file
--    # for dependence libraries.  The import file would start with
--    # the line `#! .'.  This would cause the generated library to
--    # depend on `.', always an invalid library.  This was fixed in
--    # development snapshots of GCC prior to 3.0.
--    case $host_os in
--      aix4 | aix4.[[01]] | aix4.[[01]].*)
--      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
--	   echo ' yes '
--	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
--	:
--      else
--	can_build_shared=no
--      fi
--      ;;
++
++
++# _LT_WITH_SYSROOT
++# ----------------
++AC_DEFUN([_LT_WITH_SYSROOT],
++[AC_MSG_CHECKING([for sysroot])
++AC_ARG_WITH([sysroot],
++[  --with-sysroot[=DIR] Search for dependent libraries within DIR
++                        (or the compiler's sysroot if not specified).],
++[], [with_sysroot=no])
++
++dnl lt_sysroot will always be passed unquoted.  We quote it here
++dnl in case the user passed a directory name.
++lt_sysroot=
++case ${with_sysroot} in #(
++ yes)
++   if test "$GCC" = yes; then
++     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+    fi
++   ;; #(
++ /*)
++   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
++   ;; #(
++ no|'')
++   ;; #(
++ *)
++   AC_MSG_RESULT([${with_sysroot}])
++   AC_MSG_ERROR([The sysroot must be an absolute path.])
++   ;;
++esac
++
++ AC_MSG_RESULT([${lt_sysroot:-no}])
++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
++[dependent libraries, and in which our libraries should be installed.])])
++
 +# _LT_ENABLE_LOCK
 +# ---------------
 +m4_defun([_LT_ENABLE_LOCK],
@@ -3025,21 +2442,13 @@
 +      *ELF-64*)
 +	HPUX_IA64_MODE="64"
 +	;;
-     esac
--    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
--    # soname into executable. Probably we can add versioning support to
--    # collect2, so additional links can be useful in future.
--    if test "$aix_use_runtimelinking" = yes; then
--      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
--      # instead of lib<name>.a to let people know that these are not
--      # typical AIX shared libraries.
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    esac
 +  fi
 +  rm -rf conftest*
 +  ;;
 +*-*-irix6*)
 +  # Find out which ABI we are using.
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
 +  if AC_TRY_EVAL(ac_compile); then
 +    if test "$lt_cv_prog_gnu_ld" = yes; then
 +      case `/usr/bin/file conftest.$ac_objext` in
@@ -3053,11 +2462,7 @@
 +	  LD="${LD-ld} -melf64bmip"
 +	;;
 +      esac
-     else
--      # We preserve .a as extension for shared libraries through AIX4.2
--      # and later when we are not doing run time linking.
--      library_names_spec='${libname}${release}.a $libname.a'
--      soname_spec='${libname}${release}${shared_ext}$major'
++    else
 +      case `/usr/bin/file conftest.$ac_objext` in
 +	*32-bit*)
 +	  LD="${LD-ld} -32"
@@ -3069,28 +2474,50 @@
 +	  LD="${LD-ld} -64"
 +	  ;;
 +      esac
-     fi
--    shlibpath_var=LIBPATH
++    fi
    fi
-+  rm -rf conftest*
+   rm -rf conftest*
    ;;
  
--amigaos*)
--  library_names_spec='$libname.ixlibrary $libname.a'
--  # Create ${libname}_ixlibrary.a entries in /sys/libs.
--  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
--  ;;
--
--beos*)
--  library_names_spec='${libname}${shared_ext}'
--  dynamic_linker="$host_os ld.so"
--  shlibpath_var=LIBRARY_PATH
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 +s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+     case `/usr/bin/file conftest.o` in
+-    *32-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_i386"
+-          ;;
+-        ppc64-*linux*|powerpc64-*linux*)
+-          LD="${LD-ld} -m elf32ppclinux"
+-          ;;
+-        s390x-*linux*)
+-          LD="${LD-ld} -m elf_s390"
+-          ;;
+-        sparc64-*linux*)
+-          LD="${LD-ld} -m elf32_sparc"
+-          ;;
+-      esac
+-      ;;
+-    *64-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_x86_64"
+-          ;;
+-        ppc*-*linux*|powerpc*-*linux*)
+-          LD="${LD-ld} -m elf64ppc"
+-          ;;
+-        s390*-*linux*)
+-          LD="${LD-ld} -m elf64_s390"
+-          ;;
+-        sparc*-*linux*)
+-          LD="${LD-ld} -m elf64_sparc"
+-          ;;
+-      esac
+-      ;;
 +      *32-bit*)
 +	case $host in
 +	  x86_64-*kfreebsd*-gnu)
@@ -3129,180 +2556,110 @@
 +	    ;;
 +	esac
 +	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-   ;;
- 
--bsdi4*)
--  version_type=linux
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
--  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
--  # the default ld.so.conf also contains /usr/contrib/lib and
--  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
--  # libtool to hard-code these into programs
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_LANG_PUSH(C)
+     esac
+   fi
+   rm -rf conftest*
+@@ -577,7 +1338,7 @@
+   CFLAGS="$CFLAGS -belf"
+   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+     [AC_LANG_PUSH(C)
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
 +     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG_POP])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-   ;;
--
--cygwin* | mingw* | pw32*)
--  version_type=windows
--  shrext=".dll"
--  need_version=no
--  need_lib_prefix=no
--
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32*)
--    library_names_spec='$libname.dll.a'
--    # DLL is installed to $(libdir)/../bin by postinstall_cmds
--    postinstall_cmds='base_file=`basename \${file}`~
--      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
--      dldir=$destdir/`dirname \$dlpath`~
--      test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
--    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
--      dlpath=$dir/\$dldll~
--       $rm \$dlpath'
--    shlibpath_overrides_runpath=yes
--
--    case $host_os in
--    cygwin*)
--      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
--      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
--      ;;
--    mingw*)
--      # MinGW DLLs use traditional 'lib' prefix
--      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
--        # It is most probably a Windows format PATH printed by
--        # mingw gcc, but we are running on Cygwin. Gcc prints its search
--        # path with ; separators, and with drive letters. We can handle the
--        # drive letters (cygwin fileutils understands them), so leave them,
--        # especially as we might pass files found there to a mingw objdump,
--        # which wouldn't understand a cygwinified path. Ahh.
--        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
--      else
--        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
--      fi
--      ;;
--    pw32*)
--      # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+sparc*-*solaris*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
-+    *64-bit*)
-+      case $lt_cv_prog_gnu_ld in
-+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      AC_LANG_POP])
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+@@ -592,90 +1353,176 @@
+     *64-bit*)
+       case $lt_cv_prog_gnu_ld in
+       yes*) LD="${LD-ld} -m elf64_sparc" ;;
+-      *)    LD="${LD-ld} -64" ;;
 +      *)
 +	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 +	  LD="${LD-ld} -64"
 +	fi
 +	;;
-+      esac
+       esac
        ;;
      esac
--    ;;
--
--  *)
--    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
--    ;;
--  esac
--  dynamic_linker='Win32 ld.exe'
--  # FIXME: first we should search . and the directory the executable is in
--  shlibpath_var=PATH
--  ;;
--
--darwin* | rhapsody*)
--  dynamic_linker="$host_os dyld"
--  version_type=darwin
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
--  soname_spec='${libname}${release}${major}$shared_ext'
--  shlibpath_overrides_runpath=yes
--  shlibpath_var=DYLD_LIBRARY_PATH
--  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
--  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if test "$GCC" = yes; then
--    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
--  else
--    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
    fi
--  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  rm -rf conftest*
+   rm -rf conftest*
    ;;
-+esac
- 
--dgux*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
+-
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
 -  ;;
-+need_locks="$enable_libtool_lock"
+-  ])
+ esac
+ 
+ need_locks="$enable_libtool_lock"
 +])# _LT_ENABLE_LOCK
  
--freebsd1*)
--  dynamic_linker=no
--  ;;
+-])# _LT_AC_LOCK
  
--kfreebsd*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
--  ;;
++# _LT_PROG_AR
++# -----------
++m4_defun([_LT_PROG_AR],
++[AC_CHECK_TOOLS(AR, [ar], false)
++: ${AR=ar}
++: ${AR_FLAGS=cru}
++_LT_DECL([], [AR], [1], [The archiver])
++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
++
++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
++  [lt_cv_ar_at_file=no
++   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
++     [echo conftest.$ac_objext > conftest.lst
++      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
++      AC_TRY_EVAL([lt_ar_try])
++      if test "$ac_status" -eq 0; then
++	# Ensure the archiver fails upon bogus file names.
++	rm -f conftest.$ac_objext libconftest.a
++	AC_TRY_EVAL([lt_ar_try])
++	if test "$ac_status" -ne 0; then
++          lt_cv_ar_at_file=@
++        fi
++      fi
++      rm -f conftest.* libconftest.a
++     ])
++  ])
+ 
+-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ----------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+-[AC_REQUIRE([LT_AC_PROG_SED])
+-AC_CACHE_CHECK([$1], [$2],
+-  [$2=no
+-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$3"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++if test "x$lt_cv_ar_at_file" = xno; then
++  archiver_list_spec=
++else
++  archiver_list_spec=$lt_cv_ar_at_file
++fi
++_LT_DECL([], [archiver_list_spec], [1],
++  [How to feed a file listing to the archiver])
++])# _LT_PROG_AR
++
++
 +# _LT_CMD_OLD_ARCHIVE
 +# -------------------
 +m4_defun([_LT_CMD_OLD_ARCHIVE],
-+[AC_CHECK_TOOL(AR, ar, false)
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+_LT_DECL([], [AR], [1], [The archiver])
-+_LT_DECL([], [AR_FLAGS], [1])
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
--  case $version_type in
--    freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
--      need_version=no
--      need_lib_prefix=no
--      ;;
--    freebsd-*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
--      need_version=yes
--      ;;
--  esac
--  shlibpath_var=LD_LIBRARY_PATH
++[_LT_PROG_AR
++
 +AC_CHECK_TOOL(STRIP, strip, :)
 +test -z "$STRIP" && STRIP=:
 +_LT_DECL([], [STRIP], [1], [A symbol stripping program])
@@ -3318,63 +2675,32 @@
 +old_postuninstall_cmds=
 +
 +if test -n "$RANLIB"; then
-   case $host_os in
--  freebsd2*)
--    shlibpath_overrides_runpath=yes
--    ;;
--  freebsd3.[01]* | freebsdelf3.[01]*)
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
++  case $host_os in
 +  openbsd*)
 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-     ;;
--  *) # from 3.2 on
--    shlibpath_overrides_runpath=no
--    hardcode_into_libs=yes
++    ;;
 +  *)
 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-     ;;
-   esac
--  ;;
++    ;;
++  esac
 +  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 +fi
++
++case $host_os in
++  darwin*)
++    lock_old_archive_extraction=yes ;;
++  *)
++    lock_old_archive_extraction=no ;;
++esac
 +_LT_DECL([], [old_postinstall_cmds], [2])
 +_LT_DECL([], [old_postuninstall_cmds], [2])
 +_LT_TAGDECL([], [old_archive_cmds], [2],
 +    [Commands used to build an old-style archive])
++_LT_DECL([], [lock_old_archive_extraction], [0],
++    [Whether to use a lock for old archive extraction])
 +])# _LT_CMD_OLD_ARCHIVE
- 
--gnu*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  hardcode_into_libs=yes
--  ;;
- 
--hpux9* | hpux10* | hpux11*)
--  # Give a soname corresponding to the major version so that dld.sl refuses to
--  # link against other versions.
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  case "$host_cpu" in
--  ia64*)
--    shrext='.so'
--    hardcode_into_libs=yes
--    dynamic_linker="$host_os dld.so"
--    shlibpath_var=LD_LIBRARY_PATH
--    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    if test "X$HPUX_IA64_MODE" = X32; then
--      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
--    else
--      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
--    fi
--    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++
++
 +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 +#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
 +# ----------------------------------------------------------------
@@ -3395,31 +2721,45 @@
 +   lt_compile=`echo "$ac_compile" | $SED \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       $2=yes
-+     fi
-+   fi
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        $2=yes
+      fi
+    fi
+-   $rm conftest*
 +   $RM conftest*
-+])
-+
-+if test x"[$]$2" = xyes; then
+ ])
+ 
+ if test x"[$]$2" = xyes; then
+-    ifelse([$5], , :, [$5])
 +    m4_if([$5], , :, [$5])
-+else
+ else
+-    ifelse([$6], , :, [$6])
 +    m4_if([$6], , :, [$6])
-+fi
+ fi
+-])# AC_LIBTOOL_COMPILER_OPTION
 +])# _LT_COMPILER_OPTION
-+
+ 
+-
+-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
 +# Old name:
 +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
 +dnl aclocal-1.4 backwards compatibility:
@@ -3434,177 +2774,109 @@
 +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_DECL_SED])dnl
 +AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $3"
+   [$2=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $3"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
 +   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         $2=yes
-+       fi
-+     else
-+       $2=yes
-+     fi
-+   fi
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
+-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+        if diff conftest.exp conftest.er2 >/dev/null; then
+          $2=yes
+@@ -684,22 +1531,28 @@
+        $2=yes
+      fi
+    fi
+-   $rm conftest*
 +   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+])
-+
-+if test x"[$]$2" = xyes; then
+    LDFLAGS="$save_LDFLAGS"
+ ])
+ 
+ if test x"[$]$2" = xyes; then
+-    ifelse([$4], , :, [$4])
 +    m4_if([$4], , :, [$4])
-+else
+ else
+-    ifelse([$5], , :, [$5])
 +    m4_if([$5], , :, [$5])
-+fi
+ fi
+-])# AC_LIBTOOL_LINKER_OPTION
 +])# _LT_LINKER_OPTION
-+
+ 
 +# Old name:
 +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-+
+ 
+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-# --------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+-[# find the maximum length of command line arguments
 +
 +# LT_CMD_MAX_LEN
 +#---------------
 +AC_DEFUN([LT_CMD_MAX_LEN],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +# find the maximum length of command line arguments
-+AC_MSG_CHECKING([the maximum length of command line arguments])
-+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-+  i=0
-+  teststring="ABCD"
-+
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-     ;;
--   hppa*64*)
--     shrext='.sl'
--     hardcode_into_libs=yes
--     dynamic_linker="$host_os dld.sl"
--     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
--     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--     soname_spec='${libname}${release}${shared_ext}$major'
--     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
--     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
--     ;;
--   *)
--    shrext='.sl'
--    dynamic_linker="$host_os dld.sl"
--    shlibpath_var=SHLIB_PATH
--    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
-+
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+   i=0
+@@ -721,7 +1574,7 @@
+     lt_cv_sys_max_cmd_len=-1;
      ;;
--  esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555.
--  postinstall_cmds='chmod 555 $lib'
--  ;;
  
--irix5* | irix6* | nonstopux*)
--  case $host_os in
--    nonstopux*) version_type=nonstopux ;;
--    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
--	else
--		version_type=irix
--	fi ;;
--  esac
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
--  case $host_os in
--  irix5* | nonstopux*)
--    libsuff= shlibsuff=
+-  cygwin* | mingw*)
 +  cygwin* | mingw* | cegcc*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  amigaos*)
-+    # On AmigaOS with pdksh, this test takes hours, literally.
-+    # So we just punt and use a minimum line length of 8192.
+     # On Win9x/ME, this test blows up -- it succeeds, but takes
+     # about 5 minutes as the teststring grows exponentially.
+     # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -732,6 +1585,11 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
++  mint*)
++    # On MiNT this can take a long time and run out of memory.
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+
-+  interix*)
-+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+    lt_cv_sys_max_cmd_len=196608
-+    ;;
-+
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  sco3.2v5*)
-+    lt_cv_sys_max_cmd_len=102400
-+    ;;
-+  sysv5* | sco5v6* | sysv4.2uw2*)
-+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-+    if test -n "$kargmax"; then
+   amigaos*)
+     # On AmigaOS with pdksh, this test takes hours, literally.
+     # So we just punt and use a minimum line length of 8192.
+@@ -776,30 +1634,41 @@
+   sysv5* | sco5v6* | sysv4.2uw2*)
+     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+     if test -n "$kargmax"; then
+-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
 +      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-+    else
-+      lt_cv_sys_max_cmd_len=32768
-+    fi
+     else
+       lt_cv_sys_max_cmd_len=32768
+     fi
      ;;
    *)
--    case $LD in # libtool.m4 will add one of these switches to LD
--    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
--      libsuff= shlibsuff= libmagic=32-bit;;
--    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
--      libsuff=32 shlibsuff=N32 libmagic=N32;;
--    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
--      libsuff=64 shlibsuff=64 libmagic=64-bit;;
--    *) libsuff= shlibsuff= libmagic=never-match;;
--    esac
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+-	       = "XX$teststring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      teststring=$teststring$teststring
+-    done
+-    teststring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
 +    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
 +    if test -n "$lt_cv_sys_max_cmd_len"; then
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
@@ -3619,8 +2891,8 @@
 +      # If test is not a shell built-in, we'll probably end up computing a
 +      # maximum length that is only half of the actual maximum length, but
 +      # we can't tell.
-+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
++      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
++	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 +	      test $i != 17 # 1/2 MB should be enough
 +      do
 +        i=`expr $i + 1`
@@ -3636,521 +2908,185 @@
 +    fi
      ;;
    esac
--  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
--  shlibpath_overrides_runpath=no
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
--  hardcode_into_libs=yes
--  ;;
-+])
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-+else
-+  AC_MSG_RESULT(none)
-+fi
+ ])
+@@ -808,28 +1677,36 @@
+ else
+   AC_MSG_RESULT(none)
+ fi
+-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
 +max_cmd_len=$lt_cv_sys_max_cmd_len
 +_LT_DECL([], [max_cmd_len], [0],
 +    [What is the maximum length of a command?])
 +])# LT_CMD_MAX_LEN
  
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
--  dynamic_linker=no
--  ;;
 +# Old name:
 +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
  
--# This must be Linux ELF.
--linux*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  # This implies no fast_install, which is unacceptable.
--  # Some rework will be needed to allow for fast_install
--  # before this can be enabled.
--  hardcode_into_libs=yes
- 
--  # Append ld.so.conf contents to the search path
--  if test -f /etc/ld.so.conf; then
--    ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
--  fi
+-# _LT_AC_CHECK_DLFCN
+-# ------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)dnl
+-])# _LT_AC_CHECK_DLFCN
++
 +# _LT_HEADER_DLFCN
 +# ----------------
 +m4_defun([_LT_HEADER_DLFCN],
 +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
 +])# _LT_HEADER_DLFCN
  
--  # We used to test for /lib/ld.so.1 and disable shared libraries on
--  # powerpc, because MkLinux only supported shared libraries with the
--  # GNU dynamic linker.  Since this was broken with cross compilers,
--  # most powerpc-linux boxes support dynamic linking these days and
--  # people can always --disable-shared, the test was removed, and we
--  # assume the GNU/Linux dynamic linker is in use.
--  dynamic_linker='GNU/Linux ld.so'
--  ;;
  
--knetbsd*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
--  ;;
+-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ---------------------------------------------------------------------
+-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 +#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
 +# ----------------------------------------------------------------
 +m4_defun([_LT_TRY_DLOPEN_SELF],
 +[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+  [$4]
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
+ if test "$cross_compiling" = yes; then :
+   [$4]
+ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-[#line __oline__ "configure"
 +  cat > conftest.$ac_ext <<_LT_EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
- 
--netbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--    dynamic_linker='NetBSD (a.out) ld.so'
--  else
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    dynamic_linker='NetBSD ld.elf_so'
--  fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  ;;
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
- 
--newsos6)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  ;;
-+#include <stdio.h>
- 
--nto-qnx*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  ;;
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
++[#line $LINENO "configure"
+ #include "confdefs.h"
  
--openbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=yes
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    case $host_os in
--      openbsd2.[[89]] | openbsd2.[[89]].*)
--	shlibpath_overrides_runpath=no
--	;;
--      *)
--	shlibpath_overrides_runpath=yes
--	;;
--      esac
--  else
--    shlibpath_overrides_runpath=yes
--  fi
--  ;;
--
--os2*)
--  libname_spec='$name'
--  shrext=".dll"
--  need_lib_prefix=no
--  library_names_spec='$libname${shared_ext} $libname.a'
--  dynamic_linker='OS/2 ld.exe'
--  shlibpath_var=LIBPATH
--  ;;
--
--osf3* | osf4* | osf5*)
--  version_type=osf
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
--  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
--  ;;
--
--sco3.2v5*)
--  version_type=osf
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--solaris*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  # ldd complains unless libraries are executable
--  postinstall_cmds='chmod +x $lib'
--  ;;
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
+ #if HAVE_DLFCN_H
+@@ -870,11 +1747,13 @@
+ #  endif
+ #endif
  
--sunos4*)
--  version_type=sunos
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--  fi
--  need_version=yes
--  ;;
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
+-#ifdef __cplusplus
+-extern "C" void exit (int);
++/* When -fvisbility=hidden is used, assume the code has been annotated
++   correspondingly for the symbols needed.  */
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++int fnord () __attribute__((visibility("default")));
+ #endif
  
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_vendor in
--    sni)
--      shlibpath_overrides_runpath=no
--      need_lib_prefix=no
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      runpath_var=LD_RUN_PATH
--      ;;
--    siemens)
--      need_lib_prefix=no
--      ;;
--    motorola)
--      need_lib_prefix=no
--      need_version=no
--      shlibpath_overrides_runpath=no
--      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
--      ;;
--  esac
--  ;;
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
+-void fnord() { int i=42;}
++int fnord () { return 42; }
+ int main ()
+ {
+   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -883,15 +1762,19 @@
+   if (self)
+     {
+       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      else
++        {
++	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
++          else puts (dlerror ());
++	}
+       /* dlclose (self); */
+     }
+   else
+     puts (dlerror ());
  
--sysv4*MP*)
--  if test -d /usr/nec ;then
--    version_type=linux
--    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
--    soname_spec='$libname${shared_ext}.$major'
--    shlibpath_var=LD_LIBRARY_PATH
+-    exit (status);
 +  return status;
-+}]
+ }]
+-EOF
 +_LT_EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) $1 ;;
-+      x$lt_dlneed_uscore) $2 ;;
-+      x$lt_dlunknown|x*) $3 ;;
-+    esac
-+  else :
-+    # compilation failed
-+    $3
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+     (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+     lt_status=$?
+@@ -906,13 +1789,13 @@
    fi
--  ;;
--
--uts4*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
-+fi
-+rm -fr conftest*
+ fi
+ rm -fr conftest*
+-])# _LT_AC_TRY_DLOPEN_SELF
 +])# _LT_TRY_DLOPEN_SELF
  
--*)
--  dynamic_linker=no
--  ;;
--esac
--AC_MSG_RESULT([$dynamic_linker])
--test "$dynamic_linker" = no && can_build_shared=no
--])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
  
+-# AC_LIBTOOL_DLOPEN_SELF
+-# ----------------------
+-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 +# LT_SYS_DLOPEN_SELF
 +# ------------------
 +AC_DEFUN([LT_SYS_DLOPEN_SELF],
 +[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
- 
--# _LT_AC_TAGCONFIG
--# ----------------
--AC_DEFUN([_LT_AC_TAGCONFIG],
--[AC_ARG_WITH([tags],
--    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
--        [include additional configurations @<:@automatic@:>@])],
--    [tagnames="$withval"])
--
--if test -f "$ltmain" && test -n "$tagnames"; then
--  if test ! -f "${ofile}"; then
--    AC_MSG_WARN([output file `$ofile' does not exist])
--  fi
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
+ if test "x$enable_dlopen" != xyes; then
+   enable_dlopen=unknown
+   enable_dlopen_self=unknown
+@@ -928,15 +1811,15 @@
+     lt_cv_dlopen_self=yes
+     ;;
  
--  if test -z "$LTCC"; then
--    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
--    if test -z "$LTCC"; then
--      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
--    else
--      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
--    fi
--  fi
+-  mingw* | pw32*)
 +  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
+     lt_cv_dlopen="LoadLibrary"
+     lt_cv_dlopen_libs=
+-   ;;
 +    ;;
  
--  # Extract list of available tagged configurations in $ofile.
--  # Note that this assumes the entire list is on one line.
--  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
+   cygwin*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+-   ;;
 +    ;;
  
--  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--  for tagname in $tagnames; do
--    IFS="$lt_save_ifs"
--    # Check whether tagname contains only valid characters
--    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
--    "") ;;
--    *)  AC_MSG_ERROR([invalid tag name: $tagname])
--	;;
--    esac
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ])
+   darwin*)
+   # if libdl is installed we need to link against it
+@@ -946,13 +1829,13 @@
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+     ])
+-   ;;
 +    ;;
  
--    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
--    then
--      AC_MSG_ERROR([tag name \"$tagname\" already exists])
--    fi
-+  *)
-+    AC_CHECK_FUNC([shl_load],
-+	  [lt_cv_dlopen="shl_load"],
-+      [AC_CHECK_LIB([dld], [shl_load],
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+       [AC_CHECK_LIB([dld], [shl_load],
+-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
 +	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-+	[AC_CHECK_FUNC([dlopen],
-+	      [lt_cv_dlopen="dlopen"],
-+	  [AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+	    [AC_CHECK_LIB([svld], [dlopen],
-+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+	      [AC_CHECK_LIB([dld], [dld_link],
+ 	[AC_CHECK_FUNC([dlopen],
+ 	      [lt_cv_dlopen="dlopen"],
+ 	  [AC_CHECK_LIB([dl], [dlopen],
+@@ -960,7 +1843,7 @@
+ 	    [AC_CHECK_LIB([svld], [dlopen],
+ 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ 	      [AC_CHECK_LIB([dld], [dld_link],
+-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
 +		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-+	      ])
-+	    ])
-+	  ])
-+	])
-+      ])
-+    ;;
-+  esac
- 
--    # Update the list of available tags.
--    if test -n "$tagname"; then
--      echo appending configuration tag \"$tagname\" to $ofile
--
--      case $tagname in
--      CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
--	  AC_LIBTOOL_LANG_CXX_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
- 
--      F77)
--	if test -n "$F77" && test "X$F77" != "Xno"; then
--	  AC_LIBTOOL_LANG_F77_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- 
--      GCJ)
--	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
--	  AC_LIBTOOL_LANG_GCJ_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- 
--      RC)
--	AC_LIBTOOL_LANG_RC_CONFIG
--	;;
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
+ 	      ])
+ 	    ])
+ 	  ])
+@@ -988,7 +1871,7 @@
  
--      *)
--	AC_MSG_ERROR([Unsupported tag name: $tagname])
--	;;
--      esac
-+    AC_CACHE_CHECK([whether a program can dlopen itself],
-+	  lt_cv_dlopen_self, [dnl
+     AC_CACHE_CHECK([whether a program can dlopen itself],
+ 	  lt_cv_dlopen_self, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
 +	  _LT_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+    ])
- 
--      # Append the new tag name to the list of available tags.
--      if test -n "$tagname" ; then
--      available_tags="$available_tags $tagname"
--    fi
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+ 	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+ 	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+     ])
+@@ -996,8 +1879,8 @@
+     if test "x$lt_cv_dlopen_self" = xyes; then
+       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+-    	  lt_cv_dlopen_self_static, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
 +	  lt_cv_dlopen_self_static, [dnl
 +	  _LT_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-+      ])
-     fi
--  done
--  IFS="$lt_save_ifs"
--
--  # Now substitute the updated list of available tags.
--  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
--    mv "${ofile}T" "$ofile"
--    chmod +x "$ofile"
--  else
--    rm -f "${ofile}T"
--    AC_MSG_ERROR([unable to update list of available tagged configurations.])
--  fi
--fi
--])# _LT_AC_TAGCONFIG
- 
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
- 
--# AC_LIBTOOL_DLOPEN
--# -----------------
--# enable checks for dlopen support
--AC_DEFUN([AC_LIBTOOL_DLOPEN],
-- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_DLOPEN
--
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
- 
--# AC_LIBTOOL_WIN32_DLL
--# --------------------
--# declare package support for building win32 dll's
--AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
--[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_WIN32_DLL
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
+ 	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+ 	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+       ])
+@@ -1019,22 +1902,36 @@
+   *) enable_dlopen_self_static=unknown ;;
+   esac
+ fi
+-])# AC_LIBTOOL_DLOPEN_SELF
 +_LT_DECL([dlopen_support], [enable_dlopen], [0],
 +	 [Whether dlopen is supported])
 +_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
@@ -4165,300 +3101,124 @@
 +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
  
  
--# AC_ENABLE_SHARED([DEFAULT])
-+# _LT_COMPILER_C_O([TAGNAME])
- # ---------------------------
--# implement the --enable-shared flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_SHARED],
--[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([shared],
--    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
--	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_shared=yes ;;
--    no) enable_shared=no ;;
--    *)
--      enable_shared=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_shared=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
--])# AC_ENABLE_SHARED
--
--
--# AC_DISABLE_SHARED
--# -----------------
--#- set the default shared flag to --disable-shared
--AC_DEFUN([AC_DISABLE_SHARED],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_SHARED(no)
--])# AC_DISABLE_SHARED
--
--
--# AC_ENABLE_STATIC([DEFAULT])
--# ---------------------------
--# implement the --enable-static flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_STATIC],
--[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([static],
--    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
--	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_static=yes ;;
--    no) enable_static=no ;;
--    *)
--     enable_static=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_static=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
--])# AC_ENABLE_STATIC
--
--
--# AC_DISABLE_STATIC
--# -----------------
--# set the default static flag to --disable-static
--AC_DEFUN([AC_DISABLE_STATIC],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_STATIC(no)
--])# AC_DISABLE_STATIC
--
--
--# AC_ENABLE_FAST_INSTALL([DEFAULT])
+-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
 -# ---------------------------------
--# implement the --enable-fast-install flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_FAST_INSTALL],
--[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([fast-install],
--    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
--    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_fast_install=yes ;;
--    no) enable_fast_install=no ;;
--    *)
--      enable_fast_install=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_fast_install=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
--])# AC_ENABLE_FAST_INSTALL
--
--
--# AC_DISABLE_FAST_INSTALL
--# -----------------------
--# set the default to --disable-fast-install
--AC_DEFUN([AC_DISABLE_FAST_INSTALL],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_FAST_INSTALL(no)
--])# AC_DISABLE_FAST_INSTALL
--
--
--# AC_LIBTOOL_PICMODE([MODE])
--# --------------------------
--# implement the --with-pic flag
--# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
--AC_DEFUN([AC_LIBTOOL_PICMODE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--pic_mode=ifelse($#,1,$1,default)
--])# AC_LIBTOOL_PICMODE
+-# Check to see if options -c and -o are simultaneously supported by compiler
+-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++# _LT_COMPILER_C_O([TAGNAME])
++# ---------------------------
 +# Check to see if options -c and -o are simultaneously supported by compiler.
 +# This macro does not hard code the compiler like AC_PROG_CC_C_O.
 +m4_defun([_LT_COMPILER_C_O],
 +[m4_require([_LT_DECL_SED])dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_TAG_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+-   $rm -r conftest 2>/dev/null
 +  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
 +  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
 +   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -1045,46 +1942,50 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 +       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+      fi
+    fi
+    chmod u+w . 2>&AS_MESSAGE_LOG_FD
+-   $rm conftest*
 +   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
+    # SGI C++ compiler will create directory out/ii_files/ for
+    # template instantiation
+-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+-   $rm out/* && rmdir out
 +   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
 +   $RM out/* && rmdir out
-+   cd ..
+    cd ..
+-   rmdir conftest
+-   $rm conftest*
 +   $RM -r conftest
 +   $RM conftest*
-+])
+ ])
+-])# AC_LIBTOOL_PROG_CC_C_O
 +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
 +	[Does compiler simultaneously support -c and -o options?])
 +])# _LT_COMPILER_C_O
  
--# AC_PROG_EGREP
--# -------------
--# This is predefined starting with Autoconf 2.54, so this conditional
--# definition can be removed once we require Autoconf 2.54 or later.
--m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
--[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
--   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
--    fi])
-- EGREP=$ac_cv_prog_egrep
-- AC_SUBST([EGREP])
--])])
  
+-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+-# -----------------------------------------
 +# _LT_COMPILER_FILE_LOCKS([TAGNAME])
 +# ----------------------------------
-+# Check to see if we can do hard links to lock some files if needed
+ # Check to see if we can do hard links to lock some files if needed
+-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+-[AC_REQUIRE([_LT_AC_LOCK])dnl
 +m4_defun([_LT_COMPILER_FILE_LOCKS],
 +[m4_require([_LT_ENABLE_LOCK])dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +_LT_COMPILER_C_O([$1])
  
--# AC_PATH_TOOL_PREFIX
--# -------------------
--# find a file program which can recognise shared library
--AC_DEFUN([AC_PATH_TOOL_PREFIX],
--[AC_REQUIRE([AC_PROG_EGREP])dnl
--AC_MSG_CHECKING([for $1])
--AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
--[case $MAGIC_CMD in
--[[\\/*] |  ?:[\\/]*])
--  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
--  ;;
--*)
--  lt_save_MAGIC_CMD="$MAGIC_CMD"
--  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--dnl $ac_dummy forces splitting on constant user-supplied paths.
--dnl POSIX.2 word splitting is done only on the output of word expansions,
--dnl not every word.  This closes a longstanding sh security hole.
--  ac_dummy="ifelse([$2], , $PATH, [$2])"
--  for ac_dir in $ac_dummy; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$1; then
--      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
--      if test -n "$file_magic_test_file"; then
--	case $deplibs_check_method in
--	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
--	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
--	    $EGREP "$file_magic_regex" > /dev/null; then
--	    :
--	  else
--	    cat <<EOF 1>&2
-+hard_links="nottested"
+ hard_links="nottested"
+-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
 +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  AC_MSG_CHECKING([if we can lock with hard links])
-+  hard_links=yes
+   # do not overwrite the value of need_locks provided by the user
+   AC_MSG_CHECKING([if we can lock with hard links])
+   hard_links=yes
+-  $rm conftest*
 +  $RM conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+@@ -1097,12 +1998,13 @@
+ else
+   need_locks=no
+ fi
+-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
 +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
 +])# _LT_COMPILER_FILE_LOCKS
  
--*** Warning: the command libtool uses to detect shared libraries,
--*** $file_magic_cmd, produces output that libtool cannot recognize.
--*** The result is that libtool may fail to recognize shared libraries
--*** as such.  This will affect the creation of libtool libraries that
--*** depend on shared libraries, but programs linked with such libtool
--*** libraries will work regardless of this problem.  Nevertheless, you
--*** may want to report the problem to your system manager and/or to
--*** bug-libtool@gnu.org
  
--EOF
--	  fi ;;
--	esac
--      fi
--      break
--    fi
--  done
--  IFS="$lt_save_ifs"
--  MAGIC_CMD="$lt_save_MAGIC_CMD"
--  ;;
--esac])
--MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--if test -n "$MAGIC_CMD"; then
--  AC_MSG_RESULT($MAGIC_CMD)
+-# AC_LIBTOOL_OBJDIR
+-# -----------------
+-AC_DEFUN([AC_LIBTOOL_OBJDIR],
 +# _LT_CHECK_OBJDIR
 +# ----------------
 +m4_defun([_LT_CHECK_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
- else
--  AC_MSG_RESULT(no)
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
+ [AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+ [rm -f .libs 2>/dev/null
+ mkdir .libs 2>/dev/null
+@@ -1114,40 +2016,46 @@
  fi
--])# AC_PATH_TOOL_PREFIX
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
+ rmdir .libs 2>/dev/null])
+ objdir=$lt_cv_objdir
+-])# AC_LIBTOOL_OBJDIR
 +_LT_DECL([], [objdir], [0],
 +         [The name of the directory that contains temporary libtool files])dnl
 +m4_pattern_allow([LT_OBJDIR])dnl
@@ -4467,112 +3227,96 @@
 +])# _LT_CHECK_OBJDIR
  
  
--# AC_PATH_MAGIC
--# -------------
--# find a file program which can recognise a shared library
--AC_DEFUN([AC_PATH_MAGIC],
--[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
--if test -z "$lt_cv_path_MAGIC_CMD"; then
--  if test -n "$ac_tool_prefix"; then
--    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+-# ----------------------------------------------
 +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
 +# --------------------------------------
-+# Check hardcoding attributes.
+ # Check hardcoding attributes.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
 +m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+-_LT_AC_TAGVAR(hardcode_action, $1)=
+-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 +_LT_TAGVAR(hardcode_action, $1)=
 +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
 +   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
 +   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+
+ 
+-  # We can hardcode non-existant directories.
+-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
 +  # We can hardcode non-existent directories.
 +  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
+      # If the only mechanism to avoid hardcoding is shlibpath_var, we
+      # have to relink, otherwise we might link with an installed library
+      # when we should be linking with a yet-to-be-installed one
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
 +     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
 +     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-+    # Linking always hardcodes the temporary library directory.
+     # Linking always hardcodes the temporary library directory.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
 +    _LT_TAGVAR(hardcode_action, $1)=relink
    else
--    MAGIC_CMD=:
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+     # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
 +    _LT_TAGVAR(hardcode_action, $1)=immediate
    fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
+ else
+   # We cannot hardcode anything, or else we can only hardcode existing
+   # directories.
+-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
 +  _LT_TAGVAR(hardcode_action, $1)=unsupported
  fi
--])# AC_PATH_MAGIC
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
 +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
  
+-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
 +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
 +   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
+   # Fast installation is not supported
+   enable_fast_install=no
+ elif test "$shlibpath_overrides_runpath" = yes ||
+@@ -1155,43 +2063,121 @@
+   # Fast installation is not necessary
+   enable_fast_install=needless
+ fi
+-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
 +_LT_TAGDECL([], [hardcode_action], [0],
 +    [How to hardcode a shared library path into an executable])
 +])# _LT_LINKER_HARDCODE_LIBPATH
  
--# AC_PROG_LD
--# ----------
--# find the pathname to the GNU or non-GNU linker
--AC_DEFUN([AC_PROG_LD],
--[AC_ARG_WITH([gnu-ld],
--    [AC_HELP_STRING([--with-gnu-ld],
--	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
--    [test "$withval" = no || with_gnu_ld=yes],
--    [with_gnu_ld=no])
--AC_REQUIRE([LT_AC_PROG_SED])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  AC_MSG_CHECKING([for ld used by $CC])
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [[\\/]]* | ?:[[\\/]]*)
--      re_direlt='/[[^/]][[^/]]*/\.\./'
--      # Canonicalize the pathname of ld
--      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
--      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
-+
+ 
+-# AC_LIBTOOL_SYS_LIB_STRIP
+-# ------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+-[striplib=
 +# _LT_CMD_STRIPLIB
 +# ----------------
 +m4_defun([_LT_CMD_STRIPLIB],
 +[m4_require([_LT_DECL_EGREP])
 +striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
+ old_striplib=
+ AC_MSG_CHECKING([whether stripping libraries is possible])
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
 +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  AC_MSG_RESULT([yes])
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+   AC_MSG_RESULT([yes])
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+   case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         AC_MSG_RESULT([yes])
+-       else
+-  AC_MSG_RESULT([no])
+-fi
+-       ;;
+-   *)
+-  AC_MSG_RESULT([no])
 +  darwin*)
 +    if test -n "$STRIP" ; then
 +      striplib="$STRIP -x"
@@ -4581,51 +3325,31 @@
 +    else
 +      AC_MSG_RESULT([no])
 +    fi
-     ;;
-   *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
++    ;;
++  *)
 +    AC_MSG_RESULT([no])
      ;;
    esac
--elif test "$with_gnu_ld" = yes; then
--  AC_MSG_CHECKING([for GNU ld])
--else
--  AC_MSG_CHECKING([for non-GNU ld])
  fi
--AC_CACHE_VAL(lt_cv_path_LD,
--[if test -z "$LD"; then
--  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for ac_dir in $PATH; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      lt_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
--      # 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'*)
--	test "$with_gnu_ld" != no && break
--	;;
--      *)
--	test "$with_gnu_ld" != yes && break
--	;;
--      esac
+-])# AC_LIBTOOL_SYS_LIB_STRIP
 +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
 +_LT_DECL([], [striplib], [1])
 +])# _LT_CMD_STRIPLIB
-+
-+
+ 
+ 
+-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 +# _LT_SYS_DYNAMIC_LINKER([TAG])
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
 +m4_defun([_LT_SYS_DYNAMIC_LINKER],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +m4_require([_LT_DECL_EGREP])dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_DECL_OBJDUMP])dnl
 +m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 +AC_MSG_CHECKING([dynamic linker characteristics])
 +m4_if([$1],
 +	[], [
@@ -4634,16 +3358,23 @@
 +    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
 +    *) lt_awk_arg="/^libraries:/" ;;
 +  esac
-+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
++  case $host_os in
++    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
++    *) lt_sed_strip_eq="s,=/,/,g" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
++  case $lt_search_path_spec in
++  *\;*)
 +    # if the path contains ";" then we assume it to be the separator
 +    # otherwise default to the standard path separator (i.e. ":") - it is
 +    # assumed that no part of a normal pathname contains ";" but that should
 +    # okay in the real world where ";" in dirpaths is itself problematic.
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
++    ;;
++  *)
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
++    ;;
++  esac
 +  # Ok, now we have the path, separated by spaces, we can step through it
 +  # and add multilib dir if necessary.
 +  lt_tmp_lt_search_path_spec=
@@ -4654,10 +3385,9 @@
 +    else
 +      test -d "$lt_sys_path" && \
 +	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-     fi
-   done
--  IFS="$lt_save_ifs"
-+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
++    fi
++  done
++  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 +BEGIN {RS=" "; FS="/|\n";} {
 +  lt_foo="";
 +  lt_count=0;
@@ -4677,536 +3407,300 @@
 +  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
 +  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 +}'`
-+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
- else
--  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++  # AWK program above erroneously prepends '/' to C:/dos/paths
++  # for these hosts.
++  case $host_os in
++    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
++      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
++  esac
++  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
++else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi])
--LD="$lt_cv_path_LD"
--if test -n "$LD"; then
--  AC_MSG_RESULT($LD)
++fi])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -1205,20 +2191,6 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
 -else
--  AC_MSG_RESULT(no)
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 -fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_PROG_LD_GNU
--])# AC_PROG_LD
--
--
--# AC_PROG_LD_GNU
--# --------------
--AC_DEFUN([AC_PROG_LD_GNU],
--[AC_REQUIRE([AC_PROG_EGREP])dnl
--AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `$LD -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
--  lt_cv_prog_gnu_ld=yes
--  ;;
--*)
--  lt_cv_prog_gnu_ld=no
--  ;;
--esac])
--with_gnu_ld=$lt_cv_prog_gnu_ld
--])# AC_PROG_LD_GNU
--
--
--# AC_PROG_LD_RELOAD_FLAG
--# ----------------------
--# find reload flag for linker
--#   -- PORTME Some linkers may need a different reload flag.
--AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
--[AC_CACHE_CHECK([for $LD option to reload object files],
--  lt_cv_ld_reload_flag,
--  [lt_cv_ld_reload_flag='-r'])
--reload_flag=$lt_cv_ld_reload_flag
--case $reload_flag in
--"" | " "*) ;;
--*) reload_flag=" $reload_flag" ;;
--esac
--reload_cmds='$LD$reload_flag -o $output$reload_objs'
--])# AC_PROG_LD_RELOAD_FLAG
--
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
- 
--# AC_DEPLIBS_CHECK_METHOD
--# -----------------------
--# how to check for library dependencies
--#  -- PORTME fill in with the dynamic library characteristics
--AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
--[AC_CACHE_CHECK([how to recognise dependent libraries],
--lt_cv_deplibs_check_method,
--[lt_cv_file_magic_cmd='$MAGIC_CMD'
--lt_cv_file_magic_test_file=
--lt_cv_deplibs_check_method='unknown'
--# Need to set the preceding variable on all platforms that support
--# interlibrary dependencies.
--# 'none' -- dependencies not supported.
--# `unknown' -- same as none, but documents that we really don't know.
--# 'pass_all' -- all dependencies passed with no checks.
--# 'test_compile' -- check by making test program.
--# 'file_magic [[regex]]' -- check by looking for files in library path
--# which responds to the $file_magic_cmd with a given extended regex.
--# If you have `file' or equivalent on your system and you're not sure
--# whether `pass_all' will *always* work, you probably want this one.
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
- 
- case $host_os in
--aix4* | aix5*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--beos*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--bsdi4*)
--  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
--  ;;
--
--cygwin*)
--  # win32_libid is a shell function defined in ltmain.sh
--  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
--  lt_cv_file_magic_cmd='win32_libid'
--  ;;
--
--mingw* | pw32*)
--  # Base MSYS/MinGW do not provide the 'file' command needed by
--  # win32_libid shell function, so use a weaker test based on 'objdump'.
--  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
--  lt_cv_file_magic_cmd='$OBJDUMP -f'
--  ;;
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
  
--darwin* | rhapsody*)
--  lt_cv_deplibs_check_method=pass_all
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
+@@ -1236,7 +2208,7 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
    ;;
  
--freebsd* | kfreebsd*-gnu)
--  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    case $host_cpu in
--    i*86 )
--      # Not sure whether the presence of OpenBSD here was a mistake.
--      # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
--      lt_cv_file_magic_cmd=/usr/bin/file
--      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-aix4* | aix5*)
 +aix[[4-9]]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[[01]] | aix4.[[01]].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -1255,7 +2227,7 @@
+       aix4 | aix4.[[01]] | aix4.[[01]].*)
+       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ 	   echo ' yes '
+-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
 +	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-       ;;
-     esac
--  else
--    lt_cv_deplibs_check_method=pass_all
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-   fi
+ 	:
+       else
+ 	can_build_shared=no
+@@ -1281,9 +2253,18 @@
    ;;
  
--gnu*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--hpux10.20* | hpux11*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  case "$host_cpu" in
--  ia64*)
--    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
--    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
--    ;;
--  hppa*64*)
--    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
--    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+amigaos*)
+ amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 +  case $host_cpu in
 +  powerpc)
 +    # Since July 2007 AmigaOS4 officially supports .so libraries.
 +    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     ;;
--  *)
--    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
--    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
 +  m68k)
 +    library_names_spec='$libname.ixlibrary $libname.a'
 +    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-     ;;
-   esac
-   ;;
- 
--irix5* | irix6* | nonstopux*)
--  case $LD in
--  *-32|*"-32 ") libmagic=32-bit;;
--  *-n32|*"-n32 ") libmagic=N32;;
--  *-64|*"-64 ") libmagic=64-bit;;
--  *) libmagic=never-match;;
--  esac
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--# This must be Linux ELF.
--linux*)
--  case $host_cpu in
--  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64)
--    lt_cv_deplibs_check_method=pass_all ;;
--  *)
--    # glibc up to 2.1.1 does not perform some relocations on ARM
--    # this will be overridden with pass_all, but let us keep it just in case
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
--  esac
--  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
--  lt_cv_deplibs_check_method=pass_all
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    ;;
++  esac
    ;;
  
--netbsd*)
--  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
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
--  fi
-+bsdi[[45]]*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
+ beos*)
+@@ -1306,61 +2287,112 @@
+   # libtool to hard-code these into programs
    ;;
  
--newos6*)
--  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=/usr/lib/libnls.so
--  ;;
+-cygwin* | mingw* | pw32*)
 +cygwin* | mingw* | pw32* | cegcc*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
  
--nto-qnx*)
--  lt_cv_deplibs_check_method=unknown
--  ;;
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
++  case $GCC,$cc_basename in
++  yes,*)
++    # gcc
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+       $install_prog $dir/$dlname \$dldir/$dlname~
+-      chmod a+x \$dldir/$dlname'
 +      chmod a+x \$dldir/$dlname~
 +      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
 +        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
 +      fi'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
 +       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
+     shlibpath_overrides_runpath=yes
  
--openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
--  else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
--  fi
-+    case $host_os in
+     case $host_os in
+     cygwin*)
+       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++m4_if([$1], [],[
++      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+       ;;
+-    mingw*)
++    mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-      else
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-      fi
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
++    dynamic_linker='Win32 ld.exe'
++    ;;
++
++  *,cl*)
++    # Native MSVC
++    libname_spec='$name'
++    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++    library_names_spec='${libname}.dll.lib'
++
++    case $build_os in
++    mingw*)
++      sys_lib_search_path_spec=
++      lt_save_ifs=$IFS
++      IFS=';'
++      for lt_path in $LIB
++      do
++        IFS=$lt_save_ifs
++        # Let DOS variable expansion print the short 8.3 style file name.
++        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
++        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
++      done
++      IFS=$lt_save_ifs
++      # Convert to MSYS style.
++      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
++      ;;
 +    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      # Convert to unix form, then to dos form, then back to unix form
++      # but this time dos style (no spaces!) so that the unix form looks
++      # like /cygdrive/c/PROGRA~1:/cygdr...
++      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
++      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
++      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 +      ;;
-+    mingw* | cegcc*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++    *)
++      sys_lib_search_path_spec="$LIB"
 +      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
++        # It is most probably a Windows format PATH.
 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 +      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 +      fi
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      # FIXME: find the short name or the path components, as spaces are
++      # common. (e.g. "Program Files" -> "PROGRA~1")
 +      ;;
 +    esac
-+    ;;
 +
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-   ;;
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
++    dynamic_linker='Win32 link.exe'
+     ;;
  
--osf3* | osf4* | osf5*)
--  lt_cv_deplibs_check_method=pass_all
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
+   *)
++    # Assume MSVC wrapper
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    dynamic_linker='Win32 ld.exe'
+     ;;
+   esac
+-  dynamic_linker='Win32 ld.exe'
+   # FIXME: first we should search . and the directory the executable is in
+   shlibpath_var=PATH
+   ;;
+@@ -1370,17 +2402,13 @@
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
 +  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
 +m4_if([$1], [],[
 +  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
--sco3.2v5*)
--  lt_cv_deplibs_check_method=pass_all
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
+@@ -1397,18 +2425,6 @@
+   dynamic_linker=no
    ;;
  
--solaris*)
--  lt_cv_deplibs_check_method=pass_all
-+freebsd1*)
-+  dynamic_linker=no
-   ;;
- 
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--  case $host_vendor in
--  motorola)
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
--    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
--    ;;
--  ncr)
--    lt_cv_deplibs_check_method=pass_all
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[[123]]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-     ;;
--  sequent)
--    lt_cv_file_magic_cmd='/bin/file'
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-     ;;
--  sni)
--    lt_cv_file_magic_cmd='/bin/file'
--    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
--    lt_cv_file_magic_test_file=/lib/libc.so
-+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -1446,7 +2462,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
      ;;
--  siemens)
--    lt_cv_deplibs_check_method=pass_all
+-  freebsd*) # from 4.6 on
 +  *) # from 4.6 on, and DragonFly
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
      ;;
-   esac
-   ;;
- 
--sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
--  lt_cv_deplibs_check_method=pass_all
-+gnu*)
+@@ -1460,6 +2476,20 @@
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
++haiku*)
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
++  dynamic_linker="$host_os runtime_loader"
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
++  shlibpath_var=LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+   hardcode_into_libs=yes
    ;;
--esac
--])
--file_magic_cmd=$lt_cv_file_magic_cmd
--deplibs_check_method=$lt_cv_deplibs_check_method
--test -z "$deplibs_check_method" && deplibs_check_method=unknown
--])# AC_DEPLIBS_CHECK_METHOD
  
--
--# AC_PROG_NM
--# ----------
--# find the pathname to a BSD-compatible name lister
--AC_DEFUN([AC_PROG_NM],
--[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
--[if test -n "$NM"; then
--  # Let the user override the test.
--  lt_cv_path_NM="$NM"
--else
--  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
--    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
--      # Check to see if the nm accepts a BSD-compat flag.
--      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
--      #   nm: unknown option "B" ignored
--      # Tru64's nm complains that /dev/null is an invalid object file
--      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
--      */dev/null* | *'Invalid file or object type'*)
--	lt_cv_path_NM="$tmp_nm -B"
--	break
--        ;;
--      *)
--	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
--	*/dev/null*)
--	  lt_cv_path_NM="$tmp_nm -p"
--	  break
--	  ;;
--	*)
--	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
--	  continue # so that we can try to find one that supports BSD flags
--	  ;;
--	esac
--      esac
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  case $host_cpu in
-+  ia64*)
-+    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+@@ -1485,18 +2515,18 @@
      fi
--  done
--  IFS="$lt_save_ifs"
--  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
--fi])
--NM="$lt_cv_path_NM"
--])# AC_PROG_NM
--
--
--# AC_CHECK_LIBM
--# -------------
--# check for math library
--AC_DEFUN([AC_CHECK_LIBM],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--LIBM=
--case $host in
--*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
--  # These system don't have libm, or don't need it
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+-   hppa*64*)
+-     shrext_cmds='.sl'
+-     hardcode_into_libs=yes
+-     dynamic_linker="$host_os dld.sl"
+-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-     soname_spec='${libname}${release}${shared_ext}$major'
+-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-     ;;
+-   *)
 +  hppa*64*)
 +    shrext_cmds='.sl'
 +    hardcode_into_libs=yes
@@ -5219,583 +3713,186 @@
 +    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
 +  *)
-+    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
+     shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+@@ -1505,11 +2535,13 @@
+     soname_spec='${libname}${release}${shared_ext}$major'
+     ;;
+   esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+   postinstall_cmds='chmod 555 $lib'
++  # or fails outright, so override atomically:
++  install_override_mode=555
    ;;
--*-ncr-sysv4.3*)
--  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
--  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+
+ 
+-interix3*)
 +interix[[3-9]]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-   ;;
--*)
--  AC_CHECK_LIB(m, cos, LIBM="-lm")
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -1564,7 +2596,7 @@
    ;;
--esac
--])# AC_CHECK_LIBM
- 
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
  
--# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
--# -----------------------------------
--# sets LIBLTDL to the link flags for the libltdl convenience library and
--# LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
--# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
--# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
--# '${top_srcdir}/' (note the single quotes!).  If your package is not
--# flat and you're not using automake, define top_builddir and
--# top_srcdir appropriately in the Makefiles.
--AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--  case $enable_ltdl_convenience in
--  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
--  "") enable_ltdl_convenience=yes
--      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
--  esac
--  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
--  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
--  # For backwards non-gettext consistent compatibility...
--  INCLTDL="$LTDLINCL"
--])# AC_LIBLTDL_CONVENIENCE
-+# This must be Linux ELF.
+ # This must be Linux ELF.
+-linux*)
 +linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -1573,32 +2605,31 @@
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
++
 +  # Some binutils ld are patched to set DT_RUNPATH
-+  save_LDFLAGS=$LDFLAGS
-+  save_libdir=$libdir
-+  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-+       [shlibpath_overrides_runpath=yes])])
-+  LDFLAGS=$save_LDFLAGS
-+  libdir=$save_libdir
- 
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
++  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
++    [lt_cv_shlibpath_overrides_runpath=no
++    save_LDFLAGS=$LDFLAGS
++    save_libdir=$libdir
++    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
++	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
++    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
++	 [lt_cv_shlibpath_overrides_runpath=yes])])
++    LDFLAGS=$save_LDFLAGS
++    libdir=$save_libdir
++    ])
++  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
++
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
  
--# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
--# -----------------------------------
--# sets LIBLTDL to the link flags for the libltdl installable library and
--# LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
--# DIRECTORY is not provided and an installed libltdl is not found, it is
--# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
--# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
--# quotes!).  If your package is not flat and you're not using automake,
--# define top_builddir and top_srcdir appropriately in the Makefiles.
--# 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
--  AC_CHECK_LIB(ltdl, lt_dlinit,
--  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
--  [if test x"$enable_ltdl_install" = xno; then
--     AC_MSG_WARN([libltdl not installed, but installation disabled])
--   else
--     enable_ltdl_install=yes
--   fi
--  ])
--  if test x"$enable_ltdl_install" = x"yes"; then
--    ac_configure_args="$ac_configure_args --enable-ltdl-install"
--    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
--    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
--  else
--    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
--    LIBLTDL="-lltdl"
--    LTDLINCL=
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-    if AC_TRY_EVAL(ac_compile); then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    fi
--  # For backwards non-gettext consistent compatibility...
--  INCLTDL="$LTDLINCL"
--])# AC_LIBLTDL_INSTALLABLE
--
--
--# AC_LIBTOOL_CXX
--# --------------
--# enable support for C++ libraries
--AC_DEFUN([AC_LIBTOOL_CXX],
--[AC_REQUIRE([_LT_AC_LANG_CXX])
--])# AC_LIBTOOL_CXX
  
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -1610,7 +2641,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
  
--# _LT_AC_LANG_CXX
--# ---------------
--AC_DEFUN([_LT_AC_LANG_CXX],
--[AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
--])# _LT_AC_LANG_CXX
--
--
--# AC_LIBTOOL_F77
--# --------------
--# enable support for Fortran 77 libraries
--AC_DEFUN([AC_LIBTOOL_F77],
--[AC_REQUIRE([_LT_AC_LANG_F77])
--])# AC_LIBTOOL_F77
--
--
--# _LT_AC_LANG_F77
--# ---------------
--AC_DEFUN([_LT_AC_LANG_F77],
--[AC_REQUIRE([AC_PROG_F77])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
--])# _LT_AC_LANG_F77
--
--
--# AC_LIBTOOL_GCJ
--# --------------
--# enable support for GCJ libraries
--AC_DEFUN([AC_LIBTOOL_GCJ],
--[AC_REQUIRE([_LT_AC_LANG_GCJ])
--])# AC_LIBTOOL_GCJ
--
--
--# _LT_AC_LANG_GCJ
--# ---------------
--AC_DEFUN([_LT_AC_LANG_GCJ],
--[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
--  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
--    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
--      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
--	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
--	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
--])# _LT_AC_LANG_GCJ
--
--
--# AC_LIBTOOL_RC
--# --------------
--# enable support for Windows resource files
--AC_DEFUN([AC_LIBTOOL_RC],
--[AC_REQUIRE([LT_AC_PROG_RC])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
--])# AC_LIBTOOL_RC
--
--
--# AC_LIBTOOL_LANG_C_CONFIG
--# ------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
--AC_DEFUN([_LT_AC_LANG_C_CONFIG],
--[lt_save_CC="$CC"
--AC_LANG_PUSH(C)
--
--# Source file extension for C test sources.
--ac_ext=c
--
--# Object file extension for compiled C test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
+-knetbsd*-gnu)
 +netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -1619,14 +2650,14 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
 +  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
+   ;;
  
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
- 
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+@@ -1647,14 +2678,16 @@
+   shlibpath_overrides_runpath=yes
+   ;;
  
--_LT_AC_SYS_COMPILER
+-nto-qnx*)
+-  version_type=linux
 +*nto* | *qnx*)
 +  version_type=qnx
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  dynamic_linker='ldqnx.so'
-+  ;;
+   ;;
  
--#
--# Check for any special shared library compilation flags.
--#
--_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
--if test "$GCC" = no; then
-+openbsd*)
-+  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ openbsd*)
+@@ -1663,13 +2696,13 @@
+   need_lib_prefix=no
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
    case $host_os in
--  sco3.2v5*)
--    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
--    ;;
+-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+-    *)                         need_version=no  ;;
 +    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
 +    *)				need_version=no  ;;
    esac
--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])
--  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
-+  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
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[[89]] | openbsd2.[[89]].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
-   else
--    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
-+    shlibpath_overrides_runpath=yes
-   fi
--fi
-+  ;;
- 
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
- 
--#
--# Check to make sure the static flag actually works.
--#
--AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
--  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
--  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
--  [],
--  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
+     case $host_os in
+       openbsd2.[[89]] | openbsd2.[[89]].*)
+ 	shlibpath_overrides_runpath=no
+@@ -1703,6 +2736,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
  
 +rdos*)
 +  dynamic_linker=no
 +  ;;
- 
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF($1)
--
--# Report which librarie types wil actually be built
--AC_MSG_CHECKING([if libtool supports shared libraries])
--AC_MSG_RESULT([$can_build_shared])
--
--AC_MSG_CHECKING([whether to build shared libraries])
--test "$can_build_shared" = "no" && enable_shared=no
--
--# On AIX, shared libraries and static libraries use the same namespace, and
--# are all built from PIC.
--case "$host_os" in
--aix3*)
--  test "$enable_shared" = yes && enable_static=no
--  if test -n "$RANLIB"; then
--    archive_cmds="$archive_cmds~\$RANLIB \$lib"
--    postinstall_cmds='$RANLIB $lib'
--  fi
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-   ;;
- 
--aix4*)
--  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--    test "$enable_shared" = yes && enable_static=no
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-   fi
-+  need_version=yes
-   ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
 +
-+sysv4 | sysv4.3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      runpath_var=LD_RUN_PATH
-       ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
-+    siemens)
-+      need_lib_prefix=no
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -1737,7 +2774,6 @@
+     sni)
+       shlibpath_overrides_runpath=no
+       need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+       runpath_var=LD_RUN_PATH
        ;;
--    esac
--    output_verbose_link_cmd='echo'
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--  else
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--  fi
--    ;;
--esac
--AC_MSG_RESULT([$enable_shared])
--
--AC_MSG_CHECKING([whether to build static libraries])
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--AC_MSG_RESULT([$enable_static])
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_C_CONFIG
--
--
--# AC_LIBTOOL_LANG_CXX_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
--AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
--[AC_LANG_PUSH(C++)
--AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
--
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_AC_TAGVAR(allow_undefined_flag, $1)=
--_LT_AC_TAGVAR(always_export_symbols, $1)=no
--_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_direct, $1)=no
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--_LT_AC_TAGVAR(hardcode_automatic, $1)=no
--_LT_AC_TAGVAR(module_cmds, $1)=
--_LT_AC_TAGVAR(module_expsym_cmds, $1)=
--_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_AC_TAGVAR(no_undefined_flag, $1)=
--_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--
--# Dependencies to place before and after the object being linked:
--_LT_AC_TAGVAR(predep_objects, $1)=
--_LT_AC_TAGVAR(postdep_objects, $1)=
--_LT_AC_TAGVAR(predeps, $1)=
--_LT_AC_TAGVAR(postdeps, $1)=
--_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
- 
--# Source file extension for C++ test sources.
--ac_ext=cc
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
- 
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
+     siemens)
+@@ -1768,13 +2804,12 @@
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
+   hardcode_into_libs=yes
+   if test "$with_gnu_ld" = yes; then
+     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+-    shlibpath_overrides_runpath=no
+   else
+     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+-    shlibpath_overrides_runpath=yes
+     case $host_os in
+       sco3.2v5*)
+         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+@@ -1784,6 +2819,17 @@
+   sys_lib_dlsearch_path_spec='/usr/lib'
+   ;;
  
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
 +tpf*)
 +  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
 +  version_type=linux
@@ -5806,82 +3903,47 @@
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
- 
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
- 
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
- 
--# Allow CC to be a program name with arguments.
--lt_save_CC=$CC
--lt_save_LD=$LD
--lt_save_GCC=$GCC
--GCC=$GXX
--lt_save_with_gnu_ld=$with_gnu_ld
--lt_save_path_LD=$lt_cv_path_LD
--if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
--  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
--else
--  unset lt_cv_prog_gnu_ld
--fi
--if test -n "${lt_cv_path_LDCXX+set}"; then
--  lt_cv_path_LD=$lt_cv_path_LDCXX
--else
--  unset lt_cv_path_LD
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1802,290 +2848,70 @@
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
--test -z "${LDCXX+set}" || LD=$LDCXX
--CC=${CXX-"c++"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
  
--# We don't want -fno-exception wen compiling C++ code, so set the
--# no_builtin_flag separately
--if test "$GXX" = yes; then
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
--else
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
 +  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 +fi
 +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
 +  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
- fi
++fi
  
--if test "$GXX" = yes; then
--  # Set up default GNU C++ configuration
--
--  AC_PROG_LD
--
--  # 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
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-# _LT_AC_TAGCONFIG
+-# ----------------
+-AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
+-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+-        [include additional configurations @<:@automatic@:>@])],
+-    [tagnames="$withval"])
 -
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-if test -f "$ltmain" && test -n "$tagnames"; then
+-  if test ! -f "${ofile}"; then
+-    AC_MSG_WARN([output file `$ofile' does not exist])
+-  fi
 -
--    # If archive_cmds runs LD, not CC, wlarc should be empty
--    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
--    #     investigate it a little bit more. (MM)
--    wlarc='${wl}'
+-  if test -z "$LTCC"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+-    if test -z "$LTCC"; then
+-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+-    else
+-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+-    fi
+-  fi
+-  if test -z "$LTCFLAGS"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+-  fi
 +_LT_DECL([], [variables_saved_for_relink], [1],
 +    [Variables whose values should be saved in libtool wrapper scripts and
 +    restored at link time])
@@ -5899,6 +3961,8 @@
 +    The last name is the one that the linker finds with -lNAME]])
 +_LT_DECL([], [soname_spec], [1],
 +    [[The coded name of the library, if different from the real name]])
++_LT_DECL([], [install_override_mode], [1],
++    [Permission mode override for installation of shared libraries])
 +_LT_DECL([], [postinstall_cmds], [2],
 +    [Command to use after installation of a shared archive])
 +_LT_DECL([], [postuninstall_cmds], [2],
@@ -5916,346 +3980,398 @@
 +    [Run-time system search path for libraries])
 +])# _LT_SYS_DYNAMIC_LINKER
  
--    # ancient GNU ld didn't support --whole-archive et. al.
--    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
--	grep 'no-whole-archive' > /dev/null; then
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--    else
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--    fi
--  else
--    with_gnu_ld=no
--    wlarc=
- 
--    # A generic and very simple default shared library creation
--    # command for GNU C++ for the case where it uses the native
--    # 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.
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--  fi
-+# _LT_PATH_TOOL_PREFIX(TOOL)
-+# --------------------------
-+# find a file program which can recognize shared library
-+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-+[m4_require([_LT_DECL_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] |  ?:[\\/]*])
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word.  This closes a longstanding sh security hole.
-+  ac_dummy="m4_if([$2], , $PATH, [$2])"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$1; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<_LT_EOF 1>&2
- 
--  # Commands to make compiler produce verbose output that lists
--  # what "hidden" libraries, object files and flags are used when
--  # linking a shared library.
--  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
- 
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  AC_MSG_RESULT($MAGIC_CMD)
- else
--  GXX=no
--  with_gnu_ld=no
--  wlarc=
-+  AC_MSG_RESULT(no)
- fi
-+_LT_DECL([], [MAGIC_CMD], [0],
-+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-+])# _LT_PATH_TOOL_PREFIX
- 
--# PORTME: fill in a description of your system's C++ link characteristics
--AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
--_LT_AC_TAGVAR(ld_shlibs, $1)=yes
--case $host_os in
--  aix3*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  aix4* | aix5*)
--    if test "$host_cpu" = ia64; then
--      # On IA64, the linker does run time linking by default, so we don't
--      # have to do anything special.
--      aix_use_runtimelinking=no
--      exp_sym_flag='-Bexport'
--      no_entry_flag=""
--    else
--      aix_use_runtimelinking=no
-+# Old name:
-+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
- 
--      # Test if we are trying to use run time linking or normal
--      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
--      # need to do runtime linking.
--      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
--	for ld_flag in $LDFLAGS; do
--	  case $ld_flag in
--	  *-brtl*)
--	    aix_use_runtimelinking=yes
--	    break
--	    ;;
--	  esac
--	done
--      esac
+-  # Extract list of available tagged configurations in $ofile.
+-  # Note that this assumes the entire list is on one line.
+-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
  
--      exp_sym_flag='-bexport'
--      no_entry_flag='-bnoentry'
+-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-  for tagname in $tagnames; do
+-    IFS="$lt_save_ifs"
+-    # Check whether tagname contains only valid characters
+-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+-    "") ;;
+-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+-	;;
+-    esac
+-
+-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+-    then
+-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
 -    fi
-+# _LT_PATH_MAGIC
-+# --------------
-+# find a file program which can recognize a shared library
-+m4_defun([_LT_PATH_MAGIC],
-+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])# _LT_PATH_MAGIC
- 
--    # When large executables or shared objects are built, AIX ld can
--    # have problems creating the table of contents.  If linking a library
--    # or program results in "error TOC overflow" add -mminimal-toc to
--    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
--    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 -
--    _LT_AC_TAGVAR(archive_cmds, $1)=''
--    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- 
--    if test "$GXX" = yes; then
--      case $host_os in aix4.[012]|aix4.[012].*)
--      # We only want to do this on AIX 4.2 and lower, the check
--      # below for broken collect2 doesn't work under 4.3+
--	collect2name=`${CC} -print-prog-name=collect2`
--	if test -f "$collect2name" && \
--	   strings "$collect2name" | grep resolve_lib_name >/dev/null
--	then
--	  # We have reworked collect2
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    # Update the list of available tags.
+-    if test -n "$tagname"; then
+-      echo appending configuration tag \"$tagname\" to $ofile
+-
+-      case $tagname in
+-      CXX)
+-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-	    (test "X$CXX" != "Xg++"))) ; then
+-	  AC_LIBTOOL_LANG_CXX_CONFIG
 -	else
--	  # We have old collect2
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
--	  # It fails to find uninstalled libraries when the uninstalled
--	  # path is not listed in the libpath.  Setting hardcode_minus_L
--	  # to unsupported forces relinking
--	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	  tagname=""
 -	fi
--      esac
--      shared_flag='-shared'
--    else
--      # not using gcc
--      if test "$host_cpu" = ia64; then
--	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
--	# chokes on -Wl,-G. The following line is correct:
--	shared_flag='-G'
--      else
--	if test "$aix_use_runtimelinking" = yes; then
--	  shared_flag='${wl}-G'
+-	;;
+-
+-      F77)
+-	if test -n "$F77" && test "X$F77" != "Xno"; then
+-	  AC_LIBTOOL_LANG_F77_CONFIG
 -	else
--	  shared_flag='${wl}-bM:SRE'
+-	  tagname=""
 -	fi
--      fi
--    fi
-+# LT_PATH_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([LT_PATH_LD],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
+-	;;
+-
+-      GCJ)
+-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+-	  AC_LIBTOOL_LANG_GCJ_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      RC)
+-	AC_LIBTOOL_LANG_RC_CONFIG
+-	;;
+-
+-      *)
+-	AC_MSG_ERROR([Unsupported tag name: $tagname])
+-	;;
+-      esac
+-
+-      # Append the new tag name to the list of available tags.
+-      if test -n "$tagname" ; then
+-      available_tags="$available_tags $tagname"
+-    fi
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-
+-  # Now substitute the updated list of available tags.
+-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+-    mv "${ofile}T" "$ofile"
+-    chmod +x "$ofile"
+-  else
+-    rm -f "${ofile}T"
+-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+-  fi
+-fi
+-])# _LT_AC_TAGCONFIG
+-
+-
+-# AC_LIBTOOL_DLOPEN
+-# -----------------
+-# enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_DLOPEN
+-
+-
+-# AC_LIBTOOL_WIN32_DLL
+-# --------------------
+-# declare package support for building win32 DLLs
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_WIN32_DLL
+-
+-
+-# AC_ENABLE_SHARED([DEFAULT])
+-# ---------------------------
+-# implement the --enable-shared flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([shared],
+-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_shared=yes ;;
+-    no) enable_shared=no ;;
+-    *)
+-      enable_shared=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+-])# AC_ENABLE_SHARED
+-
+-
+-# AC_DISABLE_SHARED
+-# -----------------
+-# set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)
+-])# AC_DISABLE_SHARED
+-
+-
+-# AC_ENABLE_STATIC([DEFAULT])
+-# ---------------------------
+-# implement the --enable-static flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([static],
+-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_static=yes ;;
+-    no) enable_static=no ;;
+-    *)
+-     enable_static=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_static=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+-])# AC_ENABLE_STATIC
+-
+-
+-# AC_DISABLE_STATIC
+-# -----------------
+-# set the default static flag to --disable-static
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)
+-])# AC_DISABLE_STATIC
+-
+-
+-# AC_ENABLE_FAST_INSTALL([DEFAULT])
+-# ---------------------------------
+-# implement the --enable-fast-install flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([fast-install],
+-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_fast_install=yes ;;
+-    no) enable_fast_install=no ;;
+-    *)
+-      enable_fast_install=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_fast_install=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+-])# AC_ENABLE_FAST_INSTALL
+-
+-
+-# AC_DISABLE_FAST_INSTALL
+-# -----------------------
+-# set the default to --disable-fast-install
+-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)
+-])# AC_DISABLE_FAST_INSTALL
+-
+-
+-# AC_LIBTOOL_PICMODE([MODE])
+-# --------------------------
+-# implement the --with-pic flag
+-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+-AC_DEFUN([AC_LIBTOOL_PICMODE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)
+-])# AC_LIBTOOL_PICMODE
+-
+-
+-# AC_PROG_EGREP
+-# -------------
+-# This is predefined starting with Autoconf 2.54, so this conditional
+-# definition can be removed once we require Autoconf 2.54 or later.
+-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
+-    fi])
+- EGREP=$ac_cv_prog_egrep
+- AC_SUBST([EGREP])
+-])])
+-
+-
+-# AC_PATH_TOOL_PREFIX
+-# -------------------
+-# find a file program which can recognise shared library
+-AC_DEFUN([AC_PATH_TOOL_PREFIX],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+-[case $MAGIC_CMD in
+-[[\\/*] |  ?:[\\/]*])
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+-  ;;
+-*)
+-  lt_save_MAGIC_CMD="$MAGIC_CMD"
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-dnl $ac_dummy forces splitting on constant user-supplied paths.
+-dnl POSIX.2 word splitting is done only on the output of word expansions,
+-dnl not every word.  This closes a longstanding sh security hole.
+-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+-  for ac_dir in $ac_dummy; do
++# _LT_PATH_TOOL_PREFIX(TOOL)
++# --------------------------
++# find a file program which can recognize shared library
++AC_DEFUN([_LT_PATH_TOOL_PREFIX],
++[m4_require([_LT_DECL_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] |  ?:[\\/]*])
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="m4_if([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
+     IFS="$lt_save_ifs"
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$1; then
+@@ -2099,7 +2925,7 @@
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+ 	    :
+ 	  else
+-	    cat <<EOF 1>&2
++	    cat <<_LT_EOF 1>&2
  
--    # It seems that -bexpall does not export symbols beginning with
--    # underscore (_), so it is better to generate a list of symbols to export.
--    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
--    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.
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
--      # Determine the default libpath from the value encoded in an empty executable.
--      _LT_AC_SYS_LIBPATH_AIX
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ *** Warning: the command libtool uses to detect shared libraries,
+ *** $file_magic_cmd, produces output that libtool cannot recognize.
+@@ -2110,7 +2936,7 @@
+ *** may want to report the problem to your system manager and/or to
+ *** bug-libtool@gnu.org
+ 
+-EOF
++_LT_EOF
+ 	  fi ;;
+ 	esac
+       fi
+@@ -2127,37 +2953,48 @@
+ else
+   AC_MSG_RESULT(no)
+ fi
+-])# AC_PATH_TOOL_PREFIX
++_LT_DECL([], [MAGIC_CMD], [0],
++	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
++])# _LT_PATH_TOOL_PREFIX
+ 
++# Old name:
++AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+ 
+-# AC_PATH_MAGIC
+-# -------------
+-# find a file program which can recognise a shared library
+-AC_DEFUN([AC_PATH_MAGIC],
+-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++
++# _LT_PATH_MAGIC
++# --------------
++# find a file program which can recognize a shared library
++m4_defun([_LT_PATH_MAGIC],
++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+   else
+     MAGIC_CMD=:
+   fi
+ fi
+-])# AC_PATH_MAGIC
++])# _LT_PATH_MAGIC
+ 
+ 
+-# AC_PROG_LD
++# LT_PATH_LD
+ # ----------
+ # find the pathname to the GNU or non-GNU linker
+-AC_DEFUN([AC_PROG_LD],
+-[AC_ARG_WITH([gnu-ld],
+-    [AC_HELP_STRING([--with-gnu-ld],
+-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+-    [test "$withval" = no || with_gnu_ld=yes],
+-    [with_gnu_ld=no])
+-AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
++AC_DEFUN([LT_PATH_LD],
++[AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
++
 +AC_ARG_WITH([gnu-ld],
 +    [AS_HELP_STRING([--with-gnu-ld],
 +	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
 +    [test "$withval" = no || with_gnu_ld=yes],
 +    [with_gnu_ld=no])dnl
- 
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--     else
--      if test "$host_cpu" = ia64; then
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
--      else
--	# Determine the default libpath from the value encoded in an empty executable.
--	_LT_AC_SYS_LIBPATH_AIX
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	# Warning - without using the other run time loading flags,
--	# -berok will link without error, but may produce a broken library.
--	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	# -bexpall does not export symbols beginning with underscore (_)
--	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
--	# Exported symbols can be pulled into shared objects from archives
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
--	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	# This is similar to how AIX traditionally builds it's shared libraries.
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--      fi
--    fi
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by $CC])
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [[\\/]]* | ?:[[\\/]]*)
-+      re_direlt='/[[^/]][[^/]]*/\.\./'
-+      # Canonicalize the pathname of ld
++
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+@@ -2174,9 +3011,9 @@
+     [[\\/]]* | ?:[[\\/]]*)
+       re_direlt='/[[^/]][[^/]]*/\.\./'
+       # Canonicalize the pathname of ld
+-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
 +      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
 +      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 +	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-     ;;
--  chorus*)
--    case $cc_basename in
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some variants of GNU ld only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
-+	;;
-       *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	test "$with_gnu_ld" != yes && break
- 	;;
--    esac
--    ;;
--
--  cygwin* | mingw* | pw32*)
--    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--    # as there is no search path for DLLs.
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--    _LT_AC_TAGVAR(always_export_symbols, $1)=no
--    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--
--    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
--      # 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
--	cp $export_symbols $output_objdir/$soname.def;
--      else
--	echo EXPORTS > $output_objdir/$soname.def;
--	cat $export_symbols >> $output_objdir/$soname.def;
--      fi~
--      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
--    else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      esac
-     fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+       done
+       test -z "$LD" && LD="$ac_prog"
+       ;;
+@@ -2226,15 +3063,24 @@
+   AC_MSG_RESULT(no)
+ fi
+ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
+-])# AC_PROG_LD
 +_LT_PATH_LD_GNU
 +AC_SUBST([LD])
-+
+ 
 +_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
 +])# LT_PATH_LD
-+
+ 
+-# AC_PROG_LD_GNU
+-# --------------
+-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,
 +# Old names:
 +AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
 +AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
@@ -6268,1028 +4384,299 @@
 +#- --------------
 +m4_defun([_LT_PATH_LD_GNU],
 +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
-+  ;;
-+*)
-+  lt_cv_prog_gnu_ld=no
+ [# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -2245,14 +3091,14 @@
    ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
+ esac])
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+-])# AC_PROG_LD_GNU
 +])# _LT_PATH_LD_GNU
  
--  darwin* | rhapsody*)
--  if test "$GXX" = yes; then
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--      ;;
--    esac
--    lt_int_apple_cc_single_mod=no
--    output_verbose_link_cmd='echo'
--    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--      lt_int_apple_cc_single_mod=yes
--    fi
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    else
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    fi
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
  
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-# AC_PROG_LD_RELOAD_FLAG
+-# ----------------------
 +# _LT_CMD_RELOAD
 +# --------------
-+# find reload flag for linker
-+#   -- PORTME Some linkers may need a different reload flag.
+ # find reload flag for linker
+ #   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
 +m4_defun([_LT_CMD_RELOAD],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+  lt_cv_ld_reload_flag,
-+  [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-     else
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ [AC_CACHE_CHECK([for $LD option to reload object files],
+   lt_cv_ld_reload_flag,
+   [lt_cv_ld_reload_flag='-r'])
+@@ -2263,6 +3109,11 @@
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
++  cygwin* | mingw* | pw32* | cegcc*)
++    if test "$GCC" != yes; then
++      reload_cmds=false
++    fi
++    ;;
+   darwin*)
+     if test "$GCC" = yes; then
+       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+@@ -2271,15 +3122,19 @@
      fi
--    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--  else
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--  fi
      ;;
-+esac
-+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-+_LT_DECL([], [reload_cmds], [2])dnl
+ esac
+-])# AC_PROG_LD_RELOAD_FLAG
++_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
++_LT_TAGDECL([], [reload_cmds], [2])dnl
 +])# _LT_CMD_RELOAD
  
--  dgux*)
--    case $cc_basename in
--      ec++)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      ghcx)
--	# Green Hills C++ Compiler
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  freebsd[12]*)
--    # C++ shared libraries reported to be fairly broken before switch to ELF
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  freebsd-elf*)
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    ;;
--  freebsd* | kfreebsd*-gnu)
--    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
--    # conventions
--    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
--    ;;
--  gnu*)
--    ;;
--  hpux9*)
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
--				# but as the default
--				# location of the library.
--
--    case $cc_basename in
--    CC)
--      # FIXME: insert proper C++ library support
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      ;;
--    aCC)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      # Commands to make compiler produce verbose output that lists
--      # what "hidden" libraries, object files and flags are used when
--      # linking a shared library.
--      #
--      # There doesn't appear to be a way to prevent this compiler from
--      # explicitly linking system object files so we need to strip them
--      # from the output so that they don't get included in the library
--      # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--      ;;
--    *)
--      if test "$GXX" = yes; then
--        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      else
--        # FIXME: insert proper C++ library support
--        _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--    esac
--    ;;
--  hpux10*|hpux11*)
--    if test $with_gnu_ld = no; then
--      case "$host_cpu" in
--      hppa*64*)
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--        ;;
--      ia64*)
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--        ;;
--      *)
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--        ;;
--      esac
--    fi
--    case "$host_cpu" in
--    hppa*64*)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=no
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--    ia64*)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=no
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
--					      # but as the default
--					      # location of the library.
--      ;;
--    *)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
--					      # but as the default
--					      # location of the library.
--      ;;
--    esac
  
--    case $cc_basename in
--      CC)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      aCC)
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
--	  ;;
--	*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	  ;;
--	esac
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--      *)
--	if test "$GXX" = yes; then
--	  if test $with_gnu_ld = no; then
--	    case "$host_cpu" in
--	    ia64*|hppa*64*)
--	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
--	      ;;
--	    *)
--	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      ;;
--	    esac
--	  fi
--	else
--	  # FIXME: insert proper C++ library support
--	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--    esac
--    ;;
--  irix5* | irix6*)
--    case $cc_basename in
--      CC)
--	# SGI C++
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
--
--	# Archives containing C++ object files must be created using
--	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
--	# necessary to make sure instantiated templates are included
--	# in the archive.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
--	;;
--      *)
--	if test "$GXX" = yes; then
--	  if test "$with_gnu_ld" = no; then
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
--	  else
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
--	  fi
--	fi
--	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--	;;
--    esac
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--    ;;
--  linux*)
--    case $cc_basename in
--      KCC)
--	# Kuck and Associates, Inc. (KAI) C++ Compiler
--
--	# KCC will only create a shared library if the output file
--	# ends with ".so" (or ".sl" for HP-UX), so rename the library
--	# to its proper name (with version) after linking.
--	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--
--	# Archives containing C++ object files must be created using
--	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
--	;;
--      icpc)
--	# Intel C++
--	with_gnu_ld=yes
--	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	;;
--      cxx)
--	# Compaq C++
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
--
--	runpath_var=LD_RUN_PATH
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-# AC_DEPLIBS_CHECK_METHOD
+-# -----------------------
 +# _LT_CHECK_MAGIC_METHOD
 +# ----------------------
-+# how to check for library dependencies
-+#  -- PORTME fill in with the dynamic library characteristics
+ # how to check for library dependencies
+ #  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
 +m4_defun([_LT_CHECK_MAGIC_METHOD],
 +[m4_require([_LT_DECL_EGREP])
 +m4_require([_LT_DECL_OBJDUMP])
 +AC_CACHE_CHECK([how to recognize dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -2296,7 +3151,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
  
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--    esac
--    ;;
--  lynxos*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  m88k*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  mvs*)
--    case $cc_basename in
--      cxx)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  netbsd*)
--    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=
--      _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
--    fi
--    # 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::"'
--    ;;
--  osf3*)
--    case $cc_basename in
--      KCC)
--	# Kuck and Associates, Inc. (KAI) C++ Compiler
--
--	# KCC will only create a shared library if the output file
--	# ends with ".so" (or ".sl" for HP-UX), so rename the library
--	# to its proper name (with version) after linking.
--	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Archives containing C++ object files must be created using
--	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
--
--	;;
--      RCC)
--	# Rational C++ 2.4.1
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      cxx)
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--      *)
--	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
--
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	  # Commands to make compiler produce verbose output that lists
--	  # what "hidden" libraries, object files and flags are used when
--	  # linking a shared library.
--	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+case $host_os in
+ case $host_os in
+-aix4* | aix5*)
 +aix[[4-9]]*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--	else
--	  # FIXME: insert proper C++ library support
--	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--    esac
--    ;;
--  osf4* | osf5*)
--    case $cc_basename in
--      KCC)
--	# Kuck and Associates, Inc. (KAI) C++ Compiler
--
--	# KCC will only create a shared library if the output file
--	# ends with ".so" (or ".sl" for HP-UX), so rename the library
--	# to its proper name (with version) after linking.
--	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Archives containing C++ object files must be created using
--	# the KAI C++ compiler.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
--	;;
--      RCC)
--	# Rational C++ 2.4.1
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      cxx)
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
--	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
--	  $rm $lib.exp'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--      *)
--	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
--
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	  # Commands to make compiler produce verbose output that lists
--	  # what "hidden" libraries, object files and flags are used when
--	  # linking a shared library.
--	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--	else
--	  # FIXME: insert proper C++ library support
--	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--    esac
--    ;;
--  psos*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  sco*)
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    case $cc_basename in
--      CC)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  sunos4*)
--    case $cc_basename in
--      CC)
--	# Sun C++ 4.x
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      lcc)
--	# Lucid
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  solaris*)
--    case $cc_basename in
--      CC)
--	# Sun C++ 4.2, 5.x and Centerline C++
--	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--	case $host_os in
--	  solaris2.[0-5] | solaris2.[0-5].*) ;;
--	  *)
--	    # The C++ compiler is used as linker so we must use $wl
--	    # flag to pass the commands to the underlying system
--	    # linker.
--	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
--	    ;;
--	esac
--	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+bsdi[[45]]*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--
--	# Archives containing C++ object files must be created using
--	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
--	# necessary to make sure instantiated templates are included
--	# in the archive.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
--	;;
--      gcx)
--	# Green Hills C++ Compiler
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+cygwin*)
-+  # func_win32_libid is a shell function defined in ltmain.sh
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_file_magic_cmd='func_win32_libid'
-+  ;;
+@@ -2318,8 +3173,22 @@
  
--	# The C++ compiler must be used to create the archive.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
--	;;
--      *)
--	# GNU C++ compiler with Solaris linker
--	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
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+mingw* | pw32*)
-+  # Base MSYS/MinGW do not provide the 'file' command needed by
+ mingw* | pw32*)
+   # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
 +  # func_win32_libid shell function, so use a weaker test based on 'objdump',
 +  # unless we find 'file', for example because we are cross-compiling.
-+  if ( file / ) >/dev/null 2>&1; then
++  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
 +    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 +    lt_cv_file_magic_cmd='func_win32_libid'
 +  else
-+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    # Keep this pattern in sync with the one in func_win32_libid.
++    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
 +    lt_cv_file_magic_cmd='$OBJDUMP -f'
 +  fi
 +  ;;
- 
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
--	  else
--	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
--	    # platform.
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+cegcc)
++
++cegcc*)
 +  # use the weaker test based on 'objdump'. See mingw*.
 +  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
+   lt_cv_file_magic_cmd='$OBJDUMP -f'
+   ;;
  
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
--	  fi
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
+@@ -2327,8 +3196,8 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
--	fi
--	;;
--    esac
--    ;;
--  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    ;;
--  tandem*)
--    case $cc_basename in
--      NCC)
--	# NonStop-UX NCC 3.20
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
+-freebsd* | kfreebsd*-gnu | dragonfly*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
 +freebsd* | dragonfly*)
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-     esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+@@ -2347,6 +3216,10 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++haiku*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
-+hpux10.20* | hpux11*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  case $host_cpu in
-+  ia64*)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   case $host_cpu in
+@@ -2355,17 +3228,17 @@
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
      ;;
--  vxworks*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+  hppa*64*)
-+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+   hppa*64*)
+-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
      ;;
    *)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+     lt_cv_file_magic_test_file=/usr/lib/libc.sl
      ;;
--esac
--AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+  esac
-+  ;;
+   esac
+   ;;
  
--_LT_AC_TAGVAR(GCC, $1)="$GXX"
--_LT_AC_TAGVAR(LD, $1)="$LD"
+-interix3*)
 +interix[[3-9]]*)
-+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-+  ;;
- 
--AC_LIBTOOL_POSTDEP_PREDEP($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF($1)
-+irix5* | irix6* | nonstopux*)
-+  case $LD in
-+  *-32|*"-32 ") libmagic=32-bit;;
-+  *-n32|*"-n32 ") libmagic=N32;;
-+  *-64|*"-64 ") libmagic=64-bit;;
-+  *) libmagic=never-match;;
-+  esac
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
+   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+   ;;
+@@ -2381,12 +3254,12 @@
+   ;;
  
--AC_LIBTOOL_CONFIG($1)
-+# This must be Linux ELF.
+ # This must be Linux ELF.
+-linux*)
 +linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  
--AC_LANG_POP
--CC=$lt_save_CC
--LDCXX=$LD
--LD=$lt_save_LD
--GCC=$lt_save_GCC
--with_gnu_ldcxx=$with_gnu_ld
--with_gnu_ld=$lt_save_with_gnu_ld
--lt_cv_path_LDCXX=$lt_cv_path_LD
--lt_cv_path_LD=$lt_save_path_LD
--lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
--lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
--])# AC_LIBTOOL_LANG_CXX_CONFIG
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
 +netbsd* | netbsdelf*-gnu)
 +  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
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-+  fi
-+  ;;
- 
--# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
--# ------------------------
--# Figure out "hidden" library dependencies from verbose
--# compiler output when linking a shared library.
--# Parse the compiler output and extract the necessary
--# objects, libraries and library flags.
--AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
--dnl we can't use the lt_simple_compile_test_code here,
--dnl because it contains code intended for an executable,
--dnl not a library.  It's possible we should let each
--dnl tag define a new lt_????_link_test_code variable,
--dnl but it's only used here...
--ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
--int a;
--void foo (void) { a = 0; }
--EOF
--],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
--class Foo
--{
--public:
--  Foo (void) { a = 0; }
--private:
--  int a;
--};
--EOF
--],[$1],[F77],[cat > conftest.$ac_ext <<EOF
--      subroutine foo
--      implicit none
--      integer*4 a
--      a=0
--      return
--      end
--EOF
--],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
--public class foo {
--  private int a;
--  public void bar (void) {
--    a = 0;
--  }
--};
--EOF
--])
--dnl Parse the compiler output and extract the necessary
--dnl objects, libraries and library flags.
--if AC_TRY_EVAL(ac_compile); then
--  # Parse the compiler output and extract the necessary
--  # objects, libraries and library flags.
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+@@ -2399,12 +3272,12 @@
+   lt_cv_file_magic_test_file=/usr/lib/libnls.so
+   ;;
  
--  # Sentinel used to keep track of whether or not we are before
--  # the conftest object file.
--  pre_test_object_deps_done=no
+-nto-qnx*)
+-  lt_cv_deplibs_check_method=unknown
 +*nto* | *qnx*)
 +  lt_cv_deplibs_check_method=pass_all
-+  ;;
+   ;;
  
--  # The `*' in the case matches for architectures that use `case' in
--  # $output_verbose_cmd can trigger glob expansion during the loop
--  # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+openbsd*)
+ openbsd*)
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+  fi
-+  ;;
- 
--  for p in `eval $output_verbose_link_cmd`; do
--    case $p in
-+osf3* | osf4* | osf5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+   else
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+@@ -2415,10 +3288,18 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  
--    -L* | -R* | -l*)
--       # Some compilers place space between "-{L,R}" and the path.
--       # Remove the space.
--       if test $p = "-L" \
--	  || test $p = "-R"; then
--	 prev=$p
--	 continue
--       else
--	 prev=
--       fi
 +rdos*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
++
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  
--       if test "$pre_test_object_deps_done" = no; then
--	 case $p in
--	 -L* | -R*)
--	   # Internal compiler library paths should come after those
--	   # provided the user.  The postdeps already come after the
--	   # user supplied libs so there is no need to process them.
--	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
--	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
--	   else
--	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
--	   fi
--	   ;;
--	 # The "-l" case would never come before the object being
--	 # linked, so don't bother handling this case.
--	 esac
--       else
--	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
--	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
--	 else
--	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
--	 fi
--       fi
--       ;;
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--    *.$objext)
--       # This assumes that the test object file only shows up
--       # once in the compiler output.
--       if test "$p" = "conftest.$objext"; then
--	 pre_test_object_deps_done=yes
--	 continue
--       fi
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
++
+ sysv4 | sysv4.3*)
+   case $host_vendor in
+   motorola)
+@@ -2446,28 +3327,53 @@
+   esac
+   ;;
  
--       if test "$pre_test_object_deps_done" = no; then
--	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
--	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
--	 else
--	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
--	 fi
--       else
--	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
--	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
--	 else
--	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
--	 fi
--       fi
--       ;;
-+sysv4 | sysv4.3*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  pc)
-+    lt_cv_deplibs_check_method=pass_all
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++tpf*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+ ])
++
++file_magic_glob=
++want_nocaseglob=no
++if test "$build" = "$host"; then
++  case $host_os in
++  mingw* | pw32*)
++    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
++      want_nocaseglob=yes
++    else
++      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
++    fi
 +    ;;
 +  esac
-+  ;;
- 
--    *) ;; # Ignore the rest.
-+tpf*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+esac
-+])
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
- 
--    esac
--  done
++fi
++
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+-])# AC_DEPLIBS_CHECK_METHOD
++
 +_LT_DECL([], [deplibs_check_method], [1],
 +    [Method to check whether dependent libraries are shared objects])
 +_LT_DECL([], [file_magic_cmd], [1],
-+    [Command to use when deplibs_check_method == "file_magic"])
++    [Command to use when deplibs_check_method = "file_magic"])
++_LT_DECL([], [file_magic_glob], [1],
++    [How to find potential files when deplibs_check_method = "file_magic"])
++_LT_DECL([], [want_nocaseglob], [1],
++    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 +])# _LT_CHECK_MAGIC_METHOD
  
--  # Clean up.
--  rm -f a.out a.exe
-+
+ 
+-# AC_PROG_NM
 +# LT_PATH_NM
-+# ----------
+ # ----------
+-# find the pathname to a BSD-compatible name lister
+-AC_DEFUN([AC_PROG_NM],
+-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
 +# find the pathname to a BSD- or MS-compatible name lister
 +AC_DEFUN([LT_PATH_NM],
 +[AC_REQUIRE([AC_PROG_CC])dnl
 +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-+[if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
+ [if test -n "$NM"; then
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
  else
--  echo "libtool.m4: error: problem compiling $1 test program"
-+  lt_nm_to_check="${ac_tool_prefix}nm"
+   lt_nm_to_check="${ac_tool_prefix}nm"
+-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
 +  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+    lt_nm_to_check="$lt_nm_to_check nm"
-+  fi
-+  for lt_tmp_nm in $lt_nm_to_check; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+      IFS="$lt_save_ifs"
-+      test -z "$ac_dir" && ac_dir=.
-+      tmp_nm="$ac_dir/$lt_tmp_nm"
-+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+	#   nm: unknown option "B" ignored
-+	# Tru64's nm complains that /dev/null is an invalid object file
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
-+	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
-+	  ;;
-+	*)
-+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+	  */dev/null*)
-+	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
-+	    ;;
-+	  *)
-+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	    continue # so that we can try to find one that supports BSD flags
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
-+  done
+     lt_nm_to_check="$lt_nm_to_check nm"
+   fi
+   for lt_tmp_nm in $lt_nm_to_check; do
+@@ -2503,20 +3409,128 @@
+     done
+     IFS="$lt_save_ifs"
+   done
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 +  : ${lt_cv_path_NM=no}
-+fi])
+ fi])
+-NM="$lt_cv_path_NM"
+-])# AC_PROG_NM
 +if test "$lt_cv_path_NM" != "no"; then
 +  NM="$lt_cv_path_NM"
 +else
 +  # Didn't find any BSD compatible name lister, look for dumpbin.
-+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
++  if test -n "$DUMPBIN"; then :
++    # Let the user override the test.
++  else
++    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
++    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
++    *COFF*)
++      DUMPBIN="$DUMPBIN -symbols"
++      ;;
++    *)
++      DUMPBIN=:
++      ;;
++    esac
++  fi
 +  AC_SUBST([DUMPBIN])
 +  if test "$DUMPBIN" != ":"; then
 +    NM="$DUMPBIN"
 +  fi
- fi
++fi
 +test -z "$NM" && NM=nm
 +AC_SUBST([NM])
 +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
  
--$rm -f confest.$objext
 +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
 +  [lt_cv_nm_interface="BSD nm"
 +  echo "int some_variable = 0;" > conftest.$ac_ext
-+  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
++  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
 +  (eval "$ac_compile" 2>conftest.err)
 +  cat conftest.err >&AS_MESSAGE_LOG_FD
-+  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
++  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
 +  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
 +  cat conftest.err >&AS_MESSAGE_LOG_FD
-+  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
++  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
 +  cat conftest.out >&AS_MESSAGE_LOG_FD
 +  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
 +    lt_cv_nm_interface="MS dumpbin"
@@ -7303,115 +4690,231 @@
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AM_PROG_NM], [])
 +dnl AC_DEFUN([AC_PROG_NM], [])
++
++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
++# --------------------------------
++# how to determine the name of the shared library
++# associated with a specific link library.
++#  -- PORTME fill in with the dynamic library characteristics
++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
++[m4_require([_LT_DECL_EGREP])
++m4_require([_LT_DECL_OBJDUMP])
++m4_require([_LT_DECL_DLLTOOL])
++AC_CACHE_CHECK([how to associate runtime and link libraries],
++lt_cv_sharedlib_from_linklib_cmd,
++[lt_cv_sharedlib_from_linklib_cmd='unknown'
  
--case " $_LT_AC_TAGVAR(postdeps, $1) " in
--*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+-# AC_CHECK_LIBM
+-# -------------
++case $host_os in
++cygwin* | mingw* | pw32* | cegcc*)
++  # two different shell functions defined in ltmain.sh
++  # decide which to use based on capabilities of $DLLTOOL
++  case `$DLLTOOL --help 2>&1` in
++  *--identify-strict*)
++    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
++    ;;
++  *)
++    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
++    ;;
++  esac
++  ;;
++*)
++  # fallback: assume linklib IS sharedlib
++  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
++  ;;
++esac
++])
++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
++
++_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
++    [Command to associate shared and link libraries])
++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
++
++
++# _LT_PATH_MANIFEST_TOOL
++# ----------------------
++# locate the manifest tool
++m4_defun([_LT_PATH_MANIFEST_TOOL],
++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
++  [lt_cv_path_mainfest_tool=no
++  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
++  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
++  cat conftest.err >&AS_MESSAGE_LOG_FD
++  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
++    lt_cv_path_mainfest_tool=yes
++  fi
++  rm -f conftest*])
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
++  MANIFEST_TOOL=:
++fi
++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
++])# _LT_PATH_MANIFEST_TOOL
++
 +
 +# LT_LIB_M
 +# --------
-+# check for math library
+ # check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
 +AC_DEFUN([LT_LIB_M],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+  # These system don't have libm, or don't need it
-+  ;;
-+*-ncr-sysv4.3*)
-+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+  ;;
-+*)
-+  AC_CHECK_LIB(m, cos, LIBM="-lm")
-+  ;;
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -2527,3890 +3541,4932 @@
+   AC_CHECK_LIB(m, cos, LIBM="-lm")
+   ;;
  esac
--])# AC_LIBTOOL_POSTDEP_PREDEP
+-])# AC_CHECK_LIBM
+-
+-
+-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl convenience library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that
+-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+-# (note the single quotes!).  If your package is not flat and you're not
+-# using automake, define top_builddir and top_srcdir appropriately in
+-# the Makefiles.
+-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case $enable_ltdl_convenience in
+-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+-  esac
+-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_CONVENIENCE
+-
 +AC_SUBST([LIBM])
 +])# LT_LIB_M
  
--# AC_LIBTOOL_LANG_F77_CONFIG
--# ------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
--AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
--[AC_REQUIRE([AC_PROG_F77])
--AC_LANG_PUSH(Fortran 77)
+-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl installable library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that
+-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+-# and an installed libltdl is not found, it is assumed to be `libltdl'.
+-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and top_srcdir
+-# appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  AC_CHECK_LIB(ltdl, lt_dlinit,
+-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+-  [if test x"$enable_ltdl_install" = xno; then
+-     AC_MSG_WARN([libltdl not installed, but installation disabled])
+-   else
+-     enable_ltdl_install=yes
+-   fi
+-  ])
+-  if test x"$enable_ltdl_install" = x"yes"; then
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  else
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+-    LIBLTDL="-lltdl"
+-    LTDLINCL=
+-  fi
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_INSTALLABLE
 +# Old name:
 +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_CHECK_LIBM], [])
  
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_AC_TAGVAR(allow_undefined_flag, $1)=
--_LT_AC_TAGVAR(always_export_symbols, $1)=no
--_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_direct, $1)=no
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--_LT_AC_TAGVAR(hardcode_automatic, $1)=no
--_LT_AC_TAGVAR(module_cmds, $1)=
--_LT_AC_TAGVAR(module_expsym_cmds, $1)=
--_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_AC_TAGVAR(no_undefined_flag, $1)=
--_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
  
--# Source file extension for f77 test sources.
--ac_ext=f
+-# AC_LIBTOOL_CXX
+-# --------------
+-# enable support for C++ libraries
+-AC_DEFUN([AC_LIBTOOL_CXX],
+-[AC_REQUIRE([_LT_AC_LANG_CXX])
+-])# AC_LIBTOOL_CXX
 +# _LT_COMPILER_NO_RTTI([TAGNAME])
 +# -------------------------------
 +m4_defun([_LT_COMPILER_NO_RTTI],
 +[m4_require([_LT_TAG_COMPILER])dnl
  
--# Object file extension for compiled f77 test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
 +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
  
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+-# _LT_AC_LANG_CXX
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_CXX],
+-[AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+-])# _LT_AC_LANG_CXX
 +if test "$GCC" = yes; then
-+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++  case $cc_basename in
++  nvcc*)
++    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
++  *)
++    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
++  esac
  
--# Code to be used in simple link tests
--lt_simple_link_test_code="      program t\n      end\n"
+-# _LT_AC_PROG_CXXCPP
+-# ------------------
+-AC_DEFUN([_LT_AC_PROG_CXXCPP],
+-[
+-AC_REQUIRE([AC_PROG_CXX])
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-    (test "X$CXX" != "Xg++"))) ; then
+-  AC_PROG_CXXCPP
 +  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
 +    lt_cv_prog_compiler_rtti_exceptions,
 +    [-fno-rtti -fno-exceptions], [],
 +    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
+ fi
+-])# _LT_AC_PROG_CXXCPP
+-
+-# AC_LIBTOOL_F77
+-# --------------
+-# enable support for Fortran 77 libraries
+-AC_DEFUN([AC_LIBTOOL_F77],
+-[AC_REQUIRE([_LT_AC_LANG_F77])
+-])# AC_LIBTOOL_F77
 +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
 +	[Compiler flag to turn off builtin functions])
 +])# _LT_COMPILER_NO_RTTI
  
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
  
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${F77-"f77"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+-# _LT_AC_LANG_F77
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_F77],
+-[AC_REQUIRE([AC_PROG_F77])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+-])# _LT_AC_LANG_F77
 +# _LT_CMD_GLOBAL_SYMBOLS
 +# ----------------------
 +m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_AWK])dnl
 +AC_REQUIRE([LT_PATH_NM])dnl
 +AC_REQUIRE([LT_PATH_LD])dnl
 +m4_require([_LT_DECL_SED])dnl
 +m4_require([_LT_DECL_EGREP])dnl
 +m4_require([_LT_TAG_COMPILER])dnl
  
--AC_MSG_CHECKING([if libtool supports shared libraries])
--AC_MSG_RESULT([$can_build_shared])
 +# Check for command to grab the raw symbol name followed by C symbol from nm.
 +AC_MSG_CHECKING([command to parse $NM output from $compiler object])
 +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
@@ -7419,58 +4922,133 @@
 +# These are sane defaults that work on at least a few old systems.
 +# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
  
--AC_MSG_CHECKING([whether to build shared libraries])
--test "$can_build_shared" = "no" && enable_shared=no
+-# AC_LIBTOOL_GCJ
+-# --------------
+-# enable support for GCJ libraries
+-AC_DEFUN([AC_LIBTOOL_GCJ],
+-[AC_REQUIRE([_LT_AC_LANG_GCJ])
+-])# AC_LIBTOOL_GCJ
 +# Character class describing NM global symbol codes.
 +symcode='[[BCDEGRST]]'
  
--# On AIX, shared libraries and static libraries use the same namespace, and
--# are all built from PIC.
--case "$host_os" in
--aix3*)
--  test "$enable_shared" = yes && enable_static=no
--  if test -n "$RANLIB"; then
--    archive_cmds="$archive_cmds~\$RANLIB \$lib"
--    postinstall_cmds='$RANLIB $lib'
 +# Regexp to match symbols that can be accessed directly from C.
 +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32* | cegcc*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDEGRST]]'
-   fi
-   ;;
--aix4*)
--  test "$enable_shared" = yes && enable_static=no
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-+  ;;
-+solaris*)
-+  symcode='[[BDRT]]'
-+  ;;
-+sco3.2v5*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv4.2uw2*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ 
+-# _LT_AC_LANG_GCJ
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_GCJ],
+-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+-])# _LT_AC_LANG_GCJ
+-
+-
+-# AC_LIBTOOL_RC
+-# -------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+-])# AC_LIBTOOL_RC
+-
+-
+-# AC_LIBTOOL_LANG_C_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+-[lt_save_CC="$CC"
+-AC_LANG_PUSH(C)
+-
+-# Source file extension for C test sources.
+-ac_ext=c
+-
+-# Object file extension for compiled C test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
+-
+-_LT_AC_SYS_COMPILER
+-
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+-
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF
+-
+-# Report which library types will actually be built
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
+-
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
+-
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
++# Define system-specific variables.
+ case $host_os in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+-  fi
++aix*)
++  symcode='[[BCDT]]'
+   ;;
+-
+-aix4* | aix5*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
++cygwin* | mingw* | pw32* | cegcc*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDEGRST]]'
+   fi
+-    ;;
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris*)
++  symcode='[[BDRT]]'
++  ;;
++sco3.2v5*)
++  symcode='[[DT]]'
++  ;;
++sysv4.2uw2*)
++  symcode='[[DT]]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
 +  symcode='[[ABDT]]'
 +  ;;
 +sysv4)
 +  symcode='[[DFNSTU]]'
-   ;;
++  ;;
  esac
 -AC_MSG_RESULT([$enable_shared])
 -
@@ -7478,34 +5056,66 @@
 -# Make sure either enable_shared or enable_static is yes.
 -test "$enable_shared" = yes || enable_static=yes
 -AC_MSG_RESULT([$enable_static])
- 
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 -
--_LT_AC_TAGVAR(GCC, $1)="$G77"
--_LT_AC_TAGVAR(LD, $1)="$LD"
+-AC_LIBTOOL_CONFIG($1)
+-
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_C_CONFIG
+ 
 +# If we're using GNU nm, then use its standard symbol codes.
 +case `$NM -V 2>&1` in
 +*GNU* | *'with BFD'*)
 +  symcode='[[ABCDGIRSTW]]' ;;
 +esac
  
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
+-# AC_LIBTOOL_LANG_CXX_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+-[AC_LANG_PUSH(C++)
+-AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+-
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 +# Transform an extracted symbol line into a proper C declaration.
 +# Some systems (esp. on ia64) link data and code symbols differently,
 +# so use this general approach.
 +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  
+-# Dependencies to place before and after the object being linked:
+-_LT_AC_TAGVAR(predep_objects, $1)=
+-_LT_AC_TAGVAR(postdep_objects, $1)=
+-_LT_AC_TAGVAR(predeps, $1)=
+-_LT_AC_TAGVAR(postdeps, $1)=
+-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 +# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
  
--AC_LIBTOOL_CONFIG($1)
+-# Source file extension for C++ test sources.
+-ac_ext=cpp
 +# Handle CRLF in mingw tool chain
 +opt_cr=
 +case $build_os in
@@ -7514,23 +5124,19 @@
 +  ;;
 +esac
  
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_F77_CONFIG
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
 +# Try without a prefix underscore, then with it.
 +for ac_symprfx in "" "_"; do
  
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
 +  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
 +  symxfrm="\\1 $ac_symprfx\\2 \\2"
  
--# AC_LIBTOOL_LANG_GCJ_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
--AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
--[AC_LANG_SAVE
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
 +  # Write the raw and C identifiers.
 +  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
 +    # Fake it for dumpbin and say T for any non-static function
@@ -7551,15 +5157,16 @@
 +  else
 +    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 +  fi
++  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  
--# Source file extension for Java test sources.
--ac_ext=java
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
 +  # Check to see that the pipe works correctly.
 +  pipe_works=no
  
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
 +  rm -f conftest*
 +  cat > conftest.$ac_ext <<_LT_EOF
 +#ifdef __cplusplus
@@ -7574,12 +5181,32 @@
 +int main(){nm_test_var='a';nm_test_func();return(0);}
 +_LT_EOF
  
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
+-# Allow CC to be a program name with arguments.
+-lt_save_CC=$CC
+-lt_save_LD=$LD
+-lt_save_GCC=$GCC
+-GCC=$GXX
+-lt_save_with_gnu_ld=$with_gnu_ld
+-lt_save_path_LD=$lt_cv_path_LD
+-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+-else
+-  $as_unset lt_cv_prog_gnu_ld
+-fi
+-if test -n "${lt_cv_path_LDCXX+set}"; then
+-  lt_cv_path_LD=$lt_cv_path_LDCXX
+-else
+-  $as_unset lt_cv_path_LD
+-fi
+-test -z "${LDCXX+set}" || LD=$LDCXX
+-CC=${CXX-"c++"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
 +  if AC_TRY_EVAL(ac_compile); then
 +    # Now try to grab the symbols.
 +    nlist=conftest.nm
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
 +      # Try sorting and uniquifying the output.
 +      if sort "$nlist" | uniq > "$nlist"T; then
 +	mv -f "$nlist"T "$nlist"
@@ -7587,33 +5214,51 @@
 +	rm -f "$nlist"T
 +      fi
  
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+-# We don't want -fno-exception wen compiling C++ code, so set the
+-# no_builtin_flag separately
+-if test "$GXX" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+-else
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+-fi
 +      # Make sure that we snagged all the symbols we need.
 +      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 +	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 +	  cat <<_LT_EOF > conftest.$ac_ext
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
++   relocations are performed -- see ld's documentation on pseudo-relocs.  */
++# define LT@&t@_DLSYM_CONST
++#elif defined(__osf__)
++/* This system does not cope well with relocations in const data.  */
++# define LT@&t@_DLSYM_CONST
++#else
++# define LT@&t@_DLSYM_CONST const
++#endif
+ 
+-if test "$GXX" = yes; then
+-  # Set up default GNU C++ configuration
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
  
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
+-  AC_PROG_LD
 +_LT_EOF
 +	  # Now generate the symbol file.
 +	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
  
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
+-  # 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
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	  cat <<_LT_EOF >> conftest.$ac_ext
  
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 +/* The mapping between symbol names and symbols.  */
-+const struct {
++LT@&t@_DLSYM_CONST struct {
 +  const char *name;
 +  void       *address;
 +}
@@ -7626,15 +5271,10 @@
 +  {0, (void *) 0}
 +};
  
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF($1)
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+-    #     investigate it a little bit more. (MM)
+-    wlarc='${wl}'
 +/* This works around a problem in FreeBSD linker */
 +#ifdef FREEBSD_WORKAROUND
 +static const void *lt_preloaded_setup() {
@@ -7642,40 +5282,55 @@
 +}
 +#endif
  
--AC_LIBTOOL_CONFIG($1)
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+-	grep 'no-whole-archive' > /dev/null; then
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 +#ifdef __cplusplus
 +}
 +#endif
 +_LT_EOF
 +	  # Now try linking the two files.
 +	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_save_CFLAGS="$CFLAGS"
++	  lt_globsym_save_LIBS=$LIBS
++	  lt_globsym_save_CFLAGS=$CFLAGS
 +	  LIBS="conftstm.$ac_objext"
 +	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 +	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 +	    pipe_works=yes
 +	  fi
-+	  LIBS="$lt_save_LIBS"
-+	  CFLAGS="$lt_save_CFLAGS"
++	  LIBS=$lt_globsym_save_LIBS
++	  CFLAGS=$lt_globsym_save_CFLAGS
 +	else
 +	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 +	fi
 +      else
 +	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
 +      fi
-+    else
+     else
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
 +      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+    fi
-+  else
+     fi
+   else
+-    with_gnu_ld=no
+-    wlarc=
+-
+-    # A generic and very simple default shared library creation
+-    # command for GNU C++ for the case where it uses the native
+-    # 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.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
 +    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
 +    cat conftest.$ac_ext >&5
-+  fi
+   fi
 +  rm -rf conftest* conftst*
  
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_GCJ_CONFIG
+-  # Commands to make compiler produce verbose output that lists
+-  # what "hidden" libraries, object files and flags are used when
+-  # linking a shared library.
+-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+-
 +  # Do not use the global_symbol_pipe unless it works.
 +  if test "$pipe_works" = yes; then
 +    break
@@ -7689,10 +5344,37 @@
 +fi
 +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
 +  AC_MSG_RESULT(failed)
-+else
+ else
+-  GXX=no
+-  with_gnu_ld=no
+-  wlarc=
 +  AC_MSG_RESULT(ok)
-+fi
+ fi
  
+-# PORTME: fill in a description of your system's C++ link characteristics
+-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-case $host_os in
+-  aix3*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  aix4* | aix5*)
+-    if test "$host_cpu" = ia64; then
+-      # On IA64, the linker does run time linking by default, so we don't
+-      # have to do anything special.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
+-      aix_use_runtimelinking=no
++# Response file support.
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++  nm_file_list_spec='@'
++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
++  nm_file_list_spec='@'
++fi
++
 +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
 +    [Take the output of nm and produce a listing of raw symbols and C names])
 +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -7703,19 +5385,28 @@
 +_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
 +    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
 +    [Transform the output of nm in a C name address pair when lib prefix is needed])
++_LT_DECL([], [nm_file_list_spec], [1],
++    [Specify filename containing input files for $NM])
 +]) # _LT_CMD_GLOBAL_SYMBOLS
  
--# AC_LIBTOOL_LANG_RC_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the Windows resource compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
--AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
--[AC_LANG_SAVE
+-      # Test if we are trying to use run time linking or normal
+-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-      # need to do runtime linking.
+-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	for ld_flag in $LDFLAGS; do
+-	  case $ld_flag in
+-	  *-brtl*)
+-	    aix_use_runtimelinking=yes
+-	    break
+-	    ;;
+-	  esac
+-	done
+-	;;
+-      esac
  
--# Source file extension for RC test sources.
--ac_ext=rc
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
 +# _LT_COMPILER_PIC([TAGNAME])
 +# ---------------------------
 +m4_defun([_LT_COMPILER_PIC],
@@ -7724,46 +5415,79 @@
 +_LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +_LT_TAGVAR(lt_prog_compiler_static, $1)=
  
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+-
+-    _LT_AC_TAGVAR(archive_cmds, $1)=''
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 +m4_if([$1], [CXX], [
 +  # C++ specific cases for pic, static, wl, etc.
 +  if test "$GXX" = yes; then
 +    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
  
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
--
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${RC-"windres"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_RC_CONFIG
+-    if test "$GXX" = yes; then
+-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+-      # We only want to do this on AIX 4.2 and lower, the check
+-      # below for broken collect2 doesn't work under 4.3+
+-	collect2name=`${CC} -print-prog-name=collect2`
+-	if test -f "$collect2name" && \
+-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	then
+-	  # We have reworked collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	else
+-	  # We have old collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	fi
+-	;;
+-      esac
+-      shared_flag='-shared'
+-      if test "$aix_use_runtimelinking" = yes; then
+-	shared_flag="$shared_flag "'${wl}-G'
+-      fi
+-    else
+-      # not using gcc
 +    case $host_os in
 +    aix*)
 +      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
+       if test "$host_cpu" = ia64; then
+-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-	# chokes on -Wl,-G. The following line is correct:
+-	shared_flag='-G'
+-      else
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='${wl}-G'
+-	else
+-	  shared_flag='${wl}-bM:SRE'
+-	fi
 +	# AIX 5 now supports IA64 processor
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
+       fi
+-    fi
 +      ;;
  
+-    # It seems that -bexpall does not export symbols beginning with
+-    # underscore (_), so it is better to generate a list of symbols to export.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-    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.
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-      # Determine the default libpath from the value encoded in an empty executable.
+-      _LT_AC_SYS_LIBPATH_AIX
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 +    amigaos*)
 +      case $host_cpu in
 +      powerpc)
@@ -7779,86 +5503,198 @@
 +      esac
 +      ;;
  
--# AC_LIBTOOL_CONFIG([TAGNAME])
--# ----------------------------
--# If TAGNAME is not passed, then create an initial libtool script
--# with a default configuration from the untagged config vars.  Otherwise
--# add code to config.status for appending the configuration named by
--# TAGNAME from the matching tagged config vars.
--AC_DEFUN([AC_LIBTOOL_CONFIG],
--[# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # See if we are running on zsh, and set the options which allow our commands through
--  # without removal of \ escapes.
--  if test -n "${ZSH_VERSION+set}" ; then
--    setopt NO_GLOB_SUBST
--  fi
--  # 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.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
--    SED SHELL STRIP \
--    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 \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    _LT_AC_TAGVAR(compiler, $1) \
--    _LT_AC_TAGVAR(CC, $1) \
--    _LT_AC_TAGVAR(LD, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
--    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
--    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
--    _LT_AC_TAGVAR(old_archive_cmds, $1) \
--    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
--    _LT_AC_TAGVAR(predep_objects, $1) \
--    _LT_AC_TAGVAR(postdep_objects, $1) \
--    _LT_AC_TAGVAR(predeps, $1) \
--    _LT_AC_TAGVAR(postdeps, $1) \
--    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
--    _LT_AC_TAGVAR(archive_cmds, $1) \
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
--    _LT_AC_TAGVAR(postinstall_cmds, $1) \
--    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
--    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
--    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
--    _LT_AC_TAGVAR(no_undefined_flag, $1) \
--    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
--    _LT_AC_TAGVAR(hardcode_automatic, $1) \
--    _LT_AC_TAGVAR(module_cmds, $1) \
--    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
--    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
--    _LT_AC_TAGVAR(exclude_expsyms, $1) \
--    _LT_AC_TAGVAR(include_expsyms, $1); do
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-     else
+-      if test "$host_cpu" = ia64; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	# Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	# Warning - without using the other run time loading flags,
+-	# -berok will link without error, but may produce a broken library.
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	# This is similar to how AIX traditionally builds its shared libraries.
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-      fi
+-    fi
+-    ;;
 -
--    case $var in
--    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
--    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
--    _LT_AC_TAGVAR(archive_cmds, $1) | \
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
--    _LT_AC_TAGVAR(module_cmds, $1) | \
--    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
--    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
--    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-  beos*)
+-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-      # support --undefined.  This deserves some investigation.  FIXME
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-    ;;
+-
+-  chorus*)
+-    case $cc_basename in
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-
+-  cygwin* | mingw* | pw32*)
+-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-    # as there is no search path for DLLs.
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-
+-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-      # 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
+-	cp $export_symbols $output_objdir/$soname.def;
+-      else
+-	echo EXPORTS > $output_objdir/$soname.def;
+-	cat $export_symbols >> $output_objdir/$soname.def;
+-      fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-  ;;
+-      darwin* | rhapsody*)
+-        case $host_os in
+-        rhapsody* | darwin1.[[012]])
+-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[[012]])
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-        esac
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-
+-    if test "$GXX" = yes ; then
+-      lt_int_apple_cc_single_mod=no
+-      output_verbose_link_cmd='echo'
+-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+-       lt_int_apple_cc_single_mod=yes
+-      fi
+-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      else
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-        fi
+-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          else
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          fi
+-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      else
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-          ;;
+-      esac
+-      fi
+-        ;;
+-
+-  dgux*)
+-    case $cc_basename in
+-      ec++*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      ghcx*)
+-	# Green Hills C++ Compiler
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  freebsd[[12]]*)
+-    # C++ shared libraries reported to be fairly broken before switch to ELF
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  freebsd-elf*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    ;;
+-  freebsd* | kfreebsd*-gnu | dragonfly*)
+-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+-    # conventions
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-    ;;
+-  gnu*)
+-    ;;
+-  hpux9*)
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-				# but as the default
+-				# location of the library.
+-
+-    case $cc_basename in
+-    CC*)
+-      # FIXME: insert proper C++ library support
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+-    aCC*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      # Commands to make compiler produce verbose output that lists
+-      # what "hidden" libraries, object files and flags are used when
+-      # linking a shared library.
+-      #
+-      # There doesn't appear to be a way to prevent this compiler from
+-      # explicitly linking system object files so we need to strip them
+-      # from the output so that they don't get included in the library
+-      # dependencies.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-      ;;
+-    *)
+-      if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-        # FIXME: insert proper C++ library support
+-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
 +    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 +      # PIC is the default for these OSes.
 +      ;;
@@ -7879,6 +5715,11 @@
 +      # DJGPP does not support shared libraries at all
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +      ;;
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      _LT_TAGVAR(lt_prog_compiler_static, $1)=
++      ;;
 +    interix[[3-9]]*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
@@ -7886,19 +5727,36 @@
 +    sysv4*MP*)
 +      if test -d /usr/nec; then
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
+       fi
+       ;;
+-    esac
+-    ;;
+-  hpux10*|hpux11*)
+-    if test $with_gnu_ld = no; then
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
 +    hpux*)
 +      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
 +      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
 +      # sets the default TLS model and affects inlining.
-+      case $host_cpu in
+       case $host_cpu in
+-      hppa*64*|ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-        ;;
 +      hppa*64*)
 +	;;
-+      *)
+       *)
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-        ;;
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	;;
-+      esac
+       esac
+-    fi
+-    case $host_cpu in
+-    hppa*64*|ia64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +    *qnx* | *nto*)
 +      # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -7906,24 +5764,18 @@
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
        ;;
      *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
      esac
--  done
--
--  case $lt_echo in
--  *'\[$]0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
--    ;;
--  esac
 -
--ifelse([$1], [],
--  [cfgfile="${ofile}T"
--  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
--  $rm -f "$cfgfile"
--  AC_MSG_NOTICE([creating $ofile])],
--  [cfgfile="$ofile"])
+-    case $cc_basename in
+-      CC*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +  else
 +    case $host_os in
 +      aix[[4-9]]*)
@@ -7934,14 +5786,42 @@
 +	else
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
 +	fi
-+	;;
+ 	;;
+-      aCC*)
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +      chorus*)
 +	case $cc_basename in
 +	cxch68*)
 +	  # Green Hills C++ Compiler
 +	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-+	  ;;
-+	esac
+ 	  ;;
+ 	esac
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test $with_gnu_ld = no; then
++      mingw* | cygwin* | os2* | pw32* | cegcc*)
++	# This hack is so that the source file can tell whether it is being
++	# built for inclusion in a dll (and should export symbols for example).
++	m4_if([$1], [GCJ], [],
++	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
 +	;;
 +      dgux*)
 +	case $cc_basename in
@@ -7971,23 +5851,70 @@
 +	  aCC*)
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    case $host_cpu in
+ 	    case $host_cpu in
+-	    hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    ia64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	    hppa*64*|ia64*)
 +	      # +Z the default
-+	      ;;
-+	    *)
+ 	      ;;
+ 	    *)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	      ;;
-+	    esac
+ 	      ;;
+ 	    esac
+-	  fi
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
 +	    ;;
 +	  *)
 +	    ;;
 +	esac
-+	;;
+ 	;;
+-    esac
+-    ;;
+-  interix3*)
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-    # Instead, shared libraries are loaded at an image base (0x10000000 by
+-    # default) and relocated if they conflict, which is a slow very memory
+-    # consuming and fragmenting process.  To avoid this, we pick a random,
+-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-    ;;
+-  irix5* | irix6*)
+-    case $cc_basename in
+-      CC*)
+-	# SGI C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
 +      interix*)
 +	# This is c89, which is MS Visual C++ (no shared libs)
 +	# Anyone wants to do a port?
-+	;;
+ 	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test "$with_gnu_ld" = no; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	  else
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+-	  fi
+-	fi
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 +      irix5* | irix6* | nonstopux*)
 +	case $cc_basename in
 +	  CC*)
@@ -7998,7 +5925,57 @@
 +	  *)
 +	    ;;
 +	esac
-+	;;
+ 	;;
+-    esac
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-    ;;
+-  linux*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-	;;
+-      icpc*)
+-	# Intel C++
+-	with_gnu_ld=yes
+-	# version 8.0 and above of icpc choke on multiply defined symbols
+-	# if we add $predep_objects and $postdep_objects, however 7.1 and
+-	# earlier do not add the objects themselves.
+-	case `$CC -V 2>&1` in
+-	*"Version 7."*)
+-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	  ;;
+-	*)  # Version 8.0 or newer
+-	  tmp_idyn=
+-	  case $host_cpu in
+-	    ia64*) tmp_idyn=' -i_dynamic';;
+-	  esac
+-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	  ;;
 +      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +	case $cc_basename in
 +	  KCC*)
@@ -8032,8 +6009,8 @@
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +	    ;;
-+	  xlc* | xlC*)
-+	    # IBM XL 8.0 on PPC
++	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
++	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -8048,12 +6025,130 @@
 +	      ;;
 +	    esac
 +	    ;;
-+	esac
-+	;;
+ 	esac
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+-	;;
+-      pgCC*)
+-        # Portland Group C++ compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-        ;;
+-      cxx*)
+-	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+-
+-	runpath_var=LD_RUN_PATH
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+-    esac
+-    ;;
+-  lynxos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  m88k*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  mvs*)
+-    case $cc_basename in
+-      cxx*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +      lynxos*)
-+	;;
+ 	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +      m88k*)
-+	;;
+ 	;;
+-    esac
+-    ;;
+-  netbsd*)
+-    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=
+-      _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
+-    fi
+-    # Workaround some broken pre-1.5 toolchains
+-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+-    ;;
+-  openbsd2*)
+-    # C++ shared libraries are fairly broken
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  openbsd*)
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-    fi
+-    output_verbose_link_cmd='echo'
+-    ;;
+-  osf3*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-
+-	;;
+-      RCC*)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx*)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 +      mvs*)
 +	case $cc_basename in
 +	  cxx*)
@@ -8062,9 +6157,70 @@
 +	  *)
 +	    ;;
 +	esac
-+	;;
+ 	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+-
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
 +      netbsd* | netbsdelf*-gnu)
-+	;;
+ 	;;
+-    esac
+-    ;;
+-  osf4* | osf5*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Archives containing C++ object files must be created using
+-	# the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+-	;;
+-      RCC*)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx*)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+-	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+-	  $rm $lib.exp'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 +      *qnx* | *nto*)
 +        # QNX uses GNU C++, but need to define -shared option too, otherwise
 +        # it will coredump.
@@ -8090,12 +6246,46 @@
 +	  *)
 +	    ;;
 +	esac
-+	;;
+ 	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+-
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
 +      psos*)
-+	;;
+ 	;;
+-    esac
+-    ;;
+-  psos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  sunos4*)
+-    case $cc_basename in
+-      CC*)
+-	# Sun C++ 4.x
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      lcc*)
+-	# Lucid
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +      solaris*)
 +	case $cc_basename in
-+	  CC*)
++	  CC* | sunCC*)
 +	    # Sun C++ 4.2, 5.x and Centerline C++
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -8108,7 +6298,10 @@
 +	  *)
 +	    ;;
 +	esac
-+	;;
+ 	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +      sunos4*)
 +	case $cc_basename in
 +	  CC*)
@@ -8123,7 +6316,23 @@
 +	  *)
 +	    ;;
 +	esac
-+	;;
+ 	;;
+-    esac
+-    ;;
+-  solaris*)
+-    case $cc_basename in
+-      CC*)
+-	# Sun C++ 4.2, 5.x and Centerline C++
+-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	case $host_os in
+-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 +      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +	case $cc_basename in
 +	  CC*)
@@ -8139,26 +6348,65 @@
 +	    # NonStop-UX NCC 3.20
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    ;;
-+	  *)
-+	    ;;
-+	esac
+ 	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker. We must also pass each convience library through
+-	    # to the system linker between allextract/defaultextract.
+-	    # The C++ compiler will combine linker options so we
+-	    # cannot just pass the convience library names through
+-	    # without $wl.
+-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-
+-	output_verbose_link_cmd='echo'
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+-	;;
+-      gcx*)
+-	# Green Hills C++ Compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-
+-	# The C++ compiler must be used to create the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 +	;;
 +      vxworks*)
-+	;;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+	;;
-+    esac
-+  fi
-+],
-+[
+ 	;;
+       *)
+-	# GNU C++ compiler with Solaris linker
+-	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
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++	;;
++    esac
++  fi
++],
++[
 +  if test "$GCC" = yes; then
 +    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
  
--  cat <<__EOF__ >> "$cfgfile"
--ifelse([$1], [],
--[#! $SHELL
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  else
+-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+-	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 +    case $host_os in
 +      aix*)
 +      # All AIX code is PIC.
@@ -8168,34 +6416,11 @@
 +      fi
 +      ;;
  
--# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
--# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
--# NOTE: Changes made to this file will be lost: look at ltmain.sh.
--#
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
--# Free Software Foundation, Inc.
--#
--# This file is part of GNU Libtool:
--# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  fi
 +    amigaos*)
 +      case $host_cpu in
 +      powerpc)
@@ -8211,14 +6436,24 @@
 +      esac
 +      ;;
  
--# A sed program that does not truncate output.
--SED=$lt_SED
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+-	fi
+-	;;
+-    esac
+-    ;;
+-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    runpath_var='LD_RUN_PATH'
 +    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 +      # PIC is the default for these OSes.
 +      ;;
  
--# Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
+-    case $cc_basename in
+-      CC*)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +    mingw* | cygwin* | pw32* | os2* | cegcc*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
@@ -8227,18 +6462,19 @@
 +      m4_if([$1], [GCJ], [],
 +	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
 +      ;;
- 
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
 +    darwin* | rhapsody*)
 +      # PIC is the default on this platform
 +      # Common symbols not allowed in MH_DYLIB files
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 +      ;;
- 
--# The names of the tagged configurations supported by this script.
--available_tags=
++
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      _LT_TAGVAR(lt_prog_compiler_static, $1)=
++      ;;
++
 +    hpux*)
 +      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
 +      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -8246,50 +6482,91 @@
 +      case $host_cpu in
 +      hppa*64*)
 +	# +Z the default
-+	;;
-+      *)
+ 	;;
+       *)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
+ 	;;
 +      esac
 +      ;;
- 
--# ### BEGIN LIBTOOL CONFIG],
--[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
++
 +    interix[[3-9]]*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
- 
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
 +    msdosdjgpp*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
 +      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 +      enable_shared=no
 +      ;;
- 
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
++
 +    *nto* | *qnx*)
 +      # QNX uses GNU C++, but need to define -shared option too, otherwise
 +      # it will coredump.
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
 +      ;;
- 
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
++
 +    sysv4*MP*)
 +      if test -d /usr/nec; then
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
 +      fi
 +      ;;
- 
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
++
 +    *)
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +      ;;
-+    esac
+     esac
+-    ;;
+-  sysv5* | sco3.2v5* | sco5v6*)
+-    # Note: We can NOT use -z defs as we might desire, because we do not
+-    # link with -lc, and that would cause any symbols used from libc to
+-    # always be unresolved, which means just about no library would
+-    # ever link correctly.  If we're not using GNU ld we use -z text
+-    # though, which does catch some bad symbols but isn't as heavy-handed
+-    # as -z defs.
+-    # For security reasons, it is highly recommended that you always
+-    # use absolute paths for naming shared libraries, and exclude the
+-    # DT_RUNPATH tag from executables and libraries.  But doing so
+-    # requires that you compile everything twice, which is a pain.
+-    # So that behaviour is only enabled if SCOABSPATH is set to a
+-    # non-empty value in the environment.  Most likely only useful for
+-    # creating official distributions of packages.
+-    # This is a hack until libtool officially supports absolute path
+-    # names for shared libraries.
+-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-    runpath_var='LD_RUN_PATH'
+ 
+     case $cc_basename in
+-      CC*)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
++    nvcc*) # Cuda Compiler Driver 2.2
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
++      ;;
+     esac
+-    ;;
+-  tandem*)
+-    case $cc_basename in
+-      NCC*)
+-	# NonStop-UX NCC 3.20
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +  else
 +    # PORTME Check for flag to pass linker flags through the system compiler.
 +    case $host_os in
@@ -8302,50 +6579,14 @@
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
 +      fi
 +      ;;
- 
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
--
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
--
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
--
--# The host system.
--host_alias=$host_alias
--host=$host
--
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
--
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
--
--# A C compiler.
--LTCC=$lt_LTCC
--
--# A language-specific compiler.
--CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
--
--# Is the compiler the GNU C compiler?
--with_gcc=$_LT_AC_TAGVAR(GCC, $1)
--
--# An ERE matcher.
--EGREP=$lt_EGREP
--
--# The linker used to build libraries.
--LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
++
 +    mingw* | cygwin* | pw32* | os2* | cegcc*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      m4_if([$1], [GCJ], [],
 +	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
 +      ;;
- 
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
++
 +    hpux9* | hpux10* | hpux11*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
@@ -8353,25 +6594,45 @@
 +      case $host_cpu in
 +      hppa*64*|ia64*)
 +	# +Z the default
-+	;;
-+      *)
+ 	;;
+       *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	;;
+ 	;;
+-    esac
+-    ;;
+-  vxworks*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  *)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-esac
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 +      esac
 +      # Is there a better lt_prog_compiler_static that works with the bundled CC?
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 +      ;;
  
--# A BSD-compatible nm program.
--NM=$lt_NM
+-_LT_AC_TAGVAR(GCC, $1)="$GXX"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
 +    irix5* | irix6* | nonstopux*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      # PIC (with -KPIC) is the default.
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +      ;;
  
--# A symbol stripping program
--STRIP=$lt_STRIP
+-AC_LIBTOOL_POSTDEP_PREDEP($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 +    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +      case $cc_basename in
 +      # old Intel for x86_64 which still supported -KPIC.
@@ -8393,7 +6654,13 @@
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 +	;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
++      nagfor*)
++	# NAG Fortran compiler
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	;;
++      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -8405,92 +6672,177 @@
 +        # All Alpha code is PIC.
 +        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +        ;;
-+      xl*)
-+	# IBM XL C 8.0/Fortran 10.1 on PPC
++      xl* | bgxl* | bgf* | mpixl*)
++	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 +	;;
 +      *)
 +	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)
-+	  # Sun C 5.9
++	*Sun\ F* | *Sun*Fortran*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 +	  ;;
-+	*Sun\ F*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	*Sun\ C*)
++	  # Sun C 5.9
 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
++	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	  ;;
 +	esac
 +	;;
 +      esac
 +      ;;
  
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-AC_LIBTOOL_CONFIG($1)
 +    newsos6)
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      ;;
  
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-AC_LANG_POP
+-CC=$lt_save_CC
+-LDCXX=$LD
+-LD=$lt_save_LD
+-GCC=$lt_save_GCC
+-with_gnu_ldcxx=$with_gnu_ld
+-with_gnu_ld=$lt_save_with_gnu_ld
+-lt_cv_path_LDCXX=$lt_cv_path_LD
+-lt_cv_path_LD=$lt_save_path_LD
+-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+-])# AC_LIBTOOL_LANG_CXX_CONFIG
 +    *nto* | *qnx*)
 +      # QNX uses GNU C++, but need to define -shared option too, otherwise
 +      # it will coredump.
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
 +      ;;
  
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------------------
+-# Figure out "hidden" library dependencies from verbose
+-# compiler output when linking a shared library.
+-# Parse the compiler output and extract the necessary
+-# objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+-dnl we can't use the lt_simple_compile_test_code here,
+-dnl because it contains code intended for an executable,
+-dnl not a library.  It's possible we should let each
+-dnl tag define a new lt_????_link_test_code variable,
+-dnl but it's only used here...
+-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+-int a;
+-void foo (void) { a = 0; }
+-EOF
+-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+-class Foo
+-{
+-public:
+-  Foo (void) { a = 0; }
+-private:
+-  int a;
+-};
+-EOF
+-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+-      subroutine foo
+-      implicit none
+-      integer*4 a
+-      a=0
+-      return
+-      end
+-EOF
+-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+-public class foo {
+-  private int a;
+-  public void bar (void) {
+-    a = 0;
+-  }
+-};
+-EOF
+-])
+-dnl Parse the compiler output and extract the necessary
+-dnl objects, libraries and library flags.
+-if AC_TRY_EVAL(ac_compile); then
+-  # Parse the compiler output and extract the necessary
+-  # objects, libraries and library flags.
 +    osf3* | osf4* | osf5*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      # All OSF/1 code is PIC.
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +      ;;
  
--# Used on cygwin: assembler.
--AS=$lt_AS
+-  # Sentinel used to keep track of whether or not we are before
+-  # the conftest object file.
+-  pre_test_object_deps_done=no
 +    rdos*)
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +      ;;
  
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-  # The `*' in the case matches for architectures that use `case' in
+-  # $output_verbose_cmd can trigger glob expansion during the loop
+-  # eval without this substitution.
+-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 +    solaris*)
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      case $cc_basename in
-+      f77* | f90* | f95*)
++      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
 +      *)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
 +      esac
 +      ;;
  
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
+-  for p in `eval $output_verbose_link_cmd`; do
+-    case $p in
 +    sunos4*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      ;;
  
--# How to pass a linker flag through the compiler.
--wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-    -L* | -R* | -l*)
+-       # Some compilers place space between "-{L,R}" and the path.
+-       # Remove the space.
+-       if test $p = "-L" \
+-	  || test $p = "-R"; then
+-	 prev=$p
+-	 continue
+-       else
+-	 prev=
+-       fi
 +    sysv4 | sysv4.2uw2* | sysv4.3*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      ;;
  
--# Object file suffix (normally "o").
--objext="$ac_objext"
+-       if test "$pre_test_object_deps_done" = no; then
+-	 case $p in
+-	 -L* | -R*)
+-	   # Internal compiler library paths should come after those
+-	   # provided the user.  The postdeps already come after the
+-	   # user supplied libs so there is no need to process them.
+-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+-	   else
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+-	   fi
+-	   ;;
+-	 # The "-l" case would never come before the object being
+-	 # linked, so don't bother handling this case.
+-	 esac
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+-	 else
+-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+-	 fi
+-       fi
+-       ;;
 +    sysv4*MP*)
 +      if test -d /usr/nec ;then
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
@@ -8498,35 +6850,55 @@
 +      fi
 +      ;;
  
--# Old archive suffix (normally "a").
--libext="$libext"
+-    *.$objext)
+-       # This assumes that the test object file only shows up
+-       # once in the compiler output.
+-       if test "$p" = "conftest.$objext"; then
+-	 pre_test_object_deps_done=yes
+-	 continue
+-       fi
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      ;;
  
--# Shared library suffix (normally ".so").
--shrext='$shrext'
+-       if test "$pre_test_object_deps_done" = no; then
+-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+-	 fi
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+-	 fi
+-       fi
+-       ;;
 +    unicos*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 +      ;;
  
--# Executable file suffix (normally "").
--exeext="$exeext"
+-    *) ;; # Ignore the rest.
 +    uts4*)
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      ;;
  
--# Additional compiler flags for building library objects.
--pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
--pic_mode=$pic_mode
 +    *)
 +      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 +      ;;
-+    esac
+     esac
+-  done
+-
+-  # Clean up.
+-  rm -f a.out a.exe
+-else
+-  echo "libtool.m4: error: problem compiling $1 test program"
+-fi
 +  fi
 +])
 +case $host_os in
@@ -8538,12 +6910,70 @@
 +    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
 +    ;;
 +esac
-+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-+	[How to pass a linker flag through the compiler])
  
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-$rm -f confest.$objext
++AC_CACHE_CHECK([for $compiler option to produce PIC],
++  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
++  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+ 
+-# PORTME: override above test on systems where it is broken
+-ifelse([$1],[CXX],
+-[case $host_os in
+-interix3*)
+-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+-  # hack all around it, let's just trust "g++" to DTRT.
+-  _LT_AC_TAGVAR(predep_objects,$1)=
+-  _LT_AC_TAGVAR(postdep_objects,$1)=
+-  _LT_AC_TAGVAR(postdeps,$1)=
+-  ;;
+-
+-solaris*)
+-  case $cc_basename in
+-  CC*)
+-    # Adding this requires a known-good setup of shared libraries for
+-    # Sun compiler versions before 5.6, else PIC objects from an old
+-    # archive will be linked into the output, leading to subtle bugs.
+-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+-    ;;
+-  esac
+-  ;;
+-esac
+-])
+-
+-case " $_LT_AC_TAGVAR(postdeps, $1) " in
+-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+-esac
+-])# AC_LIBTOOL_POSTDEP_PREDEP
+-
+-# AC_LIBTOOL_LANG_F77_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+-[AC_REQUIRE([AC_PROG_F77])
+-AC_LANG_PUSH(Fortran 77)
+-
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 +#
 +# Check to make sure the PIC flag actually works.
 +#
@@ -8561,8 +6991,10 @@
 +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 +	[Additional compiler flags for building library objects])
  
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+-# Source file extension for f77 test sources.
+-ac_ext=f
++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
++	[How to pass a linker flag through the compiler])
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -8576,17 +7008,19 @@
 +	[Compiler flag to prevent dynamic linking])
 +])# _LT_COMPILER_PIC
  
--# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
  
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
 +# _LT_LINKER_SHLIBS([TAGNAME])
 +# ----------------------------
 +# See if the linker supports building shared libraries.
 +m4_defun([_LT_LINKER_SHLIBS],
 +[AC_REQUIRE([LT_PATH_LD])dnl
 +AC_REQUIRE([LT_PATH_NM])dnl
++m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_DECL_EGREP])dnl
 +m4_require([_LT_DECL_SED])dnl
@@ -8595,30 +7029,38 @@
 +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 +m4_if([$1], [CXX], [
 +  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 +  case $host_os in
 +  aix[[4-9]]*)
 +    # If we're using GNU nm, then we don't want the "-C" option.
 +    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    # Also, AIX nm treats weak defined symbols like other global defined
++    # symbols, whereas GNU nm marks them as "W".
 +    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 +    else
 +      _LT_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
 +    ;;
 +  pw32*)
 +    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-+  ;;
++    ;;
 +  cygwin* | mingw* | cegcc*)
-+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  linux* | k*bsd*-gnu)
++    case $cc_basename in
++    cl*) ;;
++    *)
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
++      ;;
++    esac
++    ;;
++  linux* | k*bsd*-gnu | gnu*)
 +    _LT_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
++    ;;
 +  *)
 +    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
++    ;;
 +  esac
-+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 +], [
 +  runpath_var=
 +  _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -8662,8 +7104,8 @@
 +dnl Note also adjust exclude_expsyms for C++ above.
 +  extract_expsyms_cmds=
  
--# Do we need a version for libraries?
--need_version=$need_version
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
 +  case $host_os in
 +  cygwin* | mingw* | pw32* | cegcc*)
 +    # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -8680,20 +7122,55 @@
 +  openbsd*)
 +    with_gnu_ld=no
 +    ;;
-+  linux* | k*bsd*-gnu)
++  linux* | k*bsd*-gnu | gnu*)
 +    _LT_TAGVAR(link_all_deplibs, $1)=no
 +    ;;
 +  esac
  
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
 +  _LT_TAGVAR(ld_shlibs, $1)=yes
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++  # On some targets, GNU ld is compatible enough with the native linker
++  # that we're better off using the native interface for both.
++  lt_use_gnu_ld_interface=no
 +  if test "$with_gnu_ld" = yes; then
++    case $host_os in
++      aix*)
++	# The AIX port of GNU ld has always aspired to compatibility
++	# with the native linker.  However, as the warning in the GNU ld
++	# block says, versions before 2.19.5* couldn't really create working
++	# shared libraries, regardless of the interface used.
++	case `$LD -v 2>&1` in
++	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
++	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
++	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
++	  *)
++	    lt_use_gnu_ld_interface=yes
++	    ;;
++	esac
++	;;
++      *)
++	lt_use_gnu_ld_interface=yes
++	;;
++    esac
++  fi
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${F77-"f77"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
++  if test "$lt_use_gnu_ld_interface" = yes; then
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
 +    wlarc='${wl}'
  
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
@@ -8716,8 +7193,8 @@
 +      *) supports_anon_versioning=yes ;;
 +    esac
  
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
 +    # See if GNU ld supports shared libraries.
 +    case $host_os in
 +    aix[[3-9]]*)
@@ -8726,22 +7203,49 @@
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	cat <<_LT_EOF 1>&2
  
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+-  fi
+-  ;;
+-aix4* | aix5*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
+-  fi
+-  ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
++*** Warning: the GNU linker, at least up to release 2.19, is reported
 +*** to be unable to reliably create shared libraries on AIX.
 +*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
++*** really care for shared libraries, you may want to install binutils
++*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
++*** You will then need to restart the configuration process.
  
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
+-
+-_LT_AC_TAGVAR(GCC, $1)="$G77"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
+-
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 +_LT_EOF
 +      fi
 +      ;;
  
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+-AC_LIBTOOL_CONFIG($1)
 +    amigaos*)
 +      case $host_cpu in
 +      powerpc)
@@ -8757,8 +7261,9 @@
 +      esac
 +      ;;
  
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_F77_CONFIG
 +    beos*)
 +      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 +	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -8770,19 +7275,25 @@
 +      fi
 +      ;;
  
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
 +    cygwin* | mingw* | pw32* | cegcc*)
 +      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 +      # as there is no search path for DLLs.
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
 +      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +      _LT_TAGVAR(always_export_symbols, $1)=no
 +      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
  
--# Library versioning type.
--version_type=$version_type
+-# AC_LIBTOOL_LANG_GCJ_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+-[AC_LANG_SAVE
 +      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
 +        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +	# If the export-symbols file already is a .def file (1st line
@@ -8799,8 +7310,16 @@
 +      fi
 +      ;;
  
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
+-# Source file extension for Java test sources.
+-ac_ext=java
++    haiku*)
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      _LT_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
+ 
+-# Object file extension for compiled Java test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
 +    interix[[3-9]]*)
 +      _LT_TAGVAR(hardcode_direct, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -8815,7 +7334,9 @@
 +      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
-+
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
 +    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 +      tmp_diet=no
 +      if test "$host_os" = linux-dietlibc; then
@@ -8826,15 +7347,16 @@
 +      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 +	 && test "$tmp_diet" = no
 +      then
-+	tmp_addflag=
++	tmp_addflag=' $pic_flag'
 +	tmp_sharedflag='-shared'
 +	case $cc_basename,$host_cpu in
 +        pgcc*)				# Portland Group C compiler
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 +	  tmp_addflag=' $pic_flag'
 +	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	pgf77* | pgf90* | pgf95* | pgfortran*)
++					# Portland Group f77 and f90 compilers
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 +	  tmp_addflag=' $pic_flag -Mnomain' ;;
 +	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 +	  tmp_addflag=' -i_dynamic' ;;
@@ -8845,13 +7367,17 @@
 +	lf95*)				# Lahey Fortran 8.1
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 +	  tmp_sharedflag='--shared' ;;
-+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
++	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 +	  tmp_sharedflag='-qmkshrobj'
 +	  tmp_addflag= ;;
++	nvcc*)	# Cuda Compiler Driver 2.2
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(compiler_needs_object, $1)=yes
++	  ;;
 +	esac
 +	case `$CC -V 2>&1 | sed 5q` in
 +	*Sun\ C*)			# Sun C 5.9
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 +	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 +	  tmp_sharedflag='-G' ;;
 +	*Sun\ F*)			# Sun Fortran 8.3
@@ -8859,9 +7385,8 @@
 +	esac
 +	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  
--# List of archive names.  First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
 +        if test "x$supports_anon_versioning" = xyes; then
 +          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
 +	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
@@ -8869,20 +7394,20 @@
 +	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +        fi
  
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
 +	case $cc_basename in
-+	xlf*)
++	xlf* | bgf* | bgxlf* | mpixlf*)
 +	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 +	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 +	  if test "x$supports_anon_versioning" = xyes; then
 +	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
 +	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 +	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 +	  fi
 +	  ;;
 +	esac
@@ -8891,30 +7416,32 @@
 +      fi
 +      ;;
  
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
 +    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 +	wlarc=
 +      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      fi
 +      ;;
  
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
 +    solaris*)
 +      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	cat <<_LT_EOF 1>&2
  
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 +*** Warning: The releases 2.8.* of the GNU linker cannot reliably
 +*** create shared libraries on Solaris systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
@@ -8922,32 +7449,30 @@
 +*** your PATH or compiler configuration so that the native linker is
 +*** used, and then restart.
  
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
--archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 +_LT_EOF
 +      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
  
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
--module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 +      case `$LD -v 2>&1` in
 +        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	cat <<_LT_EOF 1>&2
  
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
+-AC_LIBTOOL_CONFIG($1)
 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
 +*** reliably create shared libraries on SCO systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
@@ -8955,9 +7480,9 @@
 +*** your PATH or compiler configuration so that the native linker is
 +*** used, and then restart.
  
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_GCJ_CONFIG
 +_LT_EOF
 +	;;
 +	*)
@@ -8976,9 +7501,6 @@
 +      esac
 +      ;;
  
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
 +    sunos4*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 +      wlarc=
@@ -8986,22 +7508,142 @@
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
  
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+-# AC_LIBTOOL_LANG_RC_CONFIG
+-# -------------------------
+-# Ensure that the configuration vars for the Windows resource compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+-[AC_LANG_SAVE
 +    *)
 +      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +    esac
  
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+-# Source file extension for RC test sources.
+-ac_ext=rc
+-
+-# Object file extension for compiled RC test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
+-
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
+-
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+-
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${RC-"windres"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+-
+-AC_LIBTOOL_CONFIG($1)
+-
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_RC_CONFIG
+-
+-
+-# AC_LIBTOOL_CONFIG([TAGNAME])
+-# ----------------------------
+-# If TAGNAME is not passed, then create an initial libtool script
+-# with a default configuration from the untagged config vars.  Otherwise
+-# add code to config.status for appending the configuration named by
+-# TAGNAME from the matching tagged config vars.
+-AC_DEFUN([AC_LIBTOOL_CONFIG],
+-[# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # 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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+-    SED SHELL STRIP \
+-    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 \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    _LT_AC_TAGVAR(compiler, $1) \
+-    _LT_AC_TAGVAR(CC, $1) \
+-    _LT_AC_TAGVAR(LD, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+-    _LT_AC_TAGVAR(predep_objects, $1) \
+-    _LT_AC_TAGVAR(postdep_objects, $1) \
+-    _LT_AC_TAGVAR(predeps, $1) \
+-    _LT_AC_TAGVAR(postdeps, $1) \
+-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+-    _LT_AC_TAGVAR(archive_cmds, $1) \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+-    _LT_AC_TAGVAR(module_cmds, $1) \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+-    _LT_AC_TAGVAR(include_expsyms, $1); do
+-
+-    case $var in
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
 +    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
 +      runpath_var=
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
@@ -9023,11 +7665,15 @@
 +	# broken collect2.
 +	_LT_TAGVAR(hardcode_direct, $1)=unsupported
 +      fi
-+      ;;
+       ;;
+-    esac
+-  done
  
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+-  case $lt_echo in
+-  *'\[$]0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+-    ;;
+-  esac
 +    aix[[4-9]]*)
 +      if test "$host_cpu" = ia64; then
 +	# On IA64, the linker does run time linking by default, so we don't
@@ -9038,15 +7684,21 @@
 +      else
 +	# If we're using GNU nm, then we don't want the "-C" option.
 +	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	# Also, AIX nm treats weak defined symbols like other global
++	# defined symbols, whereas GNU nm marks them as "W".
 +	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 +	else
 +	  _LT_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
 +	aix_use_runtimelinking=no
  
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
+-ifelse([$1], [],
+-  [cfgfile="${ofile}T"
+-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+-  $rm -f "$cfgfile"
+-  AC_MSG_NOTICE([creating $ofile])],
+-  [cfgfile="$ofile"])
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 +	# need to do runtime linking.
@@ -9060,22 +7712,49 @@
 +	  ;;
 +	esac
  
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
+-  cat <<__EOF__ >> "$cfgfile"
+-ifelse([$1], [],
+-[#! $SHELL
 +	exp_sym_flag='-bexport'
 +	no_entry_flag='-bnoentry'
 +      fi
  
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-#
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
+-#
+-# This file is part of GNU Libtool:
+-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
 +      # When large executables or shared objects are built, AIX ld can
 +      # have problems creating the table of contents.  If linking a library
 +      # or program results in "error TOC overflow" add -mminimal-toc to
 +      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
 +      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
  
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+-# A sed program that does not truncate output.
+-SED=$lt_SED
 +      _LT_TAGVAR(archive_cmds, $1)=''
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -9083,8 +7762,8 @@
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
 +      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
  
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e 1s/^X//"
 +      if test "$GCC" = yes; then
 +	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
@@ -9127,8 +7806,9 @@
 +	fi
 +      fi
  
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
@@ -9139,9 +7819,9 @@
 +	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
 +        # Determine the default libpath from the value encoded in an
 +        # empty executable.
-+        _LT_SYS_MODULE_PATH_AIX
++        _LT_SYS_MODULE_PATH_AIX([$1])
 +        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +      else
 +	if test "$host_cpu" = ia64; then
 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -9150,14 +7830,19 @@
 +	else
 +	 # Determine the default libpath from the value encoded in an
 +	 # empty executable.
-+	 _LT_SYS_MODULE_PATH_AIX
++	 _LT_SYS_MODULE_PATH_AIX([$1])
 +	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 +	  # Warning - without using the other run time loading flags,
 +	  # -berok will link without error, but may produce a broken library.
 +	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 +	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	  if test "$with_gnu_ld" = yes; then
++	    # We only use this code for GNU lds that support --whole-archive.
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	  else
++	    # Exported symbols can be pulled into shared objects from archives
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	  fi
 +	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 +	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -9165,8 +7850,8 @@
 +      fi
 +      ;;
  
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-# The names of the tagged configurations supported by this script.
+-available_tags=
 +    amigaos*)
 +      case $host_cpu in
 +      powerpc)
@@ -9182,57 +7867,99 @@
 +      esac
 +      ;;
  
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-# ### BEGIN LIBTOOL CONFIG],
+-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
 +    bsdi[[45]]*)
 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
 +      ;;
  
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 +    cygwin* | mingw* | pw32* | cegcc*)
 +      # When not using gcc, we currently assume that we are using
 +      # Microsoft Visual C++.
 +      # hardcode_libdir_flag_spec is actually meaningless, as there is
 +      # no search path for DLLs.
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
-+      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+      # FIXME: Should let the user specify the lib program.
-+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      case $cc_basename in
++      cl*)
++	# Native MSVC
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++	_LT_TAGVAR(always_export_symbols, $1)=yes
++	_LT_TAGVAR(file_list_spec, $1)='@'
++	# Tell ltmain to make .lib files, not .a files.
++	libext=lib
++	# Tell ltmain to make .dll files, not .so files.
++	shrext_cmds=".dll"
++	# FIXME: Setting linknames here is a bad hack.
++	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++	  else
++	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++	  fi~
++	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++	  linknames='
++	# The linker will not automatically build a static lib if we build a DLL.
++	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++	# Don't use ranlib
++	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
++	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
++	  lt_tool_outputfile="@TOOL_OUTPUT@"~
++	  case $lt_outputfile in
++	    *.exe|*.EXE) ;;
++	    *)
++	      lt_outputfile="$lt_outputfile.exe"
++	      lt_tool_outputfile="$lt_tool_outputfile.exe"
++	      ;;
++	  esac~
++	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++	    $RM "$lt_outputfile.manifest";
++	  fi'
++	;;
++      *)
++	# Assume MSVC wrapper
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++	# Tell ltmain to make .lib files, not .a files.
++	libext=lib
++	# Tell ltmain to make .dll files, not .so files.
++	shrext_cmds=".dll"
++	# FIXME: Setting linknames here is a bad hack.
++	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
++	# The linker will automatically build a .lib file if we build a DLL.
++	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++	# FIXME: Should let the user specify the lib program.
++	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++	;;
++      esac
 +      ;;
  
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
 +    darwin* | rhapsody*)
 +      _LT_DARWIN_LINKER_FEATURES($1)
 +      ;;
  
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
 +    dgux*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
  
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
 +    freebsd1*)
 +      _LT_TAGVAR(ld_shlibs, $1)=no
 +      ;;
  
--# How to hardcode a shared library path into an executable.
--hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
 +    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
 +    # support.  Future versions do this automatically, but an explicit c++rt0.o
 +    # does not break anything, and helps significantly (at the cost of a little
@@ -9244,8 +7971,8 @@
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
  
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
 +    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
 +    freebsd2*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -9254,24 +7981,23 @@
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
  
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
 +    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 +    freebsd* | dragonfly*)
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
  
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
 +    hpux9*)
 +      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +      else
 +	_LT_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
@@ -9279,20 +8005,21 @@
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
  
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
 +      # hardcode_minus_L: Not really in the search PATH,
 +      # but as the default location of the library.
 +      _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 +      ;;
  
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
 +    hpux10*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +      fi
@@ -9309,20 +8036,20 @@
 +      fi
 +      ;;
  
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
 +    hpux11*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 +	case $host_cpu in
 +	hppa*64*)
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	esac
 +      else
@@ -9334,7 +8061,14 @@
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	m4_if($1, [], [
++	  # Older versions of the 11.00 compiler do not understand -b yet
++	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
++	  _LT_LINKER_OPTION([if $CC understands -b],
++	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
++	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
++	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
++	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 +	  ;;
 +	esac
 +      fi
@@ -9342,9 +8076,8 @@
 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 +	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
  
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+-# A C compiler.
+-LTCC=$lt_LTCC
 +	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  _LT_TAGVAR(hardcode_direct, $1)=no
@@ -9355,9 +8088,8 @@
 +	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 +	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
  
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+-# LTCC compiler flags.
+-LTCFLAGS=$lt_LTCFLAGS
 +	  # hardcode_minus_L: Not really in the search PATH,
 +	  # but as the default location of the library.
 +	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -9366,24 +8098,38 @@
 +      fi
 +      ;;
  
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
+-# A language-specific compiler.
+-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 +    irix5* | irix6* | nonstopux*)
 +      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	# Try to use the -exported_symbol ld option, if it does not
 +	# work, assume that -exports_file does not work either and
 +	# implicitly export all symbols.
-+        save_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+        AC_LINK_IFELSE(int foo(void) {},
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+        )
-+        LDFLAGS="$save_LDFLAGS"
++	# This should be the same for all languages, so no per-tag cache variable.
++	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
++	  [lt_cv_irix_exported_symbol],
++	  [save_LDFLAGS="$LDFLAGS"
++	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++	   AC_LINK_IFELSE(
++	     [AC_LANG_SOURCE(
++	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
++			      [C++], [[int foo (void) { return 0; }]],
++			      [Fortran 77], [[
++      subroutine foo
++      end]],
++			      [Fortran], [[
++      subroutine foo
++      end]])])],
++	      [lt_cv_irix_exported_symbol=yes],
++	      [lt_cv_irix_exported_symbol=no])
++           LDFLAGS="$save_LDFLAGS"])
++	if test "$lt_cv_irix_exported_symbol" = yes; then
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++	fi
 +      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
 +      fi
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -9392,8 +8138,8 @@
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
 +      ;;
  
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+-# Is the compiler the GNU C compiler?
+-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
 +    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -9405,8 +8151,8 @@
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
  
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
 +    newsos6)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
@@ -9415,13 +8161,13 @@
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
  
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+-# An ERE matcher.
+-EGREP=$lt_EGREP
 +    *nto* | *qnx*)
 +      ;;
  
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+-# The linker used to build libraries.
+-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
 +    openbsd*)
 +      if test -f /usr/libexec/ld.so; then
 +	_LT_TAGVAR(hardcode_direct, $1)=yes
@@ -9449,46 +8195,46 @@
 +      fi
 +      ;;
  
--# Set to yes if exported symbols are required.
--always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
 +    os2*)
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +      _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
 +      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
 +      ;;
  
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+-# A BSD-compatible nm program.
+-NM=$lt_NM
 +    osf3*)
 +      if test "$GCC" = yes; then
 +	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +      else
 +	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 +      fi
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      ;;
  
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
+-# A symbol stripping program
+-STRIP=$lt_STRIP
 +    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 +      if test "$GCC" = yes; then
 +	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +      else
 +	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 +	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
  
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
 +	# Both c and cxx compiler support -rpath directly
 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 +      fi
@@ -9496,15 +8242,21 @@
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      ;;
  
--# Symbols that must always be exported.
--include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
 +    solaris*)
 +      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
 +      if test "$GCC" = yes; then
 +	wlarc='${wl}'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +      else
 +	case `$CC -V 2>&1` in
 +	*"Compilers 5.0"*)
@@ -9540,9 +8292,8 @@
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
 +      ;;
  
--ifelse([$1],[],
--[# ### END LIBTOOL CONFIG],
--[# ### END LIBTOOL TAG CONFIG: $tagname])
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
 +    sunos4*)
 +      if test "x$host_vendor" = xsequent; then
 +	# Use $CC to link under sequent, because it throws in some extra .o
@@ -9557,7 +8308,9 @@
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
  
--__EOF__
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
 +    sysv4)
 +      case $host_vendor in
 +	sni)
@@ -9580,26 +8333,16 @@
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
  
--ifelse([$1],[], [
--  case $host_os in
--  aix3*)
--    cat <<\EOF >> "$cfgfile"
+-# How to pass a linker flag through the compiler.
+-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
 +    sysv4.3*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
 +      ;;
  
--# AIX sometimes has problems with the GCC collect2 program.  For some
--# reason, if we set the COLLECT_NAMES environment variable, the problems
--# vanish in a puff of smoke.
--if test "X${COLLECT_NAMES+set}" != Xset; then
--  COLLECT_NAMES=
--  export COLLECT_NAMES
--fi
--EOF
--    ;;
--  esac
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
 +    sysv4*MP*)
 +      if test -d /usr/nec; then
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -9610,31 +8353,16 @@
 +      fi
 +      ;;
  
--  # We use sed instead of cat because bash on DJGPP gets confused if
--  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
--  # text mode, it properly converts lines to CR/LF.  This bash problem
--  # is reportedly fixed, but why not run on old versions too?
--  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+-# Old archive suffix (normally "a").
+-libext="$libext"
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
 +      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      runpath_var='LD_RUN_PATH'
  
--  mv -f "$cfgfile" "$ofile" || \
--    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
--  chmod +x "$ofile"
--])
--else
--  # If there is no Makefile yet, we rely on a make rule to execute
--  # `config.status --recheck' to rerun these tests and create the
--  # libtool script then.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
--  fi
--fi
--])# AC_LIBTOOL_CONFIG
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
 +      if test "$GCC" = yes; then
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -9644,6 +8372,8 @@
 +      fi
 +      ;;
  
+-# Executable file suffix (normally "").
+-exeext="$exeext"
 +    sysv5* | sco3.2v5* | sco5v6*)
 +      # Note: We can NOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
@@ -9661,10 +8391,9 @@
 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
 +      runpath_var='LD_RUN_PATH'
  
--# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
--# -------------------------------------------
--AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-pic_mode=$pic_mode
 +      if test "$GCC" = yes; then
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -9674,26 +8403,23 @@
 +      fi
 +      ;;
  
--_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
 +    uts4*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
  
--if test "$GCC" = yes; then
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
 +    *)
 +      _LT_TAGVAR(ld_shlibs, $1)=no
 +      ;;
 +    esac
  
--  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
--    lt_cv_prog_compiler_rtti_exceptions,
--    [-fno-rtti -fno-exceptions], [],
--    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
--fi
--])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
 +    if test x$host_vendor = xsni; then
 +      case $host in
 +      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -9706,27 +8432,19 @@
 +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
 +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
 +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
  
--# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--# ---------------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
--[AC_REQUIRE([AC_CANONICAL_HOST])
--AC_REQUIRE([AC_PROG_NM])
--AC_REQUIRE([AC_OBJEXT])
--# Check for command to grab the raw symbol name followed by C symbol from nm.
--AC_MSG_CHECKING([command to parse $NM output from $compiler object])
--AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
--[
--# These are sane defaults that work on at least a few old systems.
--# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+-# Do we need a version for libraries?
+-need_version=$need_version
 +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
 +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
 +_LT_DECL([], [extract_expsyms_cmds], [2],
 +    [The commands to extract the exported symbol list from a shared archive])
  
--# Character class describing NM global symbol codes.
--symcode='[[BCDEGRST]]'
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
 +#
 +# Do we need to explicitly link libc?
 +#
@@ -9735,17 +8453,8 @@
 +  # Assume -lc should be added
 +  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
  
--# Regexp to match symbols that can be accessed directly from C.
--sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
--
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
--# Transform an extracted symbol line into a proper C declaration
--lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
--
--# Transform an extracted symbol line into symbol name and symbol address
--lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
 +  if test "$enable_shared" = yes && test "$GCC" = yes; then
 +    case $_LT_TAGVAR(archive_cmds, $1) in
 +    *'~'*)
@@ -9755,80 +8464,46 @@
 +      # Test whether the compiler implicitly links with -lc since on some
 +      # systems, -lgcc has to come before -lc. If gcc already passes -lc
 +      # to ld, don't add -lc before -lgcc.
-+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+      $RM conftest*
-+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--# Define system-specific variables.
--case $host_os in
--aix*)
--  symcode='[[BCDT]]'
--  ;;
--cygwin* | mingw* | pw32*)
--  symcode='[[ABCDGISTW]]'
--  ;;
--hpux*) # Its linker distinguishes data from code symbols
--  if test "$host_cpu" = ia64; then
--    symcode='[[ABCDEGRST]]'
-+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-+        _LT_TAGVAR(allow_undefined_flag, $1)=
-+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-+        then
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+        else
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+        fi
-+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
-+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
++      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
++	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
++	[$RM conftest*
++	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++	  soname=conftest
++	  lib=conftest
++	  libobjs=conftest.$ac_objext
++	  deplibs=
++	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
++	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
++	  compiler_flags=-v
++	  linker_flags=-v
++	  verstring=
++	  output_objdir=.
++	  libname=conftest
++	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
++	  _LT_TAGVAR(allow_undefined_flag, $1)=
++	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
++	  then
++	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++	  else
++	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
++	  fi
++	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++	else
++	  cat conftest.err 1>&5
++	fi
++	$RM conftest*
++	])
++      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
 +      ;;
 +    esac
-   fi
--  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'"
--  ;;
--irix* | nonstopux*)
--  symcode='[[BCDEGRST]]'
--  ;;
--osf*)
--  symcode='[[BCDEGQRST]]'
--  ;;
--solaris* | sysv5*)
--  symcode='[[BDRT]]'
--  ;;
--sysv4)
--  symcode='[[DFNSTU]]'
--  ;;
--esac
--
--# Handle CRLF in mingw tool chain
--opt_cr=
--case $build_os in
--mingw*)
--  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-   ;;
- esac
++  fi
++  ;;
++esac
  
--# If we're using GNU nm, then use its standard symbol codes.
--case `$NM -V 2>&1` in
--*GNU* | *'with BFD'*)
--  symcode='[[ABCDGIRSTW]]' ;;
--esac
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
 +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
 +    [Whether or not to add -lc for building shared libraries])
 +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
@@ -9887,8 +8562,6 @@
 +    to runtime path list])
 +_LT_TAGDECL([], [link_all_deplibs], [0],
 +    [Whether libtool must link a program against all its dependency libraries])
-+_LT_TAGDECL([], [fix_srcfile_path], [1],
-+    [Fix the shell variable $srcfile for the compiler])
 +_LT_TAGDECL([], [always_export_symbols], [0],
 +    [Set to "yes" if exported symbols are required])
 +_LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -9899,6 +8572,8 @@
 +    [Symbols that must always be exported])
 +_LT_TAGDECL([], [prelink_cmds], [2],
 +    [Commands necessary for linking programs (against libraries) with templates])
++_LT_TAGDECL([], [postlink_cmds], [2],
++    [Commands necessary for finishing linking programs])
 +_LT_TAGDECL([], [file_list_spec], [1],
 +    [Specify filename containing input files])
 +dnl FIXME: Not yet implemented
@@ -9906,11 +8581,11 @@
 +dnl    [Compiler flag to generate thread safe objects])
 +])# _LT_LINKER_SHLIBS
  
--# Try without a prefix undercore, then with it.
--for ac_symprfx in "" "_"; do
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
  
--  # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
 +# _LT_LANG_C_CONFIG([TAG])
 +# ------------------------
 +# Ensure that the configuration variables for a C compiler are suitably
@@ -9921,62 +8596,43 @@
 +lt_save_CC="$CC"
 +AC_LANG_PUSH(C)
  
--  # Check to see that the pipe works correctly.
--  pipe_works=no
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
 +# Source file extension for C test sources.
 +ac_ext=c
  
--  rm -f conftest*
--  cat > conftest.$ac_ext <<EOF
--#ifdef __cplusplus
--extern "C" {
--#endif
--char nm_test_var;
--void nm_test_func(){}
--#ifdef __cplusplus
--}
--#endif
--int main(){nm_test_var='a';nm_test_func();return(0);}
--EOF
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
 +# Object file extension for compiled C test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
  
--  if AC_TRY_EVAL(ac_compile); then
--    # Now try to grab the symbols.
--    nlist=conftest.nm
--    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
--      # Try sorting and uniquifying the output.
--      if sort "$nlist" | uniq > "$nlist"T; then
--	mv -f "$nlist"T "$nlist"
--      else
--	rm -f "$nlist"T
--      fi
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
 +# Code to be used in simple compile tests
 +lt_simple_compile_test_code="int some_variable = 0;"
  
--      # Make sure that we snagged all the symbols we need.
--      if grep ' nm_test_var$' "$nlist" >/dev/null; then
--	if grep ' nm_test_func$' "$nlist" >/dev/null; then
--	  cat <<EOF > conftest.$ac_ext
--#ifdef __cplusplus
--extern "C" {
--#endif
+-# Library versioning type.
+-version_type=$version_type
 +# Code to be used in simple link tests
 +lt_simple_link_test_code='int main(){return(0);}'
  
--EOF
--	  # Now generate the symbol file.
--	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
 +_LT_TAG_COMPILER
 +# Save the default compiler, since it gets overwritten when the other
 +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
 +compiler_DEFAULT=$CC
-+
+ 
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
-+
+ 
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
 +if test -n "$compiler"; then
 +  _LT_COMPILER_NO_RTTI($1)
 +  _LT_COMPILER_PIC($1)
@@ -9992,28 +8648,16 @@
 +  AC_MSG_CHECKING([if libtool supports shared libraries])
 +  AC_MSG_RESULT([$can_build_shared])
  
--	  cat <<EOF >> conftest.$ac_ext
--#if defined (__STDC__) && __STDC__
--# define lt_ptr_t void *
--#else
--# define lt_ptr_t char *
--# define const
--#endif
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
 +  AC_MSG_CHECKING([whether to build shared libraries])
 +  test "$can_build_shared" = "no" && enable_shared=no
  
--/* The mapping between symbol names and symbols. */
--const struct {
--  const char *name;
--  lt_ptr_t address;
--}
--lt_preloaded_symbols[[]] =
--{
--EOF
--	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
--	  cat <<\EOF >> conftest.$ac_ext
--  {0, (lt_ptr_t) 0}
--};
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
 +  # On AIX, shared libraries and static libraries use the same namespace, and
 +  # are all built from PIC.
 +  case $host_os in
@@ -10025,112 +8669,62 @@
 +    fi
 +    ;;
  
--#ifdef __cplusplus
--}
--#endif
--EOF
--	  # Now try linking the two files.
--	  mv conftest.$ac_objext conftstm.$ac_objext
--	  lt_save_LIBS="$LIBS"
--	  lt_save_CFLAGS="$CFLAGS"
--	  LIBS="conftstm.$ac_objext"
--	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
--	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
--	    pipe_works=yes
--	  fi
--	  LIBS="$lt_save_LIBS"
--	  CFLAGS="$lt_save_CFLAGS"
--	else
--	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
--	fi
--      else
--	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
--      fi
--    else
--      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
 +  aix[[4-9]]*)
 +    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 +      test "$enable_shared" = yes && enable_static=no
-     fi
--  else
--    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
--    cat conftest.$ac_ext >&5
--  fi
--  rm -f conftest* conftst*
++    fi
 +    ;;
 +  esac
 +  AC_MSG_RESULT([$enable_shared])
  
--  # Do not use the global_symbol_pipe unless it works.
--  if test "$pipe_works" = yes; then
--    break
--  else
--    lt_cv_sys_global_symbol_pipe=
--  fi
--done
--])
--if test -z "$lt_cv_sys_global_symbol_pipe"; then
--  lt_cv_sys_global_symbol_to_cdecl=
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
 +  AC_MSG_CHECKING([whether to build static libraries])
 +  # Make sure either enable_shared or enable_static is yes.
 +  test "$enable_shared" = yes || enable_static=yes
 +  AC_MSG_RESULT([$enable_static])
-+
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
 +  _LT_CONFIG($1)
- fi
--if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
--  AC_MSG_RESULT(failed)
++fi
 +AC_LANG_POP
 +CC="$lt_save_CC"
 +])# _LT_LANG_C_CONFIG
-+
-+
-+# _LT_PROG_CXX
-+# ------------
-+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-+# compiler, we have our own version here.
-+m4_defun([_LT_PROG_CXX],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-+AC_PROG_CXX
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
- else
--  AC_MSG_RESULT(ok)
-+  _lt_caught_CXX_error=yes
- fi
--]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_CXX
  
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_CXX], [])
- 
--# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
--# ---------------------------------------
--AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
--[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
--_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
  
--AC_MSG_CHECKING([for $compiler option to produce PIC])
-- ifelse([$1],[CXX],[
--  # C++ specific cases for pic, static, wl, etc.
--  if test "$GXX" = yes; then
--    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 +# _LT_LANG_CXX_CONFIG([TAG])
 +# --------------------------
 +# Ensure that the configuration variables for a C++ compiler are suitably
 +# defined.  These variables are subsequently used by _LT_CONFIG to write
 +# the compiler configuration to `libtool'.
 +m4_defun([_LT_LANG_CXX_CONFIG],
-+[AC_REQUIRE([_LT_PROG_CXX])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_DECL_EGREP])dnl
-+
++m4_require([_LT_PATH_MANIFEST_TOOL])dnl
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++else
++  _lt_caught_CXX_error=yes
++fi
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 +AC_LANG_PUSH(C++)
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -10151,68 +8745,28 @@
 +_LT_TAGVAR(module_expsym_cmds, $1)=
 +_LT_TAGVAR(link_all_deplibs, $1)=unknown
 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 +_LT_TAGVAR(no_undefined_flag, $1)=
 +_LT_TAGVAR(whole_archive_flag_spec, $1)=
 +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
  
--    case $host_os in
--    aix*)
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
--    amigaos*)
--      # FIXME: we need at least 68020 code to build shared libraries, but
--      # adding the `-m68020' flag to GCC prevents building anything better,
--      # like `-m68040'.
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
--      ;;
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
--    mingw* | os2* | pw32*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
--      ;;
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
--      ;;
--    *djgpp*)
--      # DJGPP does not support shared libraries at all
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--      ;;
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
--      fi
--      ;;
--    hpux*)
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
--      case "$host_cpu" in
--      hppa*64*|ia64*)
--	;;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	;;
--      esac
--      ;;
--    *)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--      ;;
--    esac
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 +# Source file extension for C++ test sources.
 +ac_ext=cpp
-+
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 +# Object file extension for compiled C++ test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
-+
+ 
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 +# No sense in running all these tests if we already determined that
 +# the CXX compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
@@ -10233,6 +8787,7 @@
 +
 +  # Allow CC to be a program name with arguments.
 +  lt_save_CC=$CC
++  lt_save_CFLAGS=$CFLAGS
 +  lt_save_LD=$LD
 +  lt_save_GCC=$GCC
 +  GCC=$GXX
@@ -10245,15 +8800,18 @@
 +  fi
 +  if test -n "${lt_cv_path_LDCXX+set}"; then
 +    lt_cv_path_LD=$lt_cv_path_LDCXX
-   else
++  else
 +    $as_unset lt_cv_path_LD
 +  fi
 +  test -z "${LDCXX+set}" || LD=$LDCXX
 +  CC=${CXX-"c++"}
++  CFLAGS=$CXXFLAGS
 +  compiler=$CC
 +  _LT_TAGVAR(compiler, $1)=$CC
 +  _LT_CC_BASENAME([$compiler])
-+
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
 +  if test -n "$compiler"; then
 +    # We don't want -fno-exception when compiling C++ code, so set the
 +    # no_builtin_flag separately
@@ -10262,17 +8820,23 @@
 +    else
 +      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 +    fi
-+
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
 +    if test "$GXX" = yes; then
 +      # Set up default GNU C++ configuration
-+
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
 +      LT_PATH_LD
-+
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
 +      # 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
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +
 +        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -10292,7 +8856,9 @@
 +      else
 +        with_gnu_ld=no
 +        wlarc=
-+
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
 +        # A generic and very simple default shared library creation
 +        # command for GNU C++ for the case where it uses the native
 +        # linker, instead of GNU ld.  If possible, this setting should
@@ -10300,49 +8866,28 @@
 +        # the platform it is being used on.
 +        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
 +      fi
-+
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
 +      # Commands to make compiler produce verbose output that lists
 +      # what "hidden" libraries, object files and flags are used when
 +      # linking a shared library.
-+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+
++      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ 
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 +    else
 +      GXX=no
 +      with_gnu_ld=no
 +      wlarc=
 +    fi
-+
+ 
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 +    # PORTME: fill in a description of your system's C++ link characteristics
 +    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 +    _LT_TAGVAR(ld_shlibs, $1)=yes
-     case $host_os in
--      aix4* | aix5*)
--	# All AIX code is PIC.
--	if test "$host_cpu" = ia64; then
--	  # AIX 5 now supports IA64 processor
--	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	else
--	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
--	fi
--	;;
--      chorus*)
--	case $cc_basename in
--	cxch68)
--	  # Green Hills C++ Compiler
--	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
--	  ;;
--	esac
--	;;
--      dgux*)
--	case $cc_basename in
--	  ec++)
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    ;;
--	  ghcx)
--	    # Green Hills C++ Compiler
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    ;;
--	  *)
++    case $host_os in
 +      aix3*)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
@@ -10356,7 +8901,9 @@
 +          no_entry_flag=""
 +        else
 +          aix_use_runtimelinking=no
-+
+ 
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 +          # Test if we are trying to use run time linking or normal
 +          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
 +          # need to do runtime linking.
@@ -10369,25 +8916,17 @@
 +	        ;;
 +	      esac
 +	    done
- 	    ;;
--	esac
--	;;
--      freebsd* | kfreebsd*-gnu)
--	# FreeBSD uses GNU C++
--	;;
--      hpux9* | hpux10* | hpux11*)
--	case $cc_basename in
--	  CC)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    if test "$host_cpu" != ia64; then
--	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	    ;;
 +          esac
-+
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
 +          exp_sym_flag='-bexport'
 +          no_entry_flag='-bnoentry'
 +        fi
-+
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
 +        # When large executables or shared objects are built, AIX ld can
 +        # have problems creating the table of contents.  If linking a library
 +        # or program results in "error TOC overflow" add -mminimal-toc to
@@ -10437,10 +8976,12 @@
 +	      shared_flag='${wl}-G'
 +	    else
 +	      shared_flag='${wl}-bM:SRE'
- 	    fi
++	    fi
 +          fi
 +        fi
-+
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 +        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
 +        # It seems that -bexpall does not export symbols beginning with
 +        # underscore (_), so it is better to generate a list of symbols to
@@ -10452,10 +8993,12 @@
 +          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
 +          # Determine the default libpath from the value encoded in an empty
 +          # executable.
-+          _LT_SYS_MODULE_PATH_AIX
++          _LT_SYS_MODULE_PATH_AIX([$1])
 +          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +        else
 +          if test "$host_cpu" = ia64; then
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -10464,14 +9007,19 @@
 +          else
 +	    # Determine the default libpath from the value encoded in an
 +	    # empty executable.
-+	    _LT_SYS_MODULE_PATH_AIX
++	    _LT_SYS_MODULE_PATH_AIX([$1])
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 +	    # Warning - without using the other run time loading flags,
 +	    # -berok will link without error, but may produce a broken library.
 +	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 +	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	    if test "$with_gnu_ld" = yes; then
++	      # We only use this code for GNU lds that support --whole-archive.
++	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    else
++	      # Exported symbols can be pulled into shared objects from archives
++	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	    fi
 +	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 +	    # This is similar to how AIX traditionally builds its shared
 +	    # libraries.
@@ -10479,7 +9027,9 @@
 +          fi
 +        fi
 +        ;;
-+
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
 +      beos*)
 +	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 +	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -10490,7 +9040,10 @@
 +	  _LT_TAGVAR(ld_shlibs, $1)=no
 +	fi
 +	;;
-+
+ 
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
 +      chorus*)
 +        case $cc_basename in
 +          *)
@@ -10499,50 +9052,93 @@
 +	  ;;
 +        esac
 +        ;;
-+
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
 +      cygwin* | mingw* | pw32* | cegcc*)
-+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+        # as there is no search path for DLLs.
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+        _LT_TAGVAR(always_export_symbols, $1)=no
-+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+          # If the export-symbols file already is a .def file (1st line
-+          # is EXPORTS), use it as is; otherwise, prepend...
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	    cp $export_symbols $output_objdir/$soname.def;
-+          else
-+	    echo EXPORTS > $output_objdir/$soname.def;
-+	    cat $export_symbols >> $output_objdir/$soname.def;
-+          fi~
-+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+        else
-+          _LT_TAGVAR(ld_shlibs, $1)=no
-+        fi
-+        ;;
++	case $GXX,$cc_basename in
++	,cl* | no,cl*)
++	  # Native MSVC
++	  # hardcode_libdir_flag_spec is actually meaningless, as there is
++	  # no search path for DLLs.
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++	  _LT_TAGVAR(always_export_symbols, $1)=yes
++	  _LT_TAGVAR(file_list_spec, $1)='@'
++	  # Tell ltmain to make .lib files, not .a files.
++	  libext=lib
++	  # Tell ltmain to make .dll files, not .so files.
++	  shrext_cmds=".dll"
++	  # FIXME: Setting linknames here is a bad hack.
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++	    else
++	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++	    fi~
++	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++	    linknames='
++	  # The linker will not automatically build a static lib if we build a DLL.
++	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++	  # Don't use ranlib
++	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
++	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
++	    lt_tool_outputfile="@TOOL_OUTPUT@"~
++	    case $lt_outputfile in
++	      *.exe|*.EXE) ;;
++	      *)
++		lt_outputfile="$lt_outputfile.exe"
++		lt_tool_outputfile="$lt_tool_outputfile.exe"
++		;;
++	    esac~
++	    func_to_tool_file "$lt_outputfile"~
++	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++	      $RM "$lt_outputfile.manifest";
++	    fi'
++	  ;;
++	*)
++	  # g++
++	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++	  # as there is no search path for DLLs.
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
++	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++	  _LT_TAGVAR(always_export_symbols, $1)=no
++	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++
++	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	    # If the export-symbols file already is a .def file (1st line
++	    # is EXPORTS), use it as is; otherwise, prepend...
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	      cp $export_symbols $output_objdir/$soname.def;
++	    else
++	      echo EXPORTS > $output_objdir/$soname.def;
++	      cat $export_symbols >> $output_objdir/$soname.def;
++	    fi~
++	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	  else
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	  fi
++	  ;;
++	esac
++	;;
 +      darwin* | rhapsody*)
 +        _LT_DARWIN_LINKER_FEATURES($1)
 +	;;
-+
+ 
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
 +      dgux*)
 +        case $cc_basename in
 +          ec++*)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
--	  aCC)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    case "$host_cpu" in
--	    hppa*64*|ia64*)
--	      # +Z the default
--	      ;;
--	    *)
--	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
--	      ;;
++	    ;;
 +          ghcx*)
 +	    # Green Hills C++ Compiler
 +	    # FIXME: insert proper C++ library support
@@ -10554,26 +9150,48 @@
 +	    ;;
 +        esac
 +        ;;
-+
+ 
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
 +      freebsd[[12]]*)
 +        # C++ shared libraries reported to be fairly broken before
 +	# switch to ELF
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
-+
+ 
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
 +      freebsd-elf*)
 +        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +        ;;
-+
+ 
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
 +      freebsd* | dragonfly*)
 +        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
 +        # conventions
 +        _LT_TAGVAR(ld_shlibs, $1)=yes
 +        ;;
-+
+ 
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
 +      gnu*)
 +        ;;
-+
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
++      haiku*)
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(link_all_deplibs, $1)=yes
++        ;;
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
 +      hpux9*)
 +        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 +        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -10598,11 +9216,11 @@
 +            # explicitly linking system object files so we need to strip them
 +            # from the output so that they don't get included in the library
 +            # dependencies.
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +            ;;
 +          *)
 +            if test "$GXX" = yes; then
-+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +            else
 +              # FIXME: insert proper C++ library support
 +              _LT_TAGVAR(ld_shlibs, $1)=no
@@ -10610,7 +9228,9 @@
 +            ;;
 +        esac
 +        ;;
-+
+ 
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 +      hpux10*|hpux11*)
 +        if test $with_gnu_ld = no; then
 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
@@ -10637,7 +9257,9 @@
 +					         # location of the library.
 +            ;;
 +        esac
-+
+ 
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 +        case $cc_basename in
 +          CC*)
 +	    # FIXME: insert proper C++ library support
@@ -10654,7 +9276,7 @@
 +	      *)
 +	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	        ;;
- 	    esac
++	    esac
 +	    # Commands to make compiler produce verbose output that lists
 +	    # what "hidden" libraries, object files and flags are used when
 +	    # linking a shared library.
@@ -10663,9 +9285,8 @@
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 	    ;;
--	  *)
++	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    ;;
 +          *)
 +	    if test "$GXX" = yes; then
 +	      if test $with_gnu_ld = no; then
@@ -10674,10 +9295,10 @@
 +	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	          ia64*)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	          *)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	        esac
 +	      fi
@@ -10685,18 +9306,12 @@
 +	      # FIXME: insert proper C++ library support
 +	      _LT_TAGVAR(ld_shlibs, $1)=no
 +	    fi
- 	    ;;
--	esac
--	;;
--      irix5* | irix6* | nonstopux*)
--	case $cc_basename in
--	  CC)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--	    # CC pic flag -KPIC is the default.
++	    ;;
 +        esac
 +        ;;
-+
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
 +      interix[[3-9]]*)
 +	_LT_TAGVAR(hardcode_direct, $1)=no
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -10715,40 +9330,33 @@
 +        case $cc_basename in
 +          CC*)
 +	    # SGI C++
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 +
 +	    # Archives containing C++ object files must be created using
 +	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
 +	    # necessary to make sure instantiated templates are included
 +	    # in the archive.
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
- 	    ;;
--	  *)
++	    ;;
 +          *)
 +	    if test "$GXX" = yes; then
 +	      if test "$with_gnu_ld" = no; then
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	      else
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
 +	      fi
 +	    fi
 +	    _LT_TAGVAR(link_all_deplibs, $1)=yes
- 	    ;;
--	esac
--	;;
--      linux*)
--	case $cc_basename in
--	  KCC)
--	    # KAI C++ Compiler
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    ;;
 +        esac
 +        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +        _LT_TAGVAR(inherit_rpath, $1)=yes
 +        ;;
-+
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +        case $cc_basename in
 +          KCC*)
 +	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -10766,7 +9374,7 @@
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -10774,13 +9382,9 @@
 +	    # Archives containing C++ object files must be created using
 +	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- 	    ;;
--	  icpc)
++	    ;;
 +	  icpc* | ecpc* )
- 	    # Intel C++
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	    # Intel C++
 +	    with_gnu_ld=yes
 +	    # version 8.0 and above of icpc choke on multiply defined symbols
 +	    # if we add $predep_objects and $postdep_objects, however 7.1 and
@@ -10803,53 +9407,54 @@
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 +	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	    ;;
--	  cxx)
++	    ;;
 +          pgCC* | pgcpp*)
 +            # Portland Group C++ compiler
 +	    case `$CC -V` in
-+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
++	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
 +	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
 +		rm -rf $tpldir~
 +		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 +	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
 +		rm -rf $tpldir~
 +		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
 +		$RANLIB $oldlib'
 +	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
 +		rm -rf $tpldir~
 +		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 +	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
 +		rm -rf $tpldir~
 +		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 +	      ;;
-+	    *) # Version 6 will use weak symbols
++	    *) # Version 6 and above use weak symbols
 +	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 +	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 +	      ;;
 +	    esac
-+
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
 +	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 +            ;;
 +	  cxx*)
- 	    # Compaq C++
--	    # Make sure the PIC flag is empty.  It appears that all Alpha
--	    # Linux and Compaq Tru64 Unix objects are PIC.
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    # Compaq C++
 +	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
 +	    runpath_var=LD_RUN_PATH
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 +	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
+ 
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
 +	    # Commands to make compiler produce verbose output that lists
 +	    # what "hidden" libraries, object files and flags are used when
 +	    # linking a shared library.
@@ -10858,9 +9463,9 @@
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 +	    ;;
-+	  xl*)
++	  xl* | mpixl* | bgxl*)
 +	    # IBM XL 8.0 on PPC, with GNU ld
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -10871,8 +9476,8 @@
 +		echo "local: *; };" >> $output_objdir/$libname.ver~
 +		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +	    fi
- 	    ;;
- 	  *)
++	    ;;
++	  *)
 +	    case `$CC -V 2>&1 | sed 5q` in
 +	    *Sun\ C*)
 +	      # Sun C++ 5.9
@@ -10880,13 +9485,13 @@
 +	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 +	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 +	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 +
 +	      # Not sure whether something based on
 +	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 +	      # would be better.
-+	      output_verbose_link_cmd='echo'
++	      output_verbose_link_cmd='func_echo_all'
 +
 +	      # Archives containing C++ object files must be created using
 +	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -10895,37 +9500,55 @@
 +	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 +	      ;;
 +	    esac
- 	    ;;
- 	esac
- 	;;
-+
-       lynxos*)
++	    ;;
++	esac
++	;;
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++      lynxos*)
 +        # FIXME: insert proper C++ library support
 +	_LT_TAGVAR(ld_shlibs, $1)=no
- 	;;
-+
-       m88k*)
++	;;
+ 
+-ifelse([$1],[],
+-[# ### END LIBTOOL CONFIG],
+-[# ### END LIBTOOL TAG CONFIG: $tagname])
+-
+-__EOF__
++      m88k*)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
- 	;;
-+
-       mvs*)
--	case $cc_basename in
--	  cxx)
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
++	;;
+ 
+-ifelse([$1],[], [
+-  case $host_os in
+-  aix3*)
+-    cat <<\EOF >> "$cfgfile"
++      mvs*)
 +        case $cc_basename in
 +          cxx*)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
- 	  *)
++	    ;;
++	  *)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
- 	esac
- 	;;
-+
-       netbsd*)
++	    ;;
++	esac
++	;;
+ 
+-# AIX sometimes has problems with the GCC collect2 program.  For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+-  COLLECT_NAMES=
+-  export COLLECT_NAMES
+-fi
+-EOF
+-    ;;
+-  esac
++      netbsd*)
 +        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
 +	  wlarc=
@@ -10936,11 +9559,30 @@
 +	# 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::"'
 +	;;
-+
+ 
+-  # We use sed instead of cat because bash on DJGPP gets confused if
+-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+-  # text mode, it properly converts lines to CR/LF.  This bash problem
+-  # is reportedly fixed, but why not run on old versions too?
+-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
 +      *nto* | *qnx*)
 +        _LT_TAGVAR(ld_shlibs, $1)=yes
 +	;;
-+
+ 
+-  mv -f "$cfgfile" "$ofile" || \
+-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+-  chmod +x "$ofile"
+-])
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+-  if test -f "$ltmain_in"; then
+-    test -f Makefile && make "$ltmain"
+-  fi
+-fi
+-])# AC_LIBTOOL_CONFIG
 +      openbsd2*)
 +        # C++ shared libraries are fairly broken
 +	_LT_TAGVAR(ld_shlibs, $1)=no
@@ -10958,16 +9600,13 @@
 +	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 +	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 +	  fi
-+	  output_verbose_link_cmd=echo
++	  output_verbose_link_cmd=func_echo_all
 +	else
 +	  _LT_TAGVAR(ld_shlibs, $1)=no
 +	fi
- 	;;
-+
-       osf3* | osf4* | osf5*)
--	case $cc_basename in
--	  KCC)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	;;
+ 
++      osf3* | osf4* | osf5*)
 +        case $cc_basename in
 +          KCC*)
 +	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -10986,41 +9625,37 @@
 +	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
 +	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
 +	    esac
- 	    ;;
--	  RCC)
++	    ;;
 +          RCC*)
- 	    # Rational C++ 2.4.1
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    # Rational C++ 2.4.1
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
--	  cxx)
--	    # Digital/Compaq C++
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    # Make sure the PIC flag is empty.  It appears that all Alpha
--	    # Linux and Compaq Tru64 Unix objects are PIC.
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
 +          cxx*)
 +	    case $host in
 +	      osf3*)
 +	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 +	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +		;;
 +	      *)
 +	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 +	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 +	          echo "-hidden">> $lib.exp~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
++	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
 +	          $RM $lib.exp'
 +	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 +		;;
 +	    esac
-+
+ 
+-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+-# -------------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 +	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
+ 
+-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 +	    # Commands to make compiler produce verbose output that lists
 +	    # what "hidden" libraries, object files and flags are used when
 +	    # linking a shared library.
@@ -11029,17 +9664,17 @@
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 	    ;;
- 	  *)
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    ;;
++	  *)
 +	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 +	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 +	      case $host in
 +	        osf3*)
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +		  ;;
 +	        *)
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +		  ;;
 +	      esac
 +
@@ -11049,59 +9684,52 @@
 +	      # Commands to make compiler produce verbose output that lists
 +	      # what "hidden" libraries, object files and flags are used when
 +	      # linking a shared library.
-+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 +
 +	    else
 +	      # FIXME: insert proper C++ library support
 +	      _LT_TAGVAR(ld_shlibs, $1)=no
 +	    fi
- 	    ;;
--	esac
--	;;
++	    ;;
 +        esac
 +        ;;
-+
-       psos*)
--	;;
--      sco*)
--	case $cc_basename in
--	  CC)
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 
+-if test "$GCC" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++      psos*)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
-+
+ 
+-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+-    lt_cv_prog_compiler_rtti_exceptions,
+-    [-fno-rtti -fno-exceptions], [],
+-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+-fi
+-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
 +      sunos4*)
 +        case $cc_basename in
 +          CC*)
 +	    # Sun C++ 4.x
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
--	  *)
++	    ;;
 +          lcc*)
 +	    # Lucid
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
--	esac
--	;;
++	    ;;
 +          *)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +        esac
 +        ;;
-+
-       solaris*)
--	case $cc_basename in
--	  CC)
+ 
++      solaris*)
 +        case $cc_basename in
-+          CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++          CC* | sunCC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
 +            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 +	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
 +	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -11120,38 +9748,51 @@
 +	        ;;
 +	    esac
 +	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-+
-+	    output_verbose_link_cmd='echo'
-+
+ 
+-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-# ---------------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+-[AC_REQUIRE([AC_CANONICAL_HOST])
+-AC_REQUIRE([AC_PROG_NM])
+-AC_REQUIRE([AC_OBJEXT])
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+-[
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++	    output_verbose_link_cmd='func_echo_all'
+ 
+-# Character class describing NM global symbol codes.
+-symcode='[[BCDEGRST]]'
 +	    # Archives containing C++ object files must be created using
 +	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
 +	    # necessary to make sure instantiated templates are included
 +	    # in the archive.
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- 	    ;;
--	  gcx)
++	    ;;
 +          gcx*)
- 	    # Green Hills C++ Compiler
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++	    # Green Hills C++ Compiler
 +	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+
+ 
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 +	    # The C++ compiler must be used to create the archive.
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
- 	    ;;
--	  *)
++	    ;;
 +          *)
 +	    # GNU C++ compiler with Solaris linker
 +	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 +	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 +	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 +	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 +
 +	        # Commands to make compiler produce verbose output that lists
 +	        # what "hidden" libraries, object files and flags are used when
 +	        # linking a shared library.
-+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 +	      else
 +	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 +	        # platform.
@@ -11162,7 +9803,7 @@
 +	        # Commands to make compiler produce verbose output that lists
 +	        # what "hidden" libraries, object files and flags are used when
 +	        # linking a shared library.
-+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 +	      fi
 +
 +	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -11173,19 +9814,20 @@
 +		  ;;
 +	      esac
 +	    fi
- 	    ;;
--	esac
--	;;
--      sunos4*)
++	    ;;
 +        esac
 +        ;;
-+
+ 
+-# 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'"
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
 +      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      runpath_var='LD_RUN_PATH'
-+
+ 
+-# Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 +      case $cc_basename in
 +        CC*)
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -11197,7 +9839,51 @@
 +	  ;;
 +      esac
 +      ;;
-+
+ 
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[[BCDT]]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[[ABCDGISTW]]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  if test "$host_cpu" = ia64; then
+-    symcode='[[ABCDEGRST]]'
+-  fi
+-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-linux*)
+-  if test "$host_cpu" = ia64; then
+-    symcode='[[ABCDGIRSTW]]'
+-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  fi
+-  ;;
+-irix* | nonstopux*)
+-  symcode='[[BCDEGRST]]'
+-  ;;
+-osf*)
+-  symcode='[[BCDEGQRST]]'
+-  ;;
+-solaris*)
+-  symcode='[[BDRT]]'
+-  ;;
+-sco3.2v5*)
+-  symcode='[[DT]]'
+-  ;;
+-sysv4.2uw2*)
+-  symcode='[[DT]]'
+-  ;;
+-sysv5* | sco5v6* | unixware* | OpenUNIX*)
+-  symcode='[[ABDT]]'
+-  ;;
+-sysv4)
+-  symcode='[[DFNSTU]]'
+-  ;;
+-esac
 +      sysv5* | sco3.2v5* | sco5v6*)
 +	# Note: We can NOT use -z defs as we might desire, because we do not
 +	# link with -lc, and that would cause any symbols used from libc to
@@ -11214,70 +9900,86 @@
 +	_LT_TAGVAR(link_all_deplibs, $1)=yes
 +	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
 +	runpath_var='LD_RUN_PATH'
-+
- 	case $cc_basename in
--	  CC)
--	    # Sun C++ 4.x
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    ;;
--	  lcc)
--	    # Lucid
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 
+-# Handle CRLF in mingw tool chain
+-opt_cr=
+-case $build_os in
+-mingw*)
+-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+-  ;;
+-esac
++	case $cc_basename in
 +          CC*)
 +	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	    ;;
- 	  *)
++	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
++	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
++	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
++	      '"$_LT_TAGVAR(reload_cmds, $1)"
++	    ;;
++	  *)
 +	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	    ;;
- 	esac
--	;;
++	    ;;
++	esac
 +      ;;
-+
-       tandem*)
--	case $cc_basename in
--	  NCC)
+ 
+-# If we're using GNU nm, then use its standard symbol codes.
+-case `$NM -V 2>&1` in
+-*GNU* | *'with BFD'*)
+-  symcode='[[ABCDGIRSTW]]' ;;
+-esac
++      tandem*)
 +        case $cc_basename in
 +          NCC*)
- 	    # NonStop-UX NCC 3.20
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    # NonStop-UX NCC 3.20
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
--	  *)
++	    ;;
 +          *)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
--	esac
--	;;
--      unixware*)
--	;;
++	    ;;
 +        esac
 +        ;;
-+
-       vxworks*)
--	;;
+ 
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
++      vxworks*)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
-+
-       *)
--	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--	;;
+ 
+-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+-  symxfrm="\\1 $ac_symprfx\\2 \\2"
++      *)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
-     esac
-+
++    esac
+ 
+-  # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 +    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
 +    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
+ 
+-  # Check to see that the pipe works correctly.
+-  pipe_works=no
 +    _LT_TAGVAR(GCC, $1)="$GXX"
 +    _LT_TAGVAR(LD, $1)="$LD"
-+
+ 
+-  rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
+-}
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
 +    ## 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
@@ -11294,6 +9996,7 @@
 +  fi # test -n "$compiler"
 +
 +  CC=$lt_save_CC
++  CFLAGS=$lt_save_CFLAGS
 +  LDCXX=$LD
 +  LD=$lt_save_LD
 +  GCC=$lt_save_GCC
@@ -11303,11 +10006,61 @@
 +  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
 +  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 +fi # test "$_lt_caught_CXX_error" != yes
-+
+ 
+-  if AC_TRY_EVAL(ac_compile); then
+-    # Now try to grab the symbols.
+-    nlist=conftest.nm
+-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+-      # Try sorting and uniquifying the output.
+-      if sort "$nlist" | uniq > "$nlist"T; then
+-	mv -f "$nlist"T "$nlist"
+-      else
+-	rm -f "$nlist"T
+-      fi
 +AC_LANG_POP
 +])# _LT_LANG_CXX_CONFIG
-+
-+
+ 
+-      # Make sure that we snagged all the symbols we need.
+-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+-	  cat <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+ 
+-EOF
+-	  # Now generate the symbol file.
+-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++# _LT_FUNC_STRIPNAME_CNF
++# ----------------------
++# func_stripname_cnf prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++#
++# This function is identical to the (non-XSI) version of func_stripname,
++# except this one can be used by m4 code that may be executed by configure,
++# rather than the libtool script.
++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
++AC_REQUIRE([_LT_DECL_SED])
++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
++func_stripname_cnf ()
++{
++  case ${2} in
++  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
++  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++  esac
++} # func_stripname_cnf
++])# _LT_FUNC_STRIPNAME_CNF
+ 
+-	  cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr_t void *
+-#else
+-# define lt_ptr_t char *
+-# define const
+-#endif
 +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 +# ---------------------------------
 +# Figure out "hidden" library dependencies from verbose
@@ -11316,13 +10069,20 @@
 +# objects, libraries and library flags.
 +m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 +# Dependencies to place before and after the object being linked:
 +_LT_TAGVAR(predep_objects, $1)=
 +_LT_TAGVAR(postdep_objects, $1)=
 +_LT_TAGVAR(predeps, $1)=
 +_LT_TAGVAR(postdeps, $1)=
 +_LT_TAGVAR(compiler_lib_search_path, $1)=
-+
+ 
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr_t address;
+-}
+-lt_preloaded_symbols[[]] =
 +dnl we can't use the lt_simple_compile_test_code here,
 +dnl because it contains code intended for an executable,
 +dnl not a library.  It's possible we should let each
@@ -11334,7 +10094,11 @@
 +_LT_EOF
 +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
 +class Foo
-+{
+ {
+-EOF
+-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+-	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr_t) 0}
 +public:
 +  Foo (void) { a = 0; }
 +private:
@@ -11363,9 +10127,58 @@
 +  public void bar (void) {
 +    a = 0;
 +  }
-+};
+ };
 +_LT_EOF
 +])
+ 
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+-	  # Now try linking the two files.
+-	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  lt_save_LIBS="$LIBS"
+-	  lt_save_CFLAGS="$CFLAGS"
+-	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+-	    pipe_works=yes
+-	  fi
+-	  LIBS="$lt_save_LIBS"
+-	  CFLAGS="$lt_save_CFLAGS"
+-	else
+-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+-	fi
+-      else
+-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+-      fi
+-    else
+-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+-    fi
+-  else
+-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+-    cat conftest.$ac_ext >&5
+-  fi
+-  rm -f conftest* conftst*
++_lt_libdeps_save_CFLAGS=$CFLAGS
++case "$CC $CFLAGS " in #(
++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
++esac
+ 
+-  # Do not use the global_symbol_pipe unless it works.
+-  if test "$pipe_works" = yes; then
+-    break
+-  else
+-    lt_cv_sys_global_symbol_pipe=
+-  fi
+-done
+-])
+-if test -z "$lt_cv_sys_global_symbol_pipe"; then
+-  lt_cv_sys_global_symbol_to_cdecl=
+-fi
+-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+-  AC_MSG_RESULT(failed)
 +dnl Parse the compiler output and extract the necessary
 +dnl objects, libraries and library flags.
 +if AC_TRY_EVAL(ac_compile); then
@@ -11377,7 +10190,7 @@
 +  pre_test_object_deps_done=no
 +
 +  for p in `eval "$output_verbose_link_cmd"`; do
-+    case $p in
++    case ${prev}${p} in
 +
 +    -L* | -R* | -l*)
 +       # Some compilers place space between "-{L,R}" and the path.
@@ -11386,13 +10199,22 @@
 +          test $p = "-R"; then
 +	 prev=$p
 +	 continue
-+       else
-+	 prev=
 +       fi
 +
++       # Expand the sysroot to ease extracting the directories later.
++       if test -z "$prev"; then
++         case $p in
++         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
++         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
++         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
++         esac
++       fi
++       case $p in
++       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
++       esac
 +       if test "$pre_test_object_deps_done" = no; then
-+	 case $p in
-+	 -L* | -R*)
++	 case ${prev} in
++	 -L | -R)
 +	   # Internal compiler library paths should come after those
 +	   # provided the user.  The postdeps already come after the
 +	   # user supplied libs so there is no need to process them.
@@ -11412,8 +10234,10 @@
 +	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
 +	 fi
 +       fi
++       prev=
 +       ;;
 +
++    *.lto.$objext) ;; # Ignore GCC LTO objects
 +    *.$objext)
 +       # This assumes that the test object file only shows up
 +       # once in the compiler output.
@@ -11444,12 +10268,28 @@
 +
 +  # Clean up.
 +  rm -f a.out a.exe
-+else
+ else
+-  AC_MSG_RESULT(ok)
 +  echo "libtool.m4: error: problem compiling $1 test program"
-+fi
-+
+ fi
+-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-
+ 
+-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+-# ---------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
 +$RM -f confest.$objext
-+
++CFLAGS=$_lt_libdeps_save_CFLAGS
+ 
+-AC_MSG_CHECKING([for $compiler option to produce PIC])
+- ifelse([$1],[CXX],[
+-  # C++ specific cases for pic, static, wl, etc.
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +# PORTME: override above test on systems where it is broken
 +m4_if([$1], [CXX],
 +[case $host_os in
@@ -11460,51 +10300,326 @@
 +  _LT_TAGVAR(postdep_objects,$1)=
 +  _LT_TAGVAR(postdeps,$1)=
 +  ;;
-+
-+linux*)
-+  case `$CC -V 2>&1 | sed 5q` in
-+  *Sun\ C*)
-+    # Sun C++ 5.9
-+
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
-+
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
+ 
+-    case $host_os in
+-    aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+-      ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+-    mingw* | os2* | pw32*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+-      ;;
+-    *djgpp*)
+-      # DJGPP does not support shared libraries at all
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-      ;;
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
+-      ;;
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+-      fi
+-      ;;
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	;;
+-      esac
+-      ;;
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
+       ;;
+     esac
+-  else
+-    case $host_os in
+-      aix4* | aix5*)
+-	# All AIX code is PIC.
+-	if test "$host_cpu" = ia64; then
+-	  # AIX 5 now supports IA64 processor
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	else
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+-	fi
+-	;;
+-      chorus*)
+-	case $cc_basename in
+-	cxch68*)
+-	  # Green Hills C++ Compiler
+-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+-	  ;;
+-	esac
+-	;;
+-       darwin*)
+-         # PIC is the default on this platform
+-         # Common symbols not allowed in MH_DYLIB files
+-         case $cc_basename in
+-           xlc*)
+-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-           ;;
+-         esac
+-       ;;
+-      dgux*)
+-	case $cc_basename in
+-	  ec++*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    ;;
+-	  ghcx*)
+-	    # Green Hills C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      freebsd* | kfreebsd*-gnu | dragonfly*)
+-	# FreeBSD uses GNU C++
+-	;;
+-      hpux9* | hpux10* | hpux11*)
+-	case $cc_basename in
+-	  CC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+-	    if test "$host_cpu" != ia64; then
+-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	    fi
+-	    ;;
+-	  aCC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+-	    case $host_cpu in
+-	    hppa*64*|ia64*)
+-	      # +Z the default
+-	      ;;
+-	    *)
+-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	      ;;
+-	    esac
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      interix*)
+-	# This is c89, which is MS Visual C++ (no shared libs)
+-	# Anyone wants to do a port?
+-	;;
+-      irix5* | irix6* | nonstopux*)
+-	case $cc_basename in
+-	  CC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-	    # CC pic flag -KPIC is the default.
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      linux*)
+-	case $cc_basename in
+-	  KCC*)
+-	    # KAI C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	    ;;
+-	  icpc* | ecpc*)
+-	    # Intel C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-	    ;;
+-	  pgCC*)
+-	    # Portland Group C++ compiler.
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    ;;
+-	  cxx*)
+-	    # Compaq C++
+-	    # Make sure the PIC flag is empty.  It appears that all Alpha
+-	    # Linux and Compaq Tru64 Unix objects are PIC.
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      lynxos*)
+-	;;
+-      m88k*)
+-	;;
+-      mvs*)
+-	case $cc_basename in
+-	  cxx*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      netbsd*)
+-	;;
+-      osf3* | osf4* | osf5*)
+-	case $cc_basename in
+-	  KCC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+-	    ;;
+-	  RCC*)
+-	    # Rational C++ 2.4.1
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    ;;
+-	  cxx*)
+-	    # Digital/Compaq C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    # Make sure the PIC flag is empty.  It appears that all Alpha
+-	    # Linux and Compaq Tru64 Unix objects are PIC.
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      psos*)
+-	;;
+-      solaris*)
+-	case $cc_basename in
+-	  CC*)
+-	    # Sun C++ 4.2, 5.x and Centerline C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+-	    ;;
+-	  gcx*)
+-	    # Green Hills C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      sunos4*)
+-	case $cc_basename in
+-	  CC*)
+-	    # Sun C++ 4.x
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    ;;
+-	  lcc*)
+-	    # Lucid
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      tandem*)
+-	case $cc_basename in
+-	  NCC*)
+-	    # NonStop-UX NCC 3.20
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-	case $cc_basename in
+-	  CC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    ;;
+-	esac
+-	;;
+-      vxworks*)
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-	;;
++
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
++solaris*)
++  case $cc_basename in
++  CC* | sunCC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
+     esac
+-  fi
+-],
+-[
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
+-    case $host_os in
+-      aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
 +esac
 +])
 +
@@ -11528,33 +10643,23 @@
 +    a shared library])
 +])# _LT_SYS_HIDDEN_LIBDEPS
 +
-+
-+# _LT_PROG_F77
-+# ------------
-+# Since AC_PROG_F77 is broken, in that it returns the empty string
-+# if there is no fortran compiler, we have our own version here.
-+m4_defun([_LT_PROG_F77],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-+AC_PROG_F77
-+if test -z "$F77" || test "X$F77" = "Xno"; then
-+  _lt_disable_F77=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_F77
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_F77], [])
-+
-+
+ 
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+-      ;;
 +# _LT_LANG_F77_CONFIG([TAG])
 +# --------------------------
 +# Ensure that the configuration variables for a Fortran 77 compiler are
 +# suitably defined.  These variables are subsequently used by _LT_CONFIG
 +# to write the compiler configuration to `libtool'.
 +m4_defun([_LT_LANG_F77_CONFIG],
-+[AC_REQUIRE([_LT_PROG_F77])dnl
-+AC_LANG_PUSH(Fortran 77)
++[AC_LANG_PUSH(Fortran 77)
++if test -z "$F77" || test "X$F77" = "Xno"; then
++  _lt_disable_F77=yes
++fi
 +
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -11573,17 +10678,32 @@
 +_LT_TAGVAR(module_expsym_cmds, $1)=
 +_LT_TAGVAR(link_all_deplibs, $1)=unknown
 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 +_LT_TAGVAR(no_undefined_flag, $1)=
 +_LT_TAGVAR(whole_archive_flag_spec, $1)=
 +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
 +# Source file extension for f77 test sources.
 +ac_ext=f
-+
+ 
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
 +# Object file extension for compiled f77 test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
-+
+ 
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+-      ;;
 +# No sense in running all these tests if we already determined that
 +# the F77 compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
@@ -11595,16 +10715,31 @@
 +      return
 +      end
 +"
-+
+ 
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
+-      ;;
 +  # Code to be used in simple link tests
 +  lt_simple_link_test_code="\
 +      program t
 +      end
 +"
-+
+ 
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      enable_shared=no
+-      ;;
 +  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +  _LT_TAG_COMPILER
-+
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+-      fi
+-      ;;
 +  # save warnings/boilerplate of simple test code
 +  _LT_COMPILER_BOILERPLATE
 +  _LT_LINKER_BOILERPLATE
@@ -11612,7 +10747,9 @@
 +  # Allow CC to be a program name with arguments.
 +  lt_save_CC="$CC"
 +  lt_save_GCC=$GCC
++  lt_save_CFLAGS=$CFLAGS
 +  CC=${F77-"f77"}
++  CFLAGS=$FFLAGS
 +  compiler=$CC
 +  _LT_TAGVAR(compiler, $1)=$CC
 +  _LT_CC_BASENAME([$compiler])
@@ -11620,10 +10757,25 @@
 +  if test -n "$compiler"; then
 +    AC_MSG_CHECKING([if libtool supports shared libraries])
 +    AC_MSG_RESULT([$can_build_shared])
-+
+ 
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	;;
+-      esac
+-      ;;
 +    AC_MSG_CHECKING([whether to build shared libraries])
 +    test "$can_build_shared" = "no" && enable_shared=no
-+
+ 
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-      ;;
 +    # On AIX, shared libraries and static libraries use the same namespace, and
 +    # are all built from PIC.
 +    case $host_os in
@@ -11639,7 +10791,9 @@
 +	  test "$enable_shared" = yes && enable_static=no
 +	fi
 +        ;;
-+    esac
+     esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
 +    AC_MSG_RESULT([$enable_shared])
 +
 +    AC_MSG_CHECKING([whether to build static libraries])
@@ -11666,38 +10820,24 @@
 +
 +  GCC=$lt_save_GCC
 +  CC="$lt_save_CC"
++  CFLAGS="$lt_save_CFLAGS"
 +fi # test "$_lt_disable_F77" != yes
 +
 +AC_LANG_POP
 +])# _LT_LANG_F77_CONFIG
 +
 +
-+# _LT_PROG_FC
-+# -----------
-+# Since AC_PROG_FC is broken, in that it returns the empty string
-+# if there is no fortran compiler, we have our own version here.
-+m4_defun([_LT_PROG_FC],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-+AC_PROG_FC
-+if test -z "$FC" || test "X$FC" = "Xno"; then
-+  _lt_disable_FC=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_FC
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_FC], [])
-+
-+
 +# _LT_LANG_FC_CONFIG([TAG])
 +# -------------------------
 +# Ensure that the configuration variables for a Fortran compiler are
 +# suitably defined.  These variables are subsequently used by _LT_CONFIG
 +# to write the compiler configuration to `libtool'.
 +m4_defun([_LT_LANG_FC_CONFIG],
-+[AC_REQUIRE([_LT_PROG_FC])dnl
-+AC_LANG_PUSH(Fortran)
++[AC_LANG_PUSH(Fortran)
++
++if test -z "$FC" || test "X$FC" = "Xno"; then
++  _lt_disable_FC=yes
++fi
 +
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -11716,6 +10856,8 @@
 +_LT_TAGVAR(module_expsym_cmds, $1)=
 +_LT_TAGVAR(link_all_deplibs, $1)=unknown
 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 +_LT_TAGVAR(no_undefined_flag, $1)=
 +_LT_TAGVAR(whole_archive_flag_spec, $1)=
 +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -11755,7 +10897,9 @@
 +  # Allow CC to be a program name with arguments.
 +  lt_save_CC="$CC"
 +  lt_save_GCC=$GCC
++  lt_save_CFLAGS=$CFLAGS
 +  CC=${FC-"f95"}
++  CFLAGS=$FCFLAGS
 +  compiler=$CC
 +  GCC=$ac_cv_fc_compiler_gnu
 +
@@ -11771,7 +10915,14 @@
 +
 +    # On AIX, shared libraries and static libraries use the same namespace, and
 +    # are all built from PIC.
-+    case $host_os in
+     case $host_os in
+-    aix*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      else
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
 +      aix3*)
 +        test "$enable_shared" = yes && enable_static=no
 +        if test -n "$RANLIB"; then
@@ -11811,7 +10962,8 @@
 +  fi # test -n "$compiler"
 +
 +  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
++  CC=$lt_save_CC
++  CFLAGS=$lt_save_CFLAGS
 +fi # test "$_lt_disable_FC" != yes
 +
 +AC_LANG_POP
@@ -11848,10 +11000,12 @@
 +_LT_LINKER_BOILERPLATE
 +
 +# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
++lt_save_CC=$CC
++lt_save_CFLAGS=$CFLAGS
 +lt_save_GCC=$GCC
 +GCC=yes
 +CC=${GCJ-"gcj"}
++CFLAGS=$GCJFLAGS
 +compiler=$CC
 +_LT_TAGVAR(compiler, $1)=$CC
 +_LT_TAGVAR(LD, $1)="$LD"
@@ -11861,6 +11015,8 @@
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +
 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 +
 +if test -n "$compiler"; then
 +  _LT_COMPILER_NO_RTTI($1)
@@ -11876,7 +11032,8 @@
 +AC_LANG_RESTORE
 +
 +GCC=$lt_save_GCC
-+CC="$lt_save_CC"
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
 +])# _LT_LANG_GCJ_CONFIG
 +
 +
@@ -11911,9 +11068,11 @@
 +
 +# Allow CC to be a program name with arguments.
 +lt_save_CC="$CC"
++lt_save_CFLAGS=$CFLAGS
 +lt_save_GCC=$GCC
 +GCC=
 +CC=${RC-"windres"}
++CFLAGS=
 +compiler=$CC
 +_LT_TAGVAR(compiler, $1)=$CC
 +_LT_CC_BASENAME([$compiler])
@@ -11926,7 +11085,8 @@
 +
 +GCC=$lt_save_GCC
 +AC_LANG_RESTORE
-+CC="$lt_save_CC"
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
 +])# _LT_LANG_RC_CONFIG
 +
 +
@@ -11985,6 +11145,15 @@
 +AC_SUBST([OBJDUMP])
 +])
 +
++# _LT_DECL_DLLTOOL
++# ----------------
++# Ensure DLLTOOL variable is set.
++m4_defun([_LT_DECL_DLLTOOL],
++[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
++AC_SUBST([DLLTOOL])
++])
 +
 +# _LT_DECL_SED
 +# ------------
@@ -12019,7 +11188,18 @@
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
 +        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+      fi
+       fi
+-      ;;
+-      darwin*)
+-        # PIC is the default on this platform
+-        # Common symbols not allowed in MH_DYLIB files
+-       case $cc_basename in
+-         xlc*)
+-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-         ;;
+-       esac
+-       ;;
 +    done
 +  done
 +done
@@ -12037,12 +11217,7 @@
 +  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
 +    lt_cv_path_SED=$lt_ac_sed
 +    break
-   fi
--],
--[
--  if test "$GCC" = yes; then
--    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++  fi
 +  while true; do
 +    cat conftest.in conftest.in >conftest.tmp
 +    mv conftest.tmp conftest.in
@@ -12065,30 +11240,13 @@
 +AC_MSG_RESULT([$SED])
 +])#AC_PROG_SED
 +])#m4_ifndef
- 
--    case $host_os in
--      aix*)
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
++
 +# Old name:
 +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([LT_AC_PROG_SED], [])
- 
--    amigaos*)
--      # FIXME: we need at least 68020 code to build shared libraries, but
--      # adding the `-m68020' flag to GCC prevents building anything better,
--      # like `-m68040'.
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
--      ;;
- 
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
++
++
 +# _LT_CHECK_SHELL_FEATURES
 +# ------------------------
 +# Find out whether the shell is Bourne or XSI compatible,
@@ -12098,8 +11256,8 @@
 +# Try some XSI features
 +xsi_shell=no
 +( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,, \
++  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
++      = c,a/b,b/c, \
 +    && eval 'test $(( 1 + 1 )) -eq 2 \
 +    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
 +  && xsi_shell=yes
@@ -12126,10 +11284,20 @@
 +fi
 +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
  
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+-    hpux9* | hpux10* | hpux11*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 -      ;;
 +# test EBCDIC or ASCII
 +case `echo X|tr X '\101'` in
@@ -12148,262 +11316,122 @@
 +])# _LT_CHECK_SHELL_FEATURES
 +
 +
-+# _LT_PROG_XSI_SHELLFNS
-+# ---------------------
-+# Bourne and XSI compatible variants of some useful shell functions.
-+m4_defun([_LT_PROG_XSI_SHELLFNS],
-+[case $xsi_shell in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+}
++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
++# ------------------------------------------------------
++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
++m4_defun([_LT_PROG_FUNCTION_REPLACE],
++[dnl {
++sed -e '/^$1 ()$/,/^} # $1 /c\
++$1 ()\
++{\
++m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++])
  
--    msdosdjgpp*)
--      # Just because we use GCC doesn't mean we suddenly get shared libraries
--      # on systems that don't support them.
--      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--      enable_shared=no
+-    irix5* | irix6* | nonstopux*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 -      ;;
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result="${1##*/}"
-+}
  
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
--      fi
+-    newsos6)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 -      ;;
-+# func_dirname_and_basename file append nondir_replacement
-+# perform func_basename and func_dirname in a single function
-+# call:
-+#   dirname:  Compute the dirname of FILE.  If nonempty,
-+#             add APPEND to the result, otherwise set result
-+#             to NONDIR_REPLACEMENT.
-+#             value returned in "$func_dirname_result"
-+#   basename: Compute filename of FILE.
-+#             value retuned in "$func_basename_result"
-+# Implementation must be kept synchronized with func_dirname
-+# and func_basename. For efficiency, we do not delegate to
-+# those functions but instead duplicate the functionality here.
-+func_dirname_and_basename ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+  func_basename_result="${1##*/}"
-+}
++# _LT_PROG_REPLACE_SHELLFNS
++# -------------------------
++# Replace existing portable implementations of several shell functions with
++# equivalent extended shell implementations where those features are available..
++m4_defun([_LT_PROG_REPLACE_SHELLFNS],
++[if test x"$xsi_shell" = xyes; then
++  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
++    case ${1} in
++      */*) func_dirname_result="${1%/*}${2}" ;;
++      *  ) func_dirname_result="${3}" ;;
++    esac])
++
++  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
++    func_basename_result="${1##*/}"])
++
++  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
++    case ${1} in
++      */*) func_dirname_result="${1%/*}${2}" ;;
++      *  ) func_dirname_result="${3}" ;;
++    esac
++    func_basename_result="${1##*/}"])
  
--    hpux*)
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
--      case "$host_cpu" in
--      hppa*64*|ia64*)
--	# +Z the default
--	;;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	;;
+-    linux*)
+-      case $cc_basename in
+-      icc* | ecc*)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-        ;;
+-      pgcc* | pgf77* | pgf90* | pgf95*)
+-        # Portland Group compilers (*not* the Pentium gcc compiler,
+-	# which looks to be a dead project)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-        ;;
+-      ccc*)
+-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-        # All Alpha code is PIC.
+-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-        ;;
 -      esac
 -      ;;
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+func_stripname ()
-+{
-+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+  # positional parameters, so assign one to ordinary parameter first.
-+  func_stripname_result=${3}
-+  func_stripname_result=${func_stripname_result#"${1}"}
-+  func_stripname_result=${func_stripname_result%"${2}"}
-+}
- 
--    *)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--      ;;
--    esac
--  else
--    # PORTME Check for flag to pass linker flags through the system compiler.
--    case $host_os in
--    aix*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      else
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
--      fi
--      ;;
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=${1%%=*}
-+  func_opt_split_arg=${1#*=}
-+}
- 
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
--      ;;
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  case ${1} in
-+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+    *)    func_lo2o_result=${1} ;;
-+  esac
-+}
- 
--    hpux9* | hpux10* | hpux11*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
--      case "$host_cpu" in
--      hppa*64*|ia64*)
--	# +Z the default
--	;;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
--	;;
--      esac
--      # Is there a better lt_prog_compiler_static that works with the bundled CC?
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
--      ;;
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=${1%.*}.lo
-+}
- 
--    irix5* | irix6* | nonstopux*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      # PIC (with -KPIC) is the default.
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--      ;;
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $[*] ))
-+}
- 
--    newsos6)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
- 
--    linux*)
--      case $CC in
--      icc* | ecc*)
--	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
--        ;;
--      ccc*)
--        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--        # All Alpha code is PIC.
--        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--        ;;
--      esac
--      ;;
-+_LT_EOF
-+    ;;
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
++  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
++    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++    # positional parameters, so assign one to ordinary parameter first.
++    func_stripname_result=${3}
++    func_stripname_result=${func_stripname_result#"${1}"}
++    func_stripname_result=${func_stripname_result%"${2}"}])
  
 -    osf3* | osf4* | osf5*)
 -      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 -      # All OSF/1 code is PIC.
 -      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 -      ;;
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  # Extract subdirectory from the argument.
-+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-+  if test "X$func_dirname_result" = "X${1}"; then
-+    func_dirname_result="${3}"
-+  else
-+    func_dirname_result="$func_dirname_result${2}"
-+  fi
-+}
- 
--    sco3.2v5*)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
--      ;;
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
++  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
++    func_split_long_opt_name=${1%%=*}
++    func_split_long_opt_arg=${1#*=}])
  
 -    solaris*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 -      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 -      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      case $cc_basename in
+-      f77* | f90* | f95*)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+-      esac
 -      ;;
-+dnl func_dirname_and_basename
-+dnl A portable version of this function is already defined in general.m4sh
-+dnl so there is no need for it here.
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+  case ${2} in
-+    .*) func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-+  esac
-+}
++  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
++    func_split_short_opt_arg=${1#??}
++    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
  
 -    sunos4*)
 -      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 -      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 -      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 -      ;;
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[[^=]]*=//'
++  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
++    case ${1} in
++      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++      *)    func_lo2o_result=${1} ;;
++    esac])
  
--    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-    sysv4 | sysv4.2uw2* | sysv4.3*)
 -      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 -      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 -      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 -      ;;
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-+}
++  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
  
 -    sysv4*MP*)
 -      if test -d /usr/nec ;then
@@ -12411,21 +11439,31 @@
 -	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 -      fi
 -      ;;
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-+}
++  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+ 
+-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
++fi
+ 
+-    unicos*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      ;;
++if test x"$lt_shell_append" = xyes; then
++  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
  
 -    uts4*)
 -      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 -      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 -      ;;
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-+}
++  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
++    func_quote_for_eval "${2}"
++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
++    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
  
 -    *)
 -      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
@@ -12434,11 +11472,18 @@
 -  fi
 -])
 -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=`expr "$[@]"`
-+}
++  # Save a `func_append' function call where possible by direct use of '+='
++  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
++    && mv -f "$cfgfile.tmp" "$cfgfile" \
++      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++  test 0 -eq $? || _lt_function_replace_fail=:
++else
++  # Save a `func_append' function call even when '+=' is not available
++  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
++    && mv -f "$cfgfile.tmp" "$cfgfile" \
++      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++  test 0 -eq $? || _lt_function_replace_fail=:
++fi
  
 -#
 -# Check to make sure the PIC flag actually works.
@@ -12453,26 +11498,103 @@
 -     esac],
 -    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
 -     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
--fi
--case "$host_os" in
++if test x"$_lt_function_replace_fail" = x":"; then
++  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+ fi
+-case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
 -  *djgpp*)
 -    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--    ;;
++])
++
++# _LT_PATH_CONVERSION_FUNCTIONS
++# -----------------------------
++# Determine which file name conversion functions should be used by
++# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
++# for certain cross-compile configurations and native mingw.
++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_MSG_CHECKING([how to convert $build file names to $host format])
++AC_CACHE_VAL(lt_cv_to_host_file_cmd,
++[case $host in
++  *-*-mingw* )
++    case $build in
++      *-*-mingw* ) # actually msys
++        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
++        ;;
++      *-*-cygwin* )
++        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
++        ;;
++      * ) # otherwise, assume *nix
++        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
++        ;;
++    esac
+     ;;
 -  *)
 -    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
--    ;;
--esac
++  *-*-cygwin* )
++    case $build in
++      *-*-mingw* ) # actually msys
++        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
++        ;;
++      *-*-cygwin* )
++        lt_cv_to_host_file_cmd=func_convert_file_noop
++        ;;
++      * ) # otherwise, assume *nix
++        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
++        ;;
++    esac
++    ;;
++  * ) # unhandled hosts (and "normal" native builds)
++    lt_cv_to_host_file_cmd=func_convert_file_noop
++    ;;
++esac
++])
++to_host_file_cmd=$lt_cv_to_host_file_cmd
++AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
++         [0], [convert $build file names to $host format])dnl
++
++AC_MSG_CHECKING([how to convert $build file names to toolchain format])
++AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
++[#assume ordinary cross tools, or native build.
++lt_cv_to_tool_file_cmd=func_convert_file_noop
++case $host in
++  *-*-mingw* )
++    case $build in
++      *-*-mingw* ) # actually msys
++        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
++        ;;
++    esac
+     ;;
+ esac
++])
++to_tool_file_cmd=$lt_cv_to_tool_file_cmd
++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
++         [0], [convert $build files to toolchain format])dnl
++])# _LT_PATH_CONVERSION_FUNCTIONS
+ 
++# Helper functions for option handling.                    -*- Autoconf -*-
+ #
+-# Check to make sure the static flag actually works.
++#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
++#   Inc.
++#   Written by Gary V. Vaughan, 2004
+ #
+-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $lt_tmp_static_flag,
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
 -])
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
  
-+_LT_EOF
-+esac
++# serial 7 ltoptions.m4
  
 -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
 -# ------------------------------------
@@ -12490,25 +11612,14 @@
 -    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
-+case $lt_shell_append in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]+=\$[2]"
-+}
-+_LT_EOF
-     ;;
+-    ;;
 -  pw32*)
 -    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
 -  ;;
 -  cygwin* | mingw*)
--    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 -  ;;
-   *)
+-  *)
 -    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 -  ;;
 -  esac
@@ -12549,8 +11660,8 @@
 -  # rely on this symbol name, it's probably fine to never include it in
 -  # preloaded symbol tables.
 -  extract_expsyms_cmds=
-+    cat << \_LT_EOF >> "$cfgfile"
- 
+-  # Just being paranoid about ensuring that cc_basename is set.
+-  _LT_CC_BASENAME([$compiler])
 -  case $host_os in
 -  cygwin* | mingw* | pw32*)
 -    # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -12560,32 +11671,42 @@
 -      with_gnu_ld=no
 -    fi
 -    ;;
+-  interix*)
+-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+-    with_gnu_ld=yes
+-    ;;
 -  openbsd*)
 -    with_gnu_ld=no
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]=\$$[1]\$[2]"
-+}
-+
-+_LT_EOF
-     ;;
-   esac
-+])
- 
+-    ;;
+-  esac
+-
 -  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
 -  if test "$with_gnu_ld" = yes; then
 -    # If archive_cmds runs LD, not CC, wlarc should be empty
 -    wlarc='${wl}'
-+# Helper functions for option handling.                    -*- Autoconf -*-
-+#
-+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+ 
+-    # Set some defaults for GNU ld with shared library support. These
+-    # are reset later if shared libraries are not supported. Putting them
+-    # here allows them to be overridden if necessary.
+-    runpath_var=LD_RUN_PATH
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-    supports_anon_versioning=no
+-    case `$LD -v 2>/dev/null` in
+-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-      *\ 2.11.*) ;; # other 2.11 versions
+-      *) supports_anon_versioning=yes ;;
+-    esac
  
 -    # See if GNU ld supports shared libraries.
 -    case $host_os in
@@ -12594,10 +11715,10 @@
 -      if test "$host_cpu" != ia64; then
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 -	cat <<EOF 1>&2
-+# serial 6 ltoptions.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
++# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
++# ------------------------------------------
++m4_define([_LT_MANGLE_OPTION],
++[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
  
 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
 -*** to be unable to reliably create shared libraries on AIX.
@@ -12608,10 +11729,17 @@
 -EOF
 -      fi
 -      ;;
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
++# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
++# ---------------------------------------
++# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
++# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
++# saved as a flag.
++m4_define([_LT_SET_OPTION],
++[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
++m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
++        _LT_MANGLE_DEFUN([$1], [$2]),
++    [m4_warning([Unknown $1 option `$2'])])[]dnl
++])
  
 -    amigaos*)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
@@ -12637,17 +11765,11 @@
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      fi
 -      ;;
-+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-+# ---------------------------------------
-+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-+# saved as a flag.
-+m4_define([_LT_SET_OPTION],
-+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-+        _LT_MANGLE_DEFUN([$1], [$2]),
-+    [m4_warning([Unknown $1 option `$2'])])[]dnl
-+])
++# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
++# ------------------------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++m4_define([_LT_IF_OPTION],
++[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
  
 -    cygwin* | mingw* | pw32*)
 -      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
@@ -12656,10 +11778,10 @@
 -      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
 -      _LT_AC_TAGVAR(always_export_symbols, $1)=no
 -      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
  
 -      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -	# 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
@@ -12668,31 +11790,11 @@
 -	  echo EXPORTS > $output_objdir/$soname.def;
 -	  cat $export_symbols >> $output_objdir/$soname.def;
 -	fi~
--	$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
--      ;;
-+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-+# ------------------------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+m4_define([_LT_IF_OPTION],
-+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
- 
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--	wlarc=
+-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      fi
 -      ;;
- 
--    solaris* | sysv5*)
--      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	cat <<EOF 1>&2
 +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
 +# -------------------------------------------------------
 +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
@@ -12705,21 +11807,40 @@
 +])[]dnl
 +])
  
--*** Warning: The releases 2.8.* of the GNU linker cannot reliably
--*** create shared libraries on Solaris systems.  Therefore, libtool
--*** is disabling shared libraries support.  We urge you to upgrade GNU
--*** binutils to release 2.9.1 or newer.  Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
- 
--EOF
--      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
+-    interix3*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-      # Instead, shared libraries are loaded at an image base (0x10000000 by
+-      # default) and relocated if they conflict, which is a slow very memory
+-      # consuming and fragmenting process.  To avoid this, we pick a random,
+-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 -      ;;
+ 
+-    linux*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	tmp_addflag=
+-	case $cc_basename,$host_cpu in
+-	pgcc*)				# Portland Group C compiler
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag'
+-	  ;;
+-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag -Mnomain' ;;
+-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+-	  tmp_addflag=' -i_dynamic' ;;
+-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+-	ifc* | ifort*)			# Intel Fortran compiler
+-	  tmp_addflag=' -nofor_main' ;;
+-	esac
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
 +# ----------------------------------------
 +# OPTION-LIST is a space-separated list of Libtool options associated
@@ -12752,37 +11873,102 @@
 +  ])
 +])# _LT_SET_OPTIONS
  
+-	if test $supports_anon_versioning = yes; then
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-  $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-	fi
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
+-      ;;
+ 
+-    solaris*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<EOF 1>&2
++# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
++# -----------------------------------------
++m4_define([_LT_MANGLE_DEFUN],
++[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+ 
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
+ 
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
++# -----------------------------------------------
++m4_define([LT_OPTION_DEFINE],
++[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
++])# LT_OPTION_DEFINE
+ 
+-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+-      case `$LD -v 2>&1` in
+-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<_LT_EOF 1>&2
+ 
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+-*** reliably create shared libraries on SCO systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++# dlopen
++# ------
++LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
++])
+ 
+-_LT_EOF
+-	;;
+-	*)
+-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+-	  else
+-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	  fi
+-	;;
+-      esac
+-      ;;
++AU_DEFUN([AC_LIBTOOL_DLOPEN],
++[_LT_SET_OPTION([LT_INIT], [dlopen])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `dlopen' option into LT_INIT's first parameter.])
++])
+ 
 -    sunos4*)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 -      wlarc=
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
- 
--  linux*)
--    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
--      fi
--    else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi
--    ;;
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
  
 -    *)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12793,21 +11979,12 @@
 -      fi
 -      ;;
 -    esac
-+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-+# -----------------------------------------
-+m4_define([_LT_MANGLE_DEFUN],
-+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
  
--    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
--      runpath_var=LD_RUN_PATH
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--      fi
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+-      runpath_var=
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
 -    fi
 -  else
 -    # PORTME fill in a description of your system's linker (not GNU ld)
@@ -12819,12 +11996,17 @@
 -      # Note: this linker hardcodes the directories in LIBPATH if there
 -      # are no directories specified by -L.
 -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      if test "$GCC" = yes && test -z "$link_static_flag"; then
+-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 -	# Neither direct hardcoding nor static linking is supported with a
 -	# broken collect2.
 -	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
 -      fi
 -      ;;
++# win32-dll
++# ---------
++# Declare package support for building win32 dll's.
++LT_OPTION_DEFINE([LT_INIT], [win32-dll],
++[enable_win32_dll=yes
  
 -    aix4* | aix5*)
 -      if test "$host_cpu" = ia64; then
@@ -12842,11 +12024,13 @@
 -	  _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
 -	aix_use_runtimelinking=no
-+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-+# -----------------------------------------------
-+m4_define([LT_OPTION_DEFINE],
-+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-+])# LT_OPTION_DEFINE
++case $host in
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
++  AC_CHECK_TOOL(AS, as, false)
++  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++  ;;
++esac
  
 -	# Test if we are trying to use run time linking or normal
 -	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -12858,37 +12042,40 @@
 -  	    break
 -  	  fi
 -	  done
+-	  ;;
 -	esac
++test -z "$AS" && AS=as
++_LT_DECL([], [AS],      [1], [Assembler program])dnl
  
 -	exp_sym_flag='-bexport'
 -	no_entry_flag='-bnoentry'
 -      fi
-+# dlopen
-+# ------
-+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-+])
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
  
 -      # When large executables or shared objects are built, AIX ld can
 -      # have problems creating the table of contents.  If linking a library
 -      # or program results in "error TOC overflow" add -mminimal-toc to
 -      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
 -      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+AU_DEFUN([AC_LIBTOOL_DLOPEN],
-+[_LT_SET_OPTION([LT_INIT], [dlopen])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
-+])
++test -z "$OBJDUMP" && OBJDUMP=objdump
++_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
++])# win32-dll
  
 -      _LT_AC_TAGVAR(archive_cmds, $1)=''
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
 -      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
++AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++_LT_SET_OPTION([LT_INIT], [win32-dll])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `win32-dll' option into LT_INIT's first parameter.])
++])
  
 -      if test "$GCC" = yes; then
--	case $host_os in aix4.[012]|aix4.[012].*)
+-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 -	# We only want to do this on AIX 4.2 and lower, the check
 -	# below for broken collect2 doesn't work under 4.3+
 -	  collect2name=`${CC} -print-prog-name=collect2`
@@ -12907,8 +12094,12 @@
 -  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 -  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 -	  fi
+-	  ;;
 -	esac
 -	shared_flag='-shared'
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag="$shared_flag "'${wl}-G'
+-	fi
 -      else
 -	# not using gcc
 -	if test "$host_cpu" = ia64; then
@@ -12916,13 +12107,15 @@
 -  	# chokes on -Wl,-G. The following line is correct:
 -	  shared_flag='-G'
 -	else
--  	if test "$aix_use_runtimelinking" = yes; then
+-	  if test "$aix_use_runtimelinking" = yes; then
 -	    shared_flag='${wl}-G'
 -	  else
 -	    shared_flag='${wl}-bM:SRE'
--  	fi
+-	  fi
 -	fi
 -      fi
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
  
 -      # It seems that -bexpall does not export symbols beginning with
 -      # underscore (_), so it is better to generate a list of symbols to export.
@@ -12934,12 +12127,12 @@
 -       # Determine the default libpath from the value encoded in an empty executable.
 -       _LT_AC_SYS_LIBPATH_AIX
 -       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 -       else
 -	if test "$host_cpu" = ia64; then
 -	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 -	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 -	else
 -	 # Determine the default libpath from the value encoded in an empty executable.
 -	 _LT_AC_SYS_LIBPATH_AIX
@@ -12948,21 +12141,41 @@
 -	  # -berok will link without error, but may produce a broken library.
 -	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 -	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	  # -bexpall does not export symbols beginning with underscore (_)
--	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
 -	  # Exported symbols can be pulled into shared objects from archives
--	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 -	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
--	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--	fi
+-	  # This is similar to how AIX traditionally builds its shared libraries.
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++
++# _LT_ENABLE_SHARED([DEFAULT])
++# ----------------------------
++# implement the --enable-shared flag, and supports the `shared' and
++# `disable-shared' LT_INIT options.
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++m4_define([_LT_ENABLE_SHARED],
++[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([shared],
++    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
+ 	fi
 -      fi
--      ;;
-+# win32-dll
-+# ---------
-+# Declare package support for building win32 dll's.
-+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-+[enable_win32_dll=yes
++      done
++      IFS="$lt_save_ifs"
+       ;;
++    esac],
++    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
  
 -    amigaos*)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
@@ -12971,19 +12184,15 @@
 -      # see comment about different semantics on the GNU ld section
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      ;;
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+  ;;
-+esac
++    _LT_DECL([build_libtool_libs], [enable_shared], [0],
++	[Whether or not to build shared libraries])
++])# _LT_ENABLE_SHARED
  
--    bsdi4*)
+-    bsdi[[45]]*)
 -      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
 -      ;;
-+test -z "$AS" && AS=as
-+_LT_DECL([], [AS],      [0], [Assembler program])dnl
++LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
  
 -    cygwin* | mingw* | pw32*)
 -      # When not using gcc, we currently assume that we are using
@@ -12995,90 +12204,88 @@
 -      # Tell ltmain to make .lib files, not .a files.
 -      libext=lib
 -      # Tell ltmain to make .dll files, not .so files.
--      shrext=".dll"
+-      shrext_cmds=".dll"
 -      # FIXME: Setting linknames here is a bad hack.
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$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.
 -      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
 -      # FIXME: Should let the user specify the lib program.
 -      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
+-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
 -      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 -      ;;
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
++# Old names:
++AC_DEFUN([AC_ENABLE_SHARED],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
++])
  
 -    darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      case "$host_os" in
--      rhapsody* | darwin1.[[012]])
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[[012]])
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
+-      case $host_os in
+-        rhapsody* | darwin1.[[012]])
+-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[[012]])
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
 -      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=no
 -      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
 -      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    if test "$GCC" = yes ; then
+-    	output_verbose_link_cmd='echo'
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -    else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-          ;;
+-      esac
 -    fi
 -      ;;
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-+])# win32-dll
++AC_DEFUN([AC_DISABLE_SHARED],
++[_LT_SET_OPTION([LT_INIT], [disable-shared])
++])
  
 -    dgux*)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+_LT_SET_OPTION([LT_INIT], [win32-dll])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
-+])
++AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
++AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
  
 -    freebsd1*)
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      ;;
 +dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
++dnl AC_DEFUN([AM_ENABLE_SHARED], [])
++dnl AC_DEFUN([AM_DISABLE_SHARED], [])
  
 -    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
 -    # support.  Future versions do this automatically, but an explicit c++rt0.o
@@ -13097,45 +12304,42 @@
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+# _LT_ENABLE_SHARED([DEFAULT])
+-      ;;
+ 
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++# _LT_ENABLE_STATIC([DEFAULT])
 +# ----------------------------
-+# implement the --enable-shared flag, and supports the `shared' and
-+# `disable-shared' LT_INIT options.
++# implement the --enable-static flag, and support the `static' and
++# `disable-static' LT_INIT options.
 +# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_SHARED],
-+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([shared],
-+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
++m4_define([_LT_ENABLE_STATIC],
++[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([static],
++    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
 +    [p=${PACKAGE-default}
 +    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
 +    *)
-+      enable_shared=no
++     enable_static=no
 +      # Look at the argument we got.  We use all the common list separators.
 +      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 +      for pkg in $enableval; do
 +	IFS="$lt_save_ifs"
 +	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
++	  enable_static=yes
 +	fi
 +      done
 +      IFS="$lt_save_ifs"
        ;;
 +    esac],
-+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
- 
--    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
-+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-+	[Whether or not to build shared libraries])
-+])# _LT_ENABLE_SHARED
++    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
  
 -    hpux9*)
 -      if test "$GCC" = yes; then
@@ -13146,67 +12350,88 @@
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 -      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
++    _LT_DECL([build_old_libs], [enable_static], [0],
++	[Whether or not to build static libraries])
++])# _LT_ENABLE_STATIC
  
 -      # hardcode_minus_L: Not really in the search PATH,
 -      # but as the default location of the library.
 -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
 -      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 -      ;;
++LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+ 
+-    hpux10*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 +# Old names:
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
++AC_DEFUN([AC_ENABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
 +])
  
--    hpux10* | hpux11*)
+-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++AC_DEFUN([AC_DISABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], [disable-static])
++])
+ 
+-	# hardcode_minus_L: Not really in the search PATH,
+-	# but as the default location of the library.
+-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      fi
+-      ;;
++AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+ 
+-    hpux11*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*|ia64*)
+-	case $host_cpu in
+-	hppa*64*)
 -	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
 -	*)
 -	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
 -	esac
 -      else
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
 -	*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
 -	esac
 -      fi
 -      if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*)
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_ENABLE_STATIC], [])
++dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+ 
+-	case $host_cpu in
+-	hppa*64*|ia64*)
 -	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
--	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
--	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--	  ;;
--	ia64*)
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 -	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
 -	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], [disable-shared])
-+])
- 
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
 -	  ;;
 -	*)
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 -	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
  
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
@@ -13215,9 +12440,6 @@
 -	esac
 -      fi
 -      ;;
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
  
 -    irix5* | irix6* | nonstopux*)
 -      if test "$GCC" = yes; then
@@ -13229,36 +12451,34 @@
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 -      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 -      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+
-+# _LT_ENABLE_STATIC([DEFAULT])
-+# ----------------------------
-+# implement the --enable-static flag, and support the `static' and
-+# `disable-static' LT_INIT options.
++# _LT_ENABLE_FAST_INSTALL([DEFAULT])
++# ----------------------------------
++# implement the --enable-fast-install flag, and support the `fast-install'
++# and `disable-fast-install' LT_INIT options.
 +# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_STATIC],
-+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([static],
-+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
++m4_define([_LT_ENABLE_FAST_INSTALL],
++[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([fast-install],
++    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
 +    [p=${PACKAGE-default}
 +    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
 +    *)
-+     enable_static=no
++      enable_fast_install=no
 +      # Look at the argument we got.  We use all the common list separators.
 +      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 +      for pkg in $enableval; do
 +	IFS="$lt_save_ifs"
 +	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
++	  enable_fast_install=yes
 +	fi
 +      done
 +      IFS="$lt_save_ifs"
        ;;
 +    esac],
-+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
++    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
  
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -13270,9 +12490,20 @@
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+    _LT_DECL([build_old_libs], [enable_static], [0],
-+	[Whether or not to build static libraries])
-+])# _LT_ENABLE_STATIC
++_LT_DECL([fast_install], [enable_fast_install], [0],
++	 [Whether or not to optimize for fast installation])dnl
++])# _LT_ENABLE_FAST_INSTALL
++
++LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
++
++# Old names:
++AU_DEFUN([AC_ENABLE_FAST_INSTALL],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you put
++the `fast-install' option into LT_INIT's first parameter.])
++])
  
 -    newsos6)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -13281,14 +12512,19 @@
 -      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
++AU_DEFUN([AC_DISABLE_FAST_INSTALL],
++[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you put
++the `disable-fast-install' option into LT_INIT's first parameter.])
++])
  
 -    openbsd*)
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 -	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 -	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 -      else
@@ -13304,10 +12540,9 @@
 -       esac
 -      fi
 -      ;;
-+# Old names:
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-+])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
++dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
  
 -    os2*)
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -13316,9 +12551,6 @@
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
 -      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
 -      ;;
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], [disable-static])
-+])
  
 -    osf3*)
 -      if test "$GCC" = yes; then
@@ -13331,8 +12563,17 @@
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 -      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 -      ;;
-+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++# _LT_WITH_PIC([MODE])
++# --------------------
++# implement the --with-pic flag, and support the `pic-only' and `no-pic'
++# LT_INIT options.
++# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
++m4_define([_LT_WITH_PIC],
++[AC_ARG_WITH([pic],
++    [AS_HELP_STRING([--with-pic],
++	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++    [pic_mode="$withval"],
++    [pic_mode=default])
  
 -    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 -      if test "$GCC" = yes; then
@@ -13343,32 +12584,26 @@
 -	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
++test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
  
 -	# Both c and cxx compiler support -rpath directly
 -	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 -      fi
 -      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 -      ;;
- 
--    sco3.2v5*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
--      runpath_var=LD_RUN_PATH
--      hardcode_runpath_var=yes
--      ;;
++_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
++])# _LT_WITH_PIC
  
 -    solaris*)
 -      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
 -      if test "$GCC" = yes; then
+-	wlarc='${wl}'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
 -      else
+-	wlarc=''
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -13377,38 +12612,23 @@
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      case $host_os in
 -      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+-      *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
 -      esac
 -      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-+# ----------------------------------
-+# implement the --enable-fast-install flag, and support the `fast-install'
-+# and `disable-fast-install' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_FAST_INSTALL],
-+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([fast-install],
-+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_fast_install=yes ;;
-+    no) enable_fast_install=no ;;
-+    *)
-+      enable_fast_install=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_fast_install=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-       ;;
-+    esac],
-+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+-      ;;
++LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
  
 -    sunos4*)
 -      if test "x$host_vendor" = xsequent; then
@@ -13423,19 +12643,12 @@
 -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+_LT_DECL([fast_install], [enable_fast_install], [0],
-+	 [Whether or not to optimize for fast installation])dnl
-+])# _LT_ENABLE_FAST_INSTALL
-+
-+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-+
-+# Old names:
-+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
++# Old name:
++AU_DEFUN([AC_LIBTOOL_PICMODE],
++[_LT_SET_OPTION([LT_INIT], [pic-only])
 +AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `fast-install' option into LT_INIT's first parameter.])
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `pic-only' option into LT_INIT's first parameter.])
 +])
  
 -    sysv4)
@@ -13459,21 +12672,14 @@
 -      runpath_var='LD_RUN_PATH'
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `disable-fast-install' option into LT_INIT's first parameter.])
-+])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
  
 -    sysv4.3*)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
 -      ;;
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
  
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
@@ -13484,111 +12690,133 @@
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
 -      fi
 -      ;;
++m4_define([_LTDL_MODE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
++		 [m4_define([_LTDL_MODE], [nonrecursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [recursive],
++		 [m4_define([_LTDL_MODE], [recursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [subproject],
++		 [m4_define([_LTDL_MODE], [subproject])])
++
++m4_define([_LTDL_TYPE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [installable],
++		 [m4_define([_LTDL_TYPE], [installable])])
++LT_OPTION_DEFINE([LTDL_INIT], [convenience],
++		 [m4_define([_LTDL_TYPE], [convenience])])
  
--    sysv4.2uw2*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      hardcode_runpath_var=yes
--      runpath_var=LD_RUN_PATH
--      ;;
-+# _LT_WITH_PIC([MODE])
-+# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-+# LT_INIT options.
-+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-+m4_define([_LT_WITH_PIC],
-+[AC_ARG_WITH([pic],
-+    [AS_HELP_STRING([--with-pic],
-+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+    [pic_mode="$withval"],
-+    [pic_mode=default])
+-      runpath_var='LD_RUN_PATH'
++# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
++#
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
  
--   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
--      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
 -      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      fi
--      runpath_var='LD_RUN_PATH'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
++# serial 6 ltsugar.m4
  
--    sysv5*)
--      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
--      # $CC -shared without GNU ld will not create a library from C++
--      # object files and a static libstdc++, better avoid it by now
--      _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'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-    sysv5* | sco3.2v5* | sco5v6*)
+-      # Note: We can NOT use -z defs as we might desire, because we do not
+-      # link with -lc, and that would cause any symbols used from libc to
+-      # always be unresolved, which means just about no library would
+-      # ever link correctly.  If we're not using GNU ld we use -z text
+-      # though, which does catch some bad symbols but isn't as heavy-handed
+-      # as -z defs.
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
 -      runpath_var='LD_RUN_PATH'
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+ 
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
 -      ;;
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
  
 -    uts4*)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -      ;;
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
++# lt_join(SEP, ARG1, [ARG2...])
++# -----------------------------
++# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
++# associated separator.
++# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
++# versions in m4sugar had bugs.
++m4_define([lt_join],
++[m4_if([$#], [1], [],
++       [$#], [2], [[$2]],
++       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
++m4_define([_lt_join],
++[m4_if([$#$2], [2], [],
++       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
  
 -    *)
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -      ;;
 -    esac
 -  fi
-+# Old name:
-+AU_DEFUN([AC_LIBTOOL_PICMODE],
-+[_LT_SET_OPTION([LT_INIT], [pic-only])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
- ])
+-])
 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
--  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-+
- 
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+		 [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+		 [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+		 [m4_define([_LTDL_MODE], [subproject])])
++# lt_car(LIST)
++# lt_cdr(LIST)
++# ------------
++# Manipulate m4 lists.
++# These macros are necessary as long as will still need to support
++# Autoconf-2.59 which quotes differently.
++m4_define([lt_car], [[$1]])
++m4_define([lt_cdr],
++[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
++       [$#], 1, [],
++       [m4_dquote(m4_shift($@))])])
++m4_define([lt_unquote], $1)
 +
-+m4_define([_LTDL_TYPE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [installable],
-+		 [m4_define([_LTDL_TYPE], [installable])])
-+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-+		 [m4_define([_LTDL_TYPE], [convenience])])
 +
-+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
++# lt_append(MACRO-NAME, STRING, [SEPARATOR])
++# ------------------------------------------
++# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
++# Note that neither SEPARATOR nor STRING are expanded; they are appended
++# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
++# No SEPARATOR is output if MACRO-NAME was previously undefined (different
++# than defined and empty).
  #
 -# Do we need to explicitly link libc?
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
- #
+-#
 -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
 -x|xyes)
 -  # Assume -lc should be added
 -  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
++# This macro is needed until we can rely on Autoconf 2.62, since earlier
++# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
++m4_define([lt_append],
++[m4_define([$1],
++	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
  
 -  if test "$enable_shared" = yes && test "$GCC" = yes; then
 -    case $_LT_AC_TAGVAR(archive_cmds, $1) in
@@ -13602,14 +12830,14 @@
 -      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
 -      $rm conftest*
 -      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+# serial 6 ltsugar.m4
- 
+-
 -      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
 -        soname=conftest
 -        lib=conftest
 -        libobjs=conftest.$ac_objext
 -        deplibs=
 -        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
 -        compiler_flags=-v
 -        linker_flags=-v
 -        verstring=
@@ -13635,8 +12863,6 @@
 -  ;;
 -esac
 -])# AC_LIBTOOL_PROG_LD_SHLIBS
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
  
  
 -# _LT_AC_FILE_LTDLL_C
@@ -13677,64 +12903,6 @@
 -# }
 -# /* ltdll.c ends here */
 -])# _LT_AC_FILE_LTDLL_C
-+# lt_join(SEP, ARG1, [ARG2...])
-+# -----------------------------
-+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-+# associated separator.
-+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-+# versions in m4sugar had bugs.
-+m4_define([lt_join],
-+[m4_if([$#], [1], [],
-+       [$#], [2], [[$2]],
-+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-+m4_define([_lt_join],
-+[m4_if([$#$2], [2], [],
-+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
- 
- 
--# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
--# ---------------------------------
--AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-+# lt_car(LIST)
-+# lt_cdr(LIST)
-+# ------------
-+# Manipulate m4 lists.
-+# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
-+m4_define([lt_car], [[$1]])
-+m4_define([lt_cdr],
-+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-+       [$#], 1, [],
-+       [m4_dquote(m4_shift($@))])])
-+m4_define([lt_unquote], $1)
-+
-+
-+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-+# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-+# Note that neither SEPARATOR nor STRING are expanded; they are appended
-+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-+# than defined and empty).
-+#
-+# This macro is needed until we can rely on Autoconf 2.62, since earlier
-+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-+m4_define([lt_append],
-+[m4_define([$1],
-+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
- 
- 
--# old names
--AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
--AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
--AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
--AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
--AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
--AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
--AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
- 
--# This is just to silence aclocal about the macro not being used
--ifelse([AC_DISABLE_FAST_INSTALL])
 +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
 +# ----------------------------------------------------------
 +# Produce a SEP delimited list of all paired combinations of elements of
@@ -13761,84 +12929,36 @@
 +		 [$5])],
 +	  [lt_append([$1], [$2], [$3])$4])])
  
--AC_DEFUN([LT_AC_PROG_GCJ],
--[AC_CHECK_TOOL(GCJ, gcj, no)
--  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
--  AC_SUBST(GCJFLAGS)
--])
  
--AC_DEFUN([LT_AC_PROG_RC],
--[AC_CHECK_TOOL(RC, windres, no)
--])
+-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+-# ---------------------------------
+-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
 +# lt_dict_add(DICT, KEY, VALUE)
 +# -----------------------------
 +m4_define([lt_dict_add],
 +[m4_define([$1($2)], [$3])])
  
--# NOTE: This macro has been submitted for inclusion into   #
--#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
--#  a released version of Autoconf we should remove this    #
--#  macro and use it instead.                               #
--# LT_AC_PROG_SED
--# --------------
--# Check for a fully-functional sed program, that truncates
--# as few characters as possible.  Prefer GNU sed if found.
--AC_DEFUN([LT_AC_PROG_SED],
--[AC_MSG_CHECKING([for a sed that does not truncate output])
--AC_CACHE_VAL(lt_cv_path_SED,
--[# Loop through the user's path and test for sed and gsed.
--# Then use that list of sed's as ones to test for truncation.
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for lt_ac_prog in sed gsed; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
--        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
--      fi
--    done
--  done
--done
--lt_ac_max=0
--lt_ac_count=0
--# Add /usr/xpg4/bin/sed as it is typically found on Solaris
--# along with /bin/sed that truncates output.
--for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && break
--  cat /dev/null > conftest.in
--  lt_ac_count=0
--  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--  # Check for GNU sed and select it if it is found.
--  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
--    lt_cv_path_SED=$lt_ac_sed
--    break
--  fi
--  while true; do
--    cat conftest.in conftest.in >conftest.tmp
--    mv conftest.tmp conftest.in
--    cp conftest.in conftest.nl
--    echo >>conftest.nl
--    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
--    cmp -s conftest.out conftest.nl || break
--    # 10000 chars as input seems more than enough
--    test $lt_ac_count -gt 10 && break
--    lt_ac_count=`expr $lt_ac_count + 1`
--    if test $lt_ac_count -gt $lt_ac_max; then
--      lt_ac_max=$lt_ac_count
--      lt_cv_path_SED=$lt_ac_sed
--    fi
--  done
--done
--SED=$lt_cv_path_SED
-+
+ 
+-# old names
+-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
 +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
 +# --------------------------------------------
 +m4_define([lt_dict_add_subkey],
 +[m4_define([$1($2:$3)], [$4])])
-+
-+
+ 
+-# This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])
+ 
+-AC_DEFUN([LT_AC_PROG_GCJ],
+-[AC_CHECK_TOOL(GCJ, gcj, no)
+-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+-  AC_SUBST(GCJFLAGS)
 +# lt_dict_fetch(DICT, KEY, [SUBKEY])
 +# ----------------------------------
 +m4_define([lt_dict_fetch],
@@ -13863,8 +12983,9 @@
 +           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
 +		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
  ])
--AC_MSG_RESULT([$SED])
-+
+ 
+-AC_DEFUN([LT_AC_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres, no)
 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
 +#   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -13874,47 +12995,94 @@
 +# unlimited permission to copy and/or distribute it, with or without
 +# modifications, as long as this notice is preserved.
 +
-+# Generated from ltversion.in.
++# @configure_input@
 +
-+# serial 3017 ltversion.m4
++# serial 3293 ltversion.m4
 +# This file is part of GNU Libtool
 +
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
++m4_define([LT_PACKAGE_VERSION], [2.4])
++m4_define([LT_PACKAGE_REVISION], [1.3293])
 +
 +AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
++[macro_version='2.4'
++macro_revision='1.3293'
 +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 +_LT_DECL(, macro_revision, 0)
  ])
  
--#                                                        -*- Autoconf -*-
--# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
+-# NOTE: This macro has been submitted for inclusion into   #
+-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+-#  a released version of Autoconf we should remove this    #
+-#  macro and use it instead.                               #
+-# LT_AC_PROG_SED
+-# --------------
+-# Check for a fully-functional sed program, that truncates
+-# as few characters as possible.  Prefer GNU sed if found.
+-AC_DEFUN([LT_AC_PROG_SED],
+-[AC_MSG_CHECKING([for a sed that does not truncate output])
+-AC_CACHE_VAL(lt_cv_path_SED,
+-[# Loop through the user's path and test for sed and gsed.
+-# Then use that list of sed's as ones to test for truncation.
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for lt_ac_prog in sed gsed; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+-      fi
+-    done
+-  done
+-done
+-IFS=$as_save_IFS
+-lt_ac_max=0
+-lt_ac_count=0
+-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+-# along with /bin/sed that truncates output.
+-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && continue
+-  cat /dev/null > conftest.in
+-  lt_ac_count=0
+-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+-  # Check for GNU sed and select it if it is found.
+-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+-    lt_cv_path_SED=$lt_ac_sed
+-    break
+-  fi
+-  while true; do
+-    cat conftest.in conftest.in >conftest.tmp
+-    mv conftest.tmp conftest.in
+-    cp conftest.in conftest.nl
+-    echo >>conftest.nl
+-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+-    cmp -s conftest.out conftest.nl || break
+-    # 10000 chars as input seems more than enough
+-    test $lt_ac_count -gt 10 && break
+-    lt_ac_count=`expr $lt_ac_count + 1`
+-    if test $lt_ac_count -gt $lt_ac_max; then
+-      lt_ac_max=$lt_ac_count
+-      lt_cv_path_SED=$lt_ac_sed
+-    fi
+-  done
+-done
+-])
+-SED=$lt_cv_path_SED
+-AC_SUBST([SED])
+-AC_MSG_RESULT([$SED])
+-])
 +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 +#
-+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
++#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 +#   Written by Scott James Remnant, 2004.
 +#
 +# This file is free software; the Free Software Foundation gives
 +# unlimited permission to copy and/or distribute it, with or without
 +# modifications, as long as this notice is preserved.
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
-+# serial 4 lt~obsolete.m4
- 
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++
++# serial 5 lt~obsolete.m4
++
 +# These exist entirely to fool aclocal when bootstrapping libtool.
 +#
 +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
@@ -13983,7 +13151,6 @@
 +m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 +m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 +m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 +m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -13996,18 +13163,24 @@
 +m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 +m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 +m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-+
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
++m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
++m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
++m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
++m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
++m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
++m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
++m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
  
- # AM_AUTOMAKE_VERSION(VERSION)
+-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -6420,14 +8476,31 @@
  # ----------------------------
  # Automake X.Y traces this macro to ensure aclocal.m4 has been
  # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 +# (This private macro should not be called outside this file.)
 +AC_DEFUN([AM_AUTOMAKE_VERSION],
 +[am__api_version='1.11'
@@ -14031,75 +13204,32 @@
 +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.8.3])])
--
--# AM_AUX_DIR_EXPAND
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
+-	 [AM_AUTOMAKE_VERSION([1.9.6])])
 +[AM_AUTOMAKE_VERSION([1.11.1])dnl
 +m4_ifndef([AC_AUTOCONF_VERSION],
 +  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
  
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-@@ -6014,26 +8074,16 @@
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
+@@ -6484,14 +8557,14 @@
  
--# AM_CONDITIONAL                                              -*- Autoconf -*-
--
--# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
+ # AM_CONDITIONAL                                            -*- Autoconf -*-
  
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
  
--# serial 6
+-# serial 7
 +# serial 9
  
  # AM_CONDITIONAL(NAME, SHELL-CONDITION)
  # -------------------------------------
-@@ -6042,8 +8092,11 @@
+@@ -6500,8 +8573,11 @@
  [AC_PREREQ(2.52)dnl
   ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
  	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
@@ -14113,54 +13243,25 @@
  if $2; then
    $1_TRUE=
    $1_FALSE='#'
-@@ -6053,30 +8106,18 @@
- fi
- AC_CONFIG_COMMANDS_PRE(
- [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
--  AC_MSG_ERROR([conditional "$1" was never defined.
--Usually this means the macro was only invoked conditionally.])
-+  AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
+@@ -6515,15 +8591,14 @@
+ Usually this means the macro was only invoked conditionally.]])
  fi])])
  
--# serial 7						-*- Autoconf -*-
 -
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
  # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
  
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
+-# serial 8
 +# serial 10
  
  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
  # written in clear, in which case automake, when reading aclocal.m4,
-@@ -6085,7 +8126,6 @@
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -6105,6 +8145,7 @@
+@@ -6551,6 +8626,7 @@
  ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
         [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
         [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
@@ -14168,7 +13269,7 @@
         [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                     [depcc="$$1"   am_compiler_list=])
  
-@@ -6133,6 +8174,16 @@
+@@ -6579,6 +8655,16 @@
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
    fi
@@ -14185,7 +13286,7 @@
    for depmode in $am_compiler_list; do
      # Setup a source with many dependencies, because some compilers
      # like to wrap large dependency lists on column 80 (with \), and
-@@ -6150,7 +8201,17 @@
+@@ -6596,7 +8682,17 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -14203,7 +13304,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -6160,23 +8221,33 @@
+@@ -6606,18 +8702,23 @@
  	break
        fi
        ;;
@@ -14232,21 +13333,8 @@
 +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
--      # (even with -Werror).  So we grep stderr for any message
--      # that says an option was ignored.
--      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-         am_cv_$1_dependencies_compiler_type=$depmode
-         break
-       fi
-@@ -6217,77 +8288,74 @@
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -6668,61 +8769,74 @@
    AMDEPBACKSLASH='\'
  fi
  AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
@@ -14255,33 +13343,17 @@
 +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
  ])
  
--# Generate code to set up dependency tracking.   -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+ # Generate code to set up dependency tracking.              -*- Autoconf -*-
  
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
  
--#serial 2
+-#serial 3
 +#serial 5
  
  # _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -14301,27 +13373,21 @@
 -  else
 -    continue
 -  fi
--  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
--  # Extract the definition of DEP_FILES from the Makefile without
--  # running `make'.
+-  # Extract the definition of DEPDIR, am__include, and am__quote
+-  # from the Makefile without running `make'.
 -  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 -  test -z "$DEPDIR" && continue
+-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+-  test -z "am__include" && continue
+-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
 -  # When using ansi2knr, U may be empty or an underscore; expand it
 -  U=`sed -n 's/^U = //p' < "$mf"`
--  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
--  # We invoke sed twice because it is the simplest approach to
--  # changing $(DEPDIR) to its actual value in the expansion.
--  for file in `sed -n '
--    /^DEP_FILES = .*\\\\$/ {
--      s/^DEP_FILES = //
--      :loop
--	s/\\\\$//
--	p
--	n
--	/\\\\$/ b loop
--      p
--    }
--    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+-  # Find all dependency output files, they are included files with
+-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+-  # simplest approach to changing $(DEPDIR) to its actual value in the
+-  # expansion.
+-  for file in `sed -n "
+-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
 -       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
 -    # Make sure the directory exists.
 -    test -f "$dirpart/$file" && continue
@@ -14383,48 +13449,25 @@
  ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
  
  
-@@ -6304,30 +8372,19 @@
-      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
+@@ -6741,14 +8855,14 @@
  
--# Do all the work for Automake.                            -*- Autoconf -*-
--
--# This macro actually does too much some checks are only needed if
--# your package does certain things.  But this isn't really a big deal.
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+ # Do all the work for Automake.                             -*- Autoconf -*-
+ 
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 -# Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Do all the work for Automake.                             -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
  
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+-# serial 12
 +# serial 16
  
--# serial 11
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
- 
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -6341,16 +8398,20 @@
+ # This macro actually does too much.  Some checks are only needed if
+ # your package does certain things.  But this isn't really a big deal.
+@@ -6765,16 +8879,20 @@
  # arguments mandatory, and then we can depend on a new Autoconf
  # release and drop the old call support.
  AC_DEFUN([AM_INIT_AUTOMAKE],
@@ -14450,7 +13493,7 @@
  fi
  
  # test whether we have cygpath
-@@ -6370,6 +8431,9 @@
+@@ -6794,6 +8912,9 @@
   AC_SUBST([PACKAGE], [$1])dnl
   AC_SUBST([VERSION], [$2])],
  [_AM_SET_OPTIONS([$1])dnl
@@ -14460,11 +13503,10 @@
   AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
   AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
  
-@@ -6385,28 +8449,46 @@
+@@ -6809,8 +8930,8 @@
  AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
  AM_MISSING_PROG(AUTOHEADER, autoheader)
  AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_MISSING_PROG(AMTAR, tar)
 -AM_PROG_INSTALL_SH
 -AM_PROG_INSTALL_STRIP
 +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
@@ -14472,11 +13514,12 @@
  AC_REQUIRE([AM_PROG_MKDIR_P])dnl
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
- AC_REQUIRE([AC_PROG_AWK])dnl
+@@ -6818,20 +8939,37 @@
  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+-	      		     [_AM_PROG_TAR([v7])])])
 +	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
 +			     [_AM_PROG_TAR([v7])])])
  _AM_IF_OPTION([no-dependencies],,
@@ -14517,7 +13560,7 @@
  
  # When config.status generates a header, we must update the stamp-h file.
  # This file resides in the same directory as the config header
-@@ -6417,62 +8499,46 @@
+@@ -6842,18 +8980,19 @@
  # our stamp files there.
  AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
  [# Compute $1's index in $config_headers.
@@ -14534,34 +13577,14 @@
  done
 -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
  
- # AM_PROG_INSTALL_SH
- # ------------------
+-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -6864,7 +9003,14 @@
  # Define $install_sh.
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
  AC_DEFUN([AM_PROG_INSTALL_SH],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 -install_sh=${install_sh-"$am_aux_dir/install-sh"}
@@ -14575,39 +13598,11 @@
 +fi
  AC_SUBST(install_sh)])
  
--#                                                          -*- Autoconf -*-
--# Copyright (C) 2003  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 1
-+# serial 2
- 
- # Check whether the underlying file-system supports filenames
- # with a leading dot.  For instance MS-DOS doesn't.
-@@ -6487,26 +8553,55 @@
+ # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+@@ -6888,15 +9034,55 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
  
--# Check to see how 'make' treats includes.	-*- Autoconf -*-
 +# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 +# From Jim Meyering
 +
@@ -14619,8 +13614,7 @@
 +# with or without modifications, as long as this notice is preserved.
 +
 +# serial 5
- 
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++
 +# AM_MAINTAINER_MODE([DEFAULT-MODE])
 +# ----------------------------------
 +# Control maintainer-specific portions of Makefiles.
@@ -14646,35 +13640,24 @@
 +  AC_SUBST([MAINT])dnl
 +]
 +)
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
++
 +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 +# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
  
--# serial 2
+-# serial 3
 +# serial 4
  
  # AM_MAKE_INCLUDE()
  # -----------------
-@@ -6515,7 +8610,7 @@
+@@ -6905,7 +9091,7 @@
  [am_make=${MAKE-make}
  cat > confinc << 'END'
  am__doit:
@@ -14683,7 +13666,7 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
-@@ -6525,24 +8620,24 @@
+@@ -6915,24 +9101,24 @@
  _am_result=none
  # First try GNU make style include.
  echo "include confinc" > confmf
@@ -14723,43 +13706,24 @@
  fi
  AC_SUBST([am__include])
  AC_SUBST([am__quote])
-@@ -6550,27 +8645,16 @@
- rm -f confinc confmf
- ])
+@@ -6942,14 +9128,14 @@
  
--#  -*- Autoconf -*-
--
--
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+ # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
  
--# serial 3
+-# serial 4
 +# serial 6
  
  # AM_MISSING_PROG(NAME, PROGRAM)
  # ------------------------------
-@@ -6586,7 +8670,15 @@
+@@ -6965,7 +9151,15 @@
  # If it does, set am_missing_run to use it, otherwise, to nothing.
  AC_DEFUN([AM_MISSING_HAS_RUN],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -14776,37 +13740,21 @@
  # Use eval to expand $SHELL
  if eval "$MISSING --run true"; then
    am_missing_run="$MISSING --run "
-@@ -6596,92 +8688,41 @@
+@@ -6975,7 +9169,7 @@
  fi
  ])
  
+-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 +# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -6983,70 +9177,33 @@
+ 
  # AM_PROG_MKDIR_P
  # ---------------
 -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
+-#
 -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 -# created by `make install' are always world readable, even if the
 -# installer happens to have an overly restrictive umask (e.g. 077).
@@ -14828,13 +13776,21 @@
 +# Check for `mkdir -p'.
  AC_DEFUN([AM_PROG_MKDIR_P],
 -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # Keeping the `.' argument allows $(mkdir_p) to be used without
--  # argument.  Indeed, we sometimes output rules like
+-  # We used to keeping the `.' as first argument, in order to
+-  # allow $(mkdir_p) to be used without argument.  As in
 -  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.
--  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
--  # expensive solution, as it forces Make to start a sub-shell.)
--  mkdir_p='mkdir -p -- .'
+-  # where $(somedir) is conditionally defined.  However this is wrong
+-  # for two reasons:
+-  #  1. if the package is installed by a user who cannot write `.'
+-  #     make install will fail,
+-  #  2. the above comment should most certainly read
+-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+-  #     so it does not work when $(somedir) is undefined and
+-  #     $(DESTDIR) is not.
+-  #  To support the latter case, we have to write
+-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+-  #  so the `.' trick is pointless.
+-  mkdir_p='mkdir -p --'
 -else
 -  # On NextStep and OpenStep, the `mkdir' command does not
 -  # recognize any option.  It will interpret all options as
@@ -14852,15 +13808,6 @@
 -  fi
 -fi
 -AC_SUBST([mkdir_p])])
--
--# Helper functions for option handling.                    -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
 +[AC_PREREQ([2.60])dnl
 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 +dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
@@ -14877,28 +13824,21 @@
 +esac
 +])
  
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
-+# Helper functions for option handling.                     -*- Autoconf -*-
+ # Helper functions for option handling.                     -*- Autoconf -*-
  
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 +# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
  
--# serial 2
+-# serial 3
 +# serial 4
  
  # _AM_MANGLE_OPTION(NAME)
  # -----------------------
-@@ -6698,7 +8739,7 @@
+@@ -7063,7 +9220,7 @@
  # ----------------------------------
  # OPTIONS is a space-separated list of Automake options.
  AC_DEFUN([_AM_SET_OPTIONS],
@@ -14907,44 +13847,24 @@
  
  # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
  # -------------------------------------------
-@@ -6706,28 +8747,16 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+@@ -7073,14 +9230,14 @@
  
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+ # Check to make sure that the build environment is sane.    -*- Autoconf -*-
  
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
  
--# serial 3
+-# serial 4
 +# serial 5
  
  # AM_SANITY_CHECK
  # ---------------
-@@ -6736,16 +8765,29 @@
+@@ -7089,16 +9246,29 @@
  # Just in case
  sleep 1
  echo timestamp > conftest.file
@@ -14976,40 +13896,7 @@
     fi
     rm -f conftest.file
     if test "$[*]" != "X $srcdir/configure conftest.file" \
-@@ -6770,25 +8812,14 @@
- fi
- AC_MSG_RESULT(yes)])
- 
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries.  This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -6806,7 +8837,122 @@
+@@ -7148,9 +9318,28 @@
  if test "$cross_compiling" != no; then
    AC_CHECK_TOOL([STRIP], [strip], :)
  fi
@@ -15036,191 +13923,14 @@
 +# Public sister of _AM_SUBST_NOTMAKE.
 +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 +
-+# Check how to create a tarball.                            -*- Autoconf -*-
-+
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+#     tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+#     $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-+    done
-+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+    am__untar="$_am_tar -xf -"
-+    ;;
-+  plaintar)
-+    # Must skip GNU tar: if it does not support --format= it doesn't create
-+    # ustar tarball either.
-+    (tar --version) >/dev/null 2>&1 && continue
-+    am__tar='tar chf - "$$tardir"'
-+    am__tar_='tar chf - "$tardir"'
-+    am__untar='tar xf -'
-+    ;;
-+  pax)
-+    am__tar='pax -L -x $1 -w "$$tardir"'
-+    am__tar_='pax -L -x $1 -w "$tardir"'
-+    am__untar='pax -r'
-+    ;;
-+  cpio)
-+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+    am__untar='cpio -i -H $1 -d'
-+    ;;
-+  none)
-+    am__tar=false
-+    am__tar_=false
-+    am__untar=false
-+    ;;
-+  esac
-+
-+  # If the value was cached, stop now.  We just wanted to have am__tar
-+  # and am__untar set.
-+  test -n "${am_cv_prog_tar_$1}" && break
-+
-+  # tar/untar a dummy directory, and stop if the command works
-+  rm -rf conftest.dir
-+  mkdir conftest.dir
-+  echo GrepMe > conftest.dir/file
-+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+  rm -rf conftest.dir
-+  if test -s conftest.tar; then
-+    AM_RUN_LOG([$am__untar <conftest.tar])
-+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+  fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
- m4_include([acinclude.m4])
-Index: blcr-0.8.2/blcr_config.h.in
-===================================================================
---- blcr-0.8.2.orig/blcr_config.h.in	2010-10-12 10:44:39.000000000 +0100
-+++ blcr-0.8.2/blcr_config.h.in	2010-10-12 10:44:12.000000000 +0100
-@@ -51,6 +51,9 @@
- /* Computed value of 'offsetof(struct siginfo, si_pid)' */
- #undef CR_ASM_SI_PID_OFFSET
- 
-+/* Define to address of exported kernel symbol __register_chrdev */
-+#undef CR_EXPORTED_KCODE___register_chrdev
-+
- /* Define to address of exported kernel symbol register_blkdev */
- #undef CR_EXPORTED_KCODE_register_blkdev
- 
-@@ -143,6 +146,10 @@
-    */
- #undef CR_KCODE_find_pid
- 
-+/* Define to address of non-exported kernel symbol find_task_by_pid_ns, or 0
-+   if exported */
-+#undef CR_KCODE_find_task_by_pid_ns
-+
- /* Define to address of non-exported kernel symbol follow_huge_addr, or 0 if
-    exported */
- #undef CR_KCODE_follow_huge_addr
-@@ -319,6 +326,10 @@
-    exported */
- #undef CR_KDATA_mem_map_zero
+ # Check how to create a tarball.                            -*- Autoconf -*-
  
-+/* Define to address of non-exported kernel symbol old_rsp, or 0 if exported
-+   */
-+#undef CR_KDATA_old_rsp
-+
- /* Define to address of non-exported kernel symbol per_cpu__cpu_gdt_descr, or
-    0 if exported */
- #undef CR_KDATA_per_cpu__cpu_gdt_descr
-@@ -382,6 +393,9 @@
- /* Maximum legal size to kmalloc() */
- #undef CR_KMALLOC_MAX
- 
-+/* Define to 1 if linux/autoconf.h must be included explicitly */
-+#undef CR_NEED_AUTOCONF_H
-+
- /* Define to 1 to enable restore of uid, gid and supplemental groups when
-    invoked by root. (default is no) */
- #undef CR_RESTORE_IDS
-@@ -552,6 +566,9 @@
- /* Define to 1 if the Fault Tolerance Backplane is available. */
- #undef HAVE_FTB
- 
-+/* Define to 1 if the kernel has the <generated/utsrelease.h> header file. */
-+#undef HAVE_GENERATED_UTSRELEASE_H
-+
- /* Define to 1 if the kernel has the type 'gfp_t'. */
- #undef HAVE_GFP_T
- 
-@@ -603,6 +620,9 @@
- /* Define to 1 if the kernel has the <linux/lockdep.h> header file. */
- #undef HAVE_LINUX_LOCKDEP_H
- 
-+/* Define to 1 if the kernel has the <linux/perf_event.h> header file. */
-+#undef HAVE_LINUX_PERF_EVENT_H
-+
- /* Define to 1 if the kernel has the <linux/pid_namespace.h> header file. */
- #undef HAVE_LINUX_PID_NAMESPACE_H
- 
-@@ -615,6 +635,9 @@
- /* Define to 1 if the kernel has the <linux/utrace.h> header file. */
- #undef HAVE_LINUX_UTRACE_H
- 
-+/* Define to 1 if the kernel has the <linux/utsrelease.h> header file. */
-+#undef HAVE_LINUX_UTSRELEASE_H
-+
- /* Define to 1 if the kernel has the macro or function map_vsyscall(). */
- #undef HAVE_MAP_VSYSCALL
- 
-@@ -864,6 +887,10 @@
-    of type 'unsigned long'. */
- #undef HAVE_THREAD_INFO_TP_VALUE
- 
-+/* Define to 1 if the kernel type 'struct thread_struct' has member
-+   'ptrace_bps1' of type 'struct perf_event *'. */
-+#undef HAVE_THREAD_PTRACE_BPS
-+
- /* Define to 1 if the kernel type 'struct thread_struct' has member 'rsp0' of
-    type 'unsigned long'. */
- #undef HAVE_THREAD_RSP0
-@@ -910,6 +937,10 @@
+ # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+Index: blcr-0.8.4/blcr_config.h.in
+===================================================================
+--- blcr-0.8.4.orig/blcr_config.h.in	2011-10-11 23:58:46.000000000 +0100
++++ blcr-0.8.4/blcr_config.h.in	2011-10-12 13:18:41.000000000 +0100
+@@ -1012,6 +1012,10 @@
     the 'LIBCR_TRACE_MASK' environment variable */
  #undef LIBCR_TRACING
  
@@ -15231,7 +13941,7 @@
  /* Name of package */
  #undef PACKAGE
  
-@@ -925,10 +956,13 @@
+@@ -1027,10 +1031,13 @@
  /* Define to the one symbol short name of this package. */
  #undef PACKAGE_TARNAME
  
@@ -15246,28 +13956,26 @@
  #undef SIZEOF_VOID_P
  
  /* Define to 1 if you have the ANSI C header files. */
-Index: blcr-0.8.2/blcr_imports/Makefile.in
+Index: blcr-0.8.4/blcr_imports/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/blcr_imports/Makefile.in	2010-10-12 10:44:40.000000000 +0100
-+++ blcr-0.8.2/blcr_imports/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/blcr_imports/Makefile.in	2011-10-11 23:58:52.000000000 +0100
++++ blcr-0.8.4/blcr_imports/Makefile.in	2011-10-12 13:18:42.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,17 +14,12 @@
+@@ -13,15 +14,12 @@
  # PARTICULAR PURPOSE.
  
  @SET_MAKE@
--SOURCES = imports.c module.c
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -15282,20 +13990,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -35,6 +31,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = blcr_imports
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-@@ -44,87 +41,74 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -46,85 +44,71 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES = imports.c
 +CONFIG_CLEAN_VPATH_FILES =
@@ -15408,7 +14104,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -15416,11 +14112,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -145,20 +129,20 @@
+@@ -145,20 +129,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -15442,7 +14139,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -166,12 +150,11 @@
+@@ -166,12 +151,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -15456,7 +14153,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -185,70 +168,91 @@
+@@ -185,17 +169,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -15466,6 +14163,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -15482,21 +14180,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -209,16 +202,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -15510,11 +14202,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -230,28 +221,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -15537,7 +14225,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -15556,7 +14243,7 @@
  
  # Vars needed by kbuild
  SOURCES = imports.c module.c
-@@ -262,18 +266,18 @@
+@@ -265,18 +268,18 @@
  all: all-recursive
  
  .SUFFIXES:
@@ -15581,7 +14268,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -287,10 +291,11 @@
+@@ -290,10 +293,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15595,7 +14282,7 @@
  imports.c: $(top_builddir)/config.status $(srcdir)/imports.c.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  
-@@ -300,10 +305,6 @@
+@@ -303,10 +307,6 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -15606,29 +14293,22 @@
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
  # To change the values of `make' variables: instead of editing Makefiles,
-@@ -311,7 +312,13 @@
+@@ -314,7 +314,7 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
+-	@failcom='exit 1'; \
 +	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -322,16 +329,21 @@
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -331,16 +331,15 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
 -	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
+ 	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -15636,26 +14316,19 @@
  
 -mostlyclean-recursive clean-recursive distclean-recursive \
 -maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
+-	@failcom='exit 1'; \
 +$(RECURSIVE_CLEAN_TARGETS):
 +	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -351,16 +363,16 @@
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -366,16 +365,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
 -	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
+ 	  || eval $$failcom; \
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -15669,7 +14342,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -368,94 +380,120 @@
+@@ -383,14 +382,14 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -15685,19 +14358,13 @@
 -	tags=; \
 +	set x; \
  	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
+@@ -402,81 +401,101 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
+ 	    test ! -f $$subdir/TAGS || \
 -	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	    test ! -f $$subdir/TAGS || \
 +	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
@@ -15707,14 +14374,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -15722,7 +14389,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -15800,13 +14467,15 @@
  	    || exit 1; \
  	  fi; \
  	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || mkdir "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
 +	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
+-	    distdir=`$(am__cd) $(distdir) && pwd`; \
+-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 -	    (cd $$subdir && \
 +	  fi; \
 +	done
@@ -15822,8 +14491,8 @@
 +	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 +	    ($(am__cd) $$subdir && \
  	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="../$(top_distdir)" \
--	        distdir="../$(distdir)/$$subdir" \
+-	        top_distdir="$$top_distdir" \
+-	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
 +		am__remove_distdir=: \
@@ -15832,17 +14501,15 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -487,7 +525,8 @@
- clean-generic:
+@@ -509,6 +528,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -498,8 +537,7 @@
+@@ -519,8 +539,7 @@
  
  distclean: distclean-recursive
  	-rm -f Makefile
@@ -15852,7 +14519,7 @@
  
  dvi: dvi-recursive
  
-@@ -507,18 +545,38 @@
+@@ -528,18 +547,38 @@
  
  html: html-recursive
  
@@ -15891,7 +14558,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -537,22 +595,24 @@
+@@ -558,22 +597,24 @@
  
  ps-am:
  
@@ -15904,7 +14571,7 @@
  
 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
 -	check-am clean clean-generic clean-libtool clean-recursive \
--	ctags ctags-recursive distclean distclean-generic \
+-	ctags ctags-recursive dist-hook distclean distclean-generic \
 -	distclean-libtool distclean-recursive distclean-tags distdir \
 -	dvi dvi-am html html-am info info-am install install-am \
 -	install-data install-data-am install-exec install-exec-am \
@@ -15929,7 +14596,7 @@
  
  
  # Additional dependence for file generated via AC_SUBST_FILE()
-@@ -566,6 +626,7 @@
+@@ -587,6 +628,7 @@
  
  dist-hook:
  	rm -f $(distdir)/imports.c
@@ -15937,20 +14604,20 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/config/config.guess
+Index: blcr-0.8.4/config/config.guess
 ===================================================================
---- blcr-0.8.2.orig/config/config.guess	2010-10-12 10:44:38.000000000 +0100
-+++ blcr-0.8.2/config/config.guess	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/config/config.guess	2009-12-08 17:40:22.000000000 +0000
++++ blcr-0.8.4/config/config.guess	2011-10-12 13:18:42.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+#   Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011 Free Software Foundation, Inc.
  
--timestamp='2004-03-03'
-+timestamp='2009-12-30'
+-timestamp='2003-06-17'
++timestamp='2011-05-11'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
@@ -15993,7 +14660,7 @@
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -Free Software Foundation, Inc.
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 +Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
@@ -16031,24 +14698,21 @@
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
  # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -136,16 +140,6 @@
+@@ -136,13 +140,6 @@
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
--case "${UNAME_MACHINE}" in
--    i?86)
--	test -z "$VENDOR" && VENDOR=pc
--	;;
--    *)
--	test -z "$VENDOR" && VENDOR=unknown
--	;;
--esac
--test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+-## for Red Hat Linux
+-if test -f /etc/redhat-release ; then
+-    VENDOR=redhat ;
+-else
+-    VENDOR= ;
+-fi
 -
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -168,6 +162,7 @@
+@@ -165,6 +162,7 @@
  	    arm*) machine=arm-unknown ;;
  	    sh3el) machine=shl-unknown ;;
  	    sh3eb) machine=sh-unknown ;;
@@ -16056,7 +14720,7 @@
  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
-@@ -176,7 +171,7 @@
+@@ -173,7 +171,7 @@
  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -16065,23 +14729,26 @@
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
-@@ -206,64 +201,23 @@
+@@ -183,7 +181,7 @@
+ 		fi
+ 		;;
+ 	    *)
+-	        os=netbsd
++		os=netbsd
+ 		;;
+ 	esac
+ 	# The OS release
+@@ -203,50 +201,32 @@
  	# contains redundant information, the shorter form:
  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
  	echo "${machine}-${os}${release}"
 -	exit 0 ;;
--    amd64:OpenBSD:*:*)
--	echo x86_64-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
 -    amiga:OpenBSD:*:*)
 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 -    arc:OpenBSD:*:*)
 -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
--    cats:OpenBSD:*:*)
--	echo arm-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
 -    hp300:OpenBSD:*:*)
 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
@@ -16100,9 +14767,6 @@
 -    mvmeppc:OpenBSD:*:*)
 -	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
--    pegasos:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
 -    pmax:OpenBSD:*:*)
 -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
@@ -16122,34 +14786,51 @@
 +	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 +	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 +	exit ;;
-     *:ekkoBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
--	exit 0 ;;
++    *:ekkoBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 +	exit ;;
 +    *:SolidBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 +	exit ;;
-     macppc:MirBSD:*:*)
--	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
++    macppc:MirBSD:*:*)
 +	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 +	exit ;;
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
--	exit 0 ;;
++    *:MirBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 +	exit ;;
      alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
- 	*4.0)
-@@ -316,40 +270,43 @@
+-	if test $UNAME_RELEASE = "V4.0"; then
++	case $UNAME_RELEASE in
++	*4.0)
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+-	fi
++		;;
++	*5.*)
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		;;
++	esac
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+ 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+ 	# covers most systems running today.  This code pipes the CPU
+@@ -284,42 +264,52 @@
+ 	    "EV7.9 (21364A)")
+ 		UNAME_MACHINE="alphaev79" ;;
+ 	esac
++	# A Pn.n version is a patched version.
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
  	# A Xn.n version is an unreleased experimental baselevel.
  	# 1.2 uses "1.2" for uname -r.
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 -	exit 0 ;;
 -    Alpha*:OpenVMS:*:*)
 -	echo alpha-hp-vms
 -	exit 0 ;;
-+	exit ;;
++	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++	exitcode=$?
++	trap '' 0
++	exit $exitcode ;;
      Alpha\ *:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -16180,9 +14861,8 @@
 +    *:z/VM:*:*)
 +	echo s390-ibm-zvmoe
 +	exit ;;
-     *:OS400:*:*)
-         echo powerpc-ibm-os400
--	exit 0 ;;
++    *:OS400:*:*)
++	echo powerpc-ibm-os400
 +	exit ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -16198,7 +14878,7 @@
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
  	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -357,32 +314,51 @@
+@@ -327,32 +317,51 @@
  	else
  		echo pyramid-pyramid-bsd
  	fi
@@ -16261,7 +14941,7 @@
      sun4*:SunOS:*:*)
  	case "`/usr/bin/arch -k`" in
  	    Series*|S4*)
-@@ -391,10 +367,10 @@
+@@ -361,10 +370,10 @@
  	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -16274,7 +14954,7 @@
      sun*:*:4.2BSD:*)
  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -406,10 +382,10 @@
+@@ -376,10 +385,10 @@
  		echo sparc-sun-sunos${UNAME_RELEASE}
  		;;
  	esac
@@ -16287,35 +14967,40 @@
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
-@@ -420,40 +396,40 @@
+@@ -389,38 +398,41 @@
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
+-        echo m68k-atari-mint${UNAME_RELEASE}
 -	exit 0 ;;
++	echo m68k-atari-mint${UNAME_RELEASE}
 +	exit ;;
      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
  	echo m68k-atari-mint${UNAME_RELEASE}
 -        exit 0 ;;
-+        exit ;;
++	exit ;;
      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
+-        echo m68k-atari-mint${UNAME_RELEASE}
 -	exit 0 ;;
++	echo m68k-atari-mint${UNAME_RELEASE}
 +	exit ;;
      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
+-        echo m68k-milan-mint${UNAME_RELEASE}
 -        exit 0 ;;
-+        exit ;;
++	echo m68k-milan-mint${UNAME_RELEASE}
++	exit ;;
      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
+-        echo m68k-hades-mint${UNAME_RELEASE}
 -        exit 0 ;;
-+        exit ;;
++	echo m68k-hades-mint${UNAME_RELEASE}
++	exit ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
+-        echo m68k-unknown-mint${UNAME_RELEASE}
 -        exit 0 ;;
-+        exit ;;
-     m68k:machten:*:*)
- 	echo m68k-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
++	echo m68k-unknown-mint${UNAME_RELEASE}
++	exit ;;
++    m68k:machten:*:*)
++	echo m68k-apple-machten${UNAME_RELEASE}
 +	exit ;;
      powerpc:machten:*:*)
  	echo powerpc-apple-machten${UNAME_RELEASE}
@@ -16340,7 +15025,7 @@
      mips:*:*:UMIPS | mips:*:*:RISCos)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -477,32 +453,33 @@
+@@ -444,35 +456,36 @@
  	  exit (-1);
  	}
  EOF
@@ -16383,14 +15068,19 @@
 -	exit 0 ;;
 +	exit ;;
      AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -518,29 +495,29 @@
+-        # DG/UX returns AViiON for all architectures
+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	# DG/UX returns AViiON for all architectures
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -485,29 +498,29 @@
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
 - 	exit 0 ;;
-+ 	exit ;;
++	exit ;;
      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
  	echo m88k-dolphin-sysv3
 -	exit 0 ;;
@@ -16424,7 +15114,7 @@
      ia64:AIX:*:*)
  	if [ -x /usr/bin/oslevel ] ; then
  		IBM_REV=`/usr/bin/oslevel`
-@@ -548,7 +525,7 @@
+@@ -515,7 +528,7 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -16433,7 +15123,7 @@
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
  		eval $set_cc_for_build
-@@ -563,15 +540,19 @@
+@@ -530,15 +543,19 @@
  			exit(0);
  			}
  EOF
@@ -16453,11 +15143,11 @@
 -	exit 0 ;;
 -    *:AIX:*:[45])
 +	exit ;;
-+    *:AIX:*:[456])
++    *:AIX:*:[4567])
  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
-@@ -584,28 +565,28 @@
+@@ -551,28 +568,28 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -16494,7 +15184,101 @@
      9000/[34678]??:HP-UX:*:*)
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	case "${UNAME_MACHINE}" in
-@@ -667,9 +648,19 @@
+@@ -581,52 +598,52 @@
+ 	    9000/[678][0-9][0-9])
+ 		if [ -x /usr/bin/getconf ]; then
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+-                    case "${sc_cpu_version}" in
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+-                      532)                      # CPU_PA_RISC2_0
+-                        case "${sc_kernel_bits}" in
+-                          32) HP_ARCH="hppa2.0n" ;;
+-                          64) HP_ARCH="hppa2.0w" ;;
++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++		    case "${sc_cpu_version}" in
++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++		      532)                      # CPU_PA_RISC2_0
++			case "${sc_kernel_bits}" in
++			  32) HP_ARCH="hppa2.0n" ;;
++			  64) HP_ARCH="hppa2.0w" ;;
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
++			esac ;;
++		    esac
+ 		fi
+ 		if [ "${HP_ARCH}" = "" ]; then
+ 		    eval $set_cc_for_build
+-		    sed 's/^              //' << EOF >$dummy.c
++		    sed 's/^		//' << EOF >$dummy.c
++
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
++
++		int main ()
++		{
++		#if defined(_SC_KERNEL_BITS)
++		    long bits = sysconf(_SC_KERNEL_BITS);
++		#endif
++		    long cpu  = sysconf (_SC_CPU_VERSION);
+ 
+-              #define _HPUX_SOURCE
+-              #include <stdlib.h>
+-              #include <unistd.h>
+-
+-              int main ()
+-              {
+-              #if defined(_SC_KERNEL_BITS)
+-                  long bits = sysconf(_SC_KERNEL_BITS);
+-              #endif
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
+-
+-                  switch (cpu)
+-              	{
+-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+-              	case CPU_PA_RISC2_0:
+-              #if defined(_SC_KERNEL_BITS)
+-              	    switch (bits)
+-              		{
+-              		case 64: puts ("hppa2.0w"); break;
+-              		case 32: puts ("hppa2.0n"); break;
+-              		default: puts ("hppa2.0"); break;
+-              		} break;
+-              #else  /* !defined(_SC_KERNEL_BITS) */
+-              	    puts ("hppa2.0"); break;
+-              #endif
+-              	default: puts ("hppa1.0"); break;
+-              	}
+-                  exit (0);
+-              }
++		    switch (cpu)
++			{
++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++			case CPU_PA_RISC2_0:
++		#if defined(_SC_KERNEL_BITS)
++			    switch (bits)
++				{
++				case 64: puts ("hppa2.0w"); break;
++				case 32: puts ("hppa2.0n"); break;
++				default: puts ("hppa2.0"); break;
++				} break;
++		#else  /* !defined(_SC_KERNEL_BITS) */
++			    puts ("hppa2.0"); break;
++		#endif
++			default: puts ("hppa1.0"); break;
++			}
++		    exit (0);
++		}
+ EOF
+ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -634,9 +651,19 @@
  	esac
  	if [ ${HP_ARCH} = "hppa2.0w" ]
  	then
@@ -16517,7 +15301,7 @@
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -677,11 +668,11 @@
+@@ -644,11 +671,11 @@
  	    fi
  	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -16531,7 +15315,7 @@
      3050*:HI-UX:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -709,309 +700,289 @@
+@@ -676,208 +703,254 @@
  	  exit (0);
  	}
  EOF
@@ -16576,26 +15360,26 @@
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
 -        exit 0 ;;
-+        exit ;;
++	exit ;;
      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
  	if getsysinfo -f scalar_acc
  	then echo c32-convex-bsd
  	else echo c2-convex-bsd
  	fi
 -        exit 0 ;;
-+        exit ;;
++	exit ;;
      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
  	echo c34-convex-bsd
 -        exit 0 ;;
-+        exit ;;
++	exit ;;
      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
  	echo c38-convex-bsd
 -        exit 0 ;;
-+        exit ;;
++	exit ;;
      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
  	echo c4-convex-bsd
 -        exit 0 ;;
-+        exit ;;
++	exit ;;
      CRAY*Y-MP:*:*:*)
  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 -	exit 0 ;;
@@ -16620,22 +15404,24 @@
 -	exit 0 ;;
 +	exit ;;
      *:UNICOS/mp:*:*)
--	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
 -	exit 0 ;;
 +	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 -        exit 0 ;;
-+        exit ;;
-     5000:UNIX_System_V:4.*:*)
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--	exit 0 ;;
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
++    5000:UNIX_System_V:4.*:*)
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +	exit ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -16648,8 +15434,7 @@
      *:BSD/OS:*:*)
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 -	exit 0 ;;
-+	exit ;;
-     *:FreeBSD:*:*)
+-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
 -	# Determine whether the default compiler uses glibc.
 -	eval $set_cc_for_build
 -	sed 's/^	//' << EOF >$dummy.c
@@ -16661,11 +15446,10 @@
 -	#endif
 -EOF
 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
--	# FreeBSD's kernel, but not the complete OS.
--	case ${LIBC} in gnu) kernel_only='k' ;; esac
--	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 -	exit 0 ;;
++	exit ;;
++    *:FreeBSD:*:*)
 +	case ${UNAME_MACHINE} in
 +	    pc98)
 +		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
@@ -16685,8 +15469,8 @@
 -	exit 0 ;;
 +	exit ;;
 +    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
++	# uname -m includes "-pc" on this system.
++	echo ${UNAME_MACHINE}-mingw32
 +	exit ;;
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
@@ -16696,7 +15480,7 @@
 -	exit 0 ;;
 +	exit ;;
 +    *:Interix*:*)
-+    	case ${UNAME_MACHINE} in
++	case ${UNAME_MACHINE} in
 +	    x86)
 +		echo i586-pc-interix${UNAME_RELEASE}
 +		exit ;;
@@ -16737,14 +15521,13 @@
 -	exit 0 ;;
 +	exit ;;
      *:GNU:*:*)
- 	# the GNU system
++	# the GNU system
  	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 -	exit 0 ;;
 +	exit ;;
-     *:GNU/*:*:*)
- 	# other systems with GNU libc and userland
- 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
--	exit 0 ;;
++    *:GNU/*:*:*)
++	# other systems with GNU libc and userland
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 +	exit ;;
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
@@ -16759,43 +15542,47 @@
 +	  EV6)   UNAME_MACHINE=alphaev6 ;;
 +	  EV67)  UNAME_MACHINE=alphaev67 ;;
 +	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
++	esac
 +	objdump --private-headers /bin/sh | grep -q ld.so.1
 +	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 +	exit ;;
      arm*:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux
--	exit 0 ;;
 +	eval $set_cc_for_build
 +	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 +	    | grep -q __ARM_EABI__
 +	then
 +	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++		| grep -q __ARM_PCS_VFP
++	    then
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    else
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++	    fi
 +	fi
 +	exit ;;
 +    avr32*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
 +	exit ;;
      cris:Linux:*:*)
--	echo cris-axis-linux
+ 	echo cris-axis-linux-gnu
 -	exit 0 ;;
 -    ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux
+-	echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
 -	exit 0 ;;
 -    m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 -    mips:Linux:*:*)
-+	echo cris-axis-linux-gnu
 +	exit ;;
 +    crisv32:Linux:*:*)
 +	echo crisv32-axis-linux-gnu
 +	exit ;;
 +    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
++	echo frv-unknown-linux-gnu
 +	exit ;;
 +    i*86:Linux:*:*)
 +	LIBC=gnu
@@ -16817,7 +15604,7 @@
  	#endif
  EOF
 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
+-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 -	;;
 -    mips64:Linux:*:*)
 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
@@ -16853,15 +15640,15 @@
  	#endif
  EOF
 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
+-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  	;;
 -    ppc:Linux:*:*)
--	echo powerpc-${VENDOR}-linux
+-	echo powerpc-${VENDOR:-unknown}-linux-gnu
 -	exit 0 ;;
 -    ppc64:Linux:*:*)
--	echo powerpc64-${VENDOR}-linux
+-	echo powerpc64-${VENDOR:-unknown}-linux-gnu
 -	exit 0 ;;
 -    alpha:Linux:*:*)
 -	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -16874,8 +15661,8 @@
 -	  EV68*) UNAME_MACHINE=alphaev68 ;;
 -        esac
 -	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 -	exit 0 ;;
 +    or32:Linux:*:*)
 +	echo or32-unknown-linux-gnu
@@ -16889,16 +15676,13 @@
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
--	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
--	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
--	  *)    echo hppa-${VENDOR}-linux ;;
-+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+	  *)    echo hppa-unknown-linux-gnu ;;
+@@ -885,109 +958,71 @@
+ 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ 	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
 -	exit 0 ;;
 -    parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-${VENDOR}-linux
+-	echo hppa64-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
 +    ppc64:Linux:*:*)
@@ -16908,29 +15692,31 @@
 +	echo powerpc-unknown-linux-gnu
 +	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
+-	echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
 -	exit 0 ;;
++	echo ${UNAME_MACHINE}-ibm-linux
 +	exit ;;
      sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-${VENDOR}-linux
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      sh*:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      sparc:Linux:*:* | sparc64:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    tile*:Linux:*:*)
++	echo ${UNAME_MACHINE}-tilera-linux-gnu
 +	exit ;;
 +    vax:Linux:*:*)
 +	echo ${UNAME_MACHINE}-dec-linux-gnu
 +	exit ;;
      x86_64:Linux:*:*)
--	echo x86_64-${VENDOR}-linux
+-	echo x86_64-${VENDOR:-unknown}-linux-gnu
 -	exit 0 ;;
 -    i*86:Linux:*:*)
 -	# The BFD linker knows what the default object file format is, so
@@ -16945,18 +15731,18 @@
 -				    p'`
 -        case "$ld_supported_targets" in
 -	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 -		;;
 -	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 -		exit 0 ;;
 -	  coff-i386)
--		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
+-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 -		exit 0 ;;
 -	  "")
--		# Either a pre-BFD a.out linker (linuxoldld) or
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 -		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 -		exit 0 ;;
 -	esac
 -	# Determine whether the default compiler is a.out or elf
@@ -16980,18 +15766,15 @@
 -	LIBC=gnuaout
 -	#endif
 -	#endif
--	#ifdef __dietlibc__
--	LIBC=dietlibc
--	#endif
 -EOF
 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
+-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
 -	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 -	;;
 +	echo x86_64-unknown-linux-gnu
 +	exit ;;
 +    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -17001,11 +15784,15 @@
 -	exit 0 ;;
 +	exit ;;
      i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-@@ -1019,27 +990,27 @@
+-        # Unixware is an offshoot of SVR4, but it has its own version
+-        # number series starting with 2...
+-        # I am not positive that other SVR4 systems won't match this,
++	# Unixware is an offshoot of SVR4, but it has its own version
++	# number series starting with 2...
++	# I am not positive that other SVR4 systems won't match this,
  	# I just have to hope.  -- rms.
-         # Use sysv4.2uw... so that sysv4* matches it.
+-        # Use sysv4.2uw... so that sysv4* matches it.
++	# Use sysv4.2uw... so that sysv4* matches it.
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 -	exit 0 ;;
 +	exit ;;
@@ -17022,12 +15809,10 @@
      i*86:atheos:*:*)
  	echo ${UNAME_MACHINE}-unknown-atheos
 -	exit 0 ;;
--	i*86:syllable:*:*)
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 +	exit ;;
 +    i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
--	exit 0 ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	echo ${UNAME_MACHINE}-pc-syllable
 +	exit ;;
 +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
  	echo i386-unknown-lynxos${UNAME_RELEASE}
@@ -17040,7 +15825,7 @@
      i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
  	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -1047,15 +1018,16 @@
+@@ -995,15 +1030,16 @@
  	else
  		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
  	fi
@@ -17048,7 +15833,7 @@
 -    i*86:*:5:[78]*)
 +	exit ;;
 +    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
  	case `/bin/uname -X | grep "^Machine"` in
  	    *486*)	     UNAME_MACHINE=i486 ;;
  	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -17060,7 +15845,7 @@
      i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1073,73 +1045,86 @@
+@@ -1021,73 +1057,86 @@
  	else
  		echo ${UNAME_MACHINE}-pc-sysv32
  	fi
@@ -17068,16 +15853,17 @@
 +	exit ;;
      pc:*:*:*)
  	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
 -        # the processor, so we play safe by assuming i386.
 -	echo i386-pc-msdosdjgpp
 -        exit 0 ;;
-+        # the processor, so we play safe by assuming i586.
++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
++	# the processor, so we play safe by assuming i586.
 +	# Note: whatever this is, it MUST be the same as what config.sub
 +	# prints for the "djgpp" host, or else GDB configury will decide that
 +	# this is a cross-build.
 +	echo i586-pc-msdosdjgpp
-+        exit ;;
++	exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
 -	exit 0 ;;
@@ -17108,7 +15894,7 @@
 -	exit 0 ;;
 -    M68*:*:R3V[567]*:*)
 -	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 +	exit ;;
 +    M68*:*:R3V[5678]*:*)
 +	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
@@ -17123,9 +15909,10 @@
 -	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
 +	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 -          && echo i486-ncr-sysv4 && exit 0 ;;
-+          && { echo i486-ncr-sysv4; exit; } ;;
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4; exit; } ;;
 +    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 +	OS_REL='.3'
 +	test -r /etc/.relid \
@@ -17172,17 +15959,20 @@
      *:SINIX-*:*:*)
  	if uname -p 2>/dev/null >/dev/null ; then
  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1147,68 +1132,94 @@
+@@ -1095,68 +1144,94 @@
  	else
  		echo ns32k-sni-sysv
  	fi
 -	exit 0 ;;
-+	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+-        echo i586-unisys-sysv4
 -        exit 0 ;;
-+        exit ;;
++	exit ;;
++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++			# says <Richard.M.Bartel@ccMail.Census.GOV>
++	echo i586-unisys-sysv4
++	exit ;;
      *:UNIX_System_V:4*:FTX*)
  	# From Gerald Hewes <hewes@openmarket.com>.
  	# How about differentiating between stratus architectures? -djm
@@ -17213,12 +16003,14 @@
 +	exit ;;
      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
  	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
+-	        echo mips-nec-sysv${UNAME_RELEASE}
++		echo mips-nec-sysv${UNAME_RELEASE}
  	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
+-	        echo mips-unknown-sysv${UNAME_RELEASE}
++		echo mips-unknown-sysv${UNAME_RELEASE}
  	fi
 -        exit 0 ;;
-+        exit ;;
++	exit ;;
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  	echo powerpc-be-beos
 -	exit 0 ;;
@@ -17287,7 +16079,7 @@
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
  	UNAME_PROCESSOR=`uname -p`
  	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1216,22 +1227,25 @@
+@@ -1164,22 +1239,28 @@
  		UNAME_MACHINE=pc
  	fi
  	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
@@ -17296,11 +16088,15 @@
      *:QNX:*:4*)
  	echo i386-pc-qnx
 -	exit 0 ;;
+-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
++	exit ;;
++    NEO-?:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk${UNAME_RELEASE}
 +	exit ;;
 +    NSE-?:NONSTOP_KERNEL:*:*)
 +	echo nse-tandem-nsk${UNAME_RELEASE}
 +	exit ;;
-     NSR-?:NONSTOP_KERNEL:*:*)
++    NSR-?:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
@@ -17319,7 +16115,7 @@
      *:Plan9:*:*)
  	# "uname -m" is not consistent, so use $cputype instead. 386
  	# is converted to i386 for consistency with other x86
-@@ -1242,31 +1256,50 @@
+@@ -1190,28 +1271,50 @@
  	    UNAME_MACHINE="$cputype"
  	fi
  	echo ${UNAME_MACHINE}-unknown-plan9
@@ -17350,15 +16146,15 @@
 -	exit 0 ;;
 +	exit ;;
      SEI:*:*:SEIUX)
-         echo mips-sei-seiux${UNAME_RELEASE}
+-        echo mips-sei-seiux${UNAME_RELEASE}
 -	exit 0 ;;
++	echo mips-sei-seiux${UNAME_RELEASE}
 +	exit ;;
-     *:DragonFly:*:*)
- 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
++    *:DragonFly:*:*)
++	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 +	exit ;;
 +    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 +	case "${UNAME_MACHINE}" in
 +	    A*) echo alpha-dec-vms ; exit ;;
 +	    I*) echo ia64-dec-vms ; exit ;;
@@ -17379,7 +16175,19 @@
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1298,7 +1331,7 @@
+@@ -1234,16 +1337,16 @@
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+-          "4"
++	"4"
+ #else
+-	  ""
++	""
+ #endif
+-         ); exit (0);
++	); exit (0);
+ #endif
  #endif
  
  #if defined (__arm) && defined (__acorn) && defined (__unix)
@@ -17388,7 +16196,7 @@
  #endif
  
  #if defined (hp300) && !defined (hpux)
-@@ -1387,11 +1420,12 @@
+@@ -1332,11 +1435,12 @@
  }
  EOF
  
@@ -17403,7 +16211,7 @@
  
  # Convex versions that predate uname can use getsysinfo(1)
  
-@@ -1400,22 +1434,22 @@
+@@ -1345,22 +1449,22 @@
      case `getsysinfo -f cpu_type` in
      c1*)
  	echo c1-convex-bsd
@@ -17431,7 +16239,7 @@
      esac
  fi
  
-@@ -1426,7 +1460,9 @@
+@@ -1371,7 +1475,9 @@
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
@@ -17442,20 +16250,20 @@
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
-Index: blcr-0.8.2/config/config.sub
+Index: blcr-0.8.4/config/config.sub
 ===================================================================
---- blcr-0.8.2.orig/config/config.sub	2010-10-12 10:44:38.000000000 +0100
-+++ blcr-0.8.2/config/config.sub	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/config/config.sub	2009-12-08 17:40:22.000000000 +0000
++++ blcr-0.8.4/config/config.sub	2011-10-12 13:18:42.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+#   Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011 Free Software Foundation, Inc.
  
--timestamp='2004-02-23'
-+timestamp='2010-01-22'
+-timestamp='2003-06-18'
++timestamp='2011-03-23'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
@@ -17497,7 +16305,7 @@
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -Free Software Foundation, Inc.
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 +Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
@@ -17526,20 +16334,20 @@
  
      * )
         break ;;
-@@ -118,8 +124,10 @@
+@@ -118,7 +124,11 @@
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
--  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++  knetbsd*-gnu* | netbsd*-gnu* | \
 +  kopensolaris*-gnu* | \
 +  storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
-@@ -145,10 +153,13 @@
+@@ -144,10 +154,13 @@
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -17548,13 +16356,23 @@
  		os=
  		basic_machine=$1
  		;;
-+        -bluegene*)
-+	        os=-cnk
++	-bluegene*)
++		os=-cnk
 +		;;
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
-@@ -170,6 +181,10 @@
+@@ -162,13 +175,17 @@
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+- 	-chorusrdb)
+- 		os=-chorusrdb
++	-chorusrdb)
++		os=-chorusrdb
+ 		basic_machine=$1
+- 		;;
++		;;
  	-hiux*)
  		os=-hiuxwe2
  		;;
@@ -17565,7 +16383,7 @@
  	-sco5)
  		os=-sco3.2v5
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -186,6 +201,10 @@
+@@ -185,6 +202,10 @@
  		# Don't forget version if it is 3.2v4 or newer.
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
@@ -17576,11 +16394,12 @@
  	-sco*)
  		os=-sco3.2v2
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -230,22 +249,28 @@
+@@ -228,54 +249,94 @@
+ 	| a29k \
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
 -	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| am33_2.0 \
 +	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 +	| bfin \
  	| c4x | clipper \
@@ -17589,8 +16408,9 @@
 +	| fido | fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
- 	| ip2k | iq2000 \
+-	| ip2k \
 -	| m32r | m68000 | m68k | m88k | mcore \
++	| ip2k | iq2000 \
 +	| lm32 \
 +	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 +	| maxq | mb | microblaze | mcore | mep | metag \
@@ -17609,41 +16429,56 @@
  	| mipsisa32 | mipsisa32el \
  	| mipsisa32r2 | mipsisa32r2el \
  	| mipsisa64 | mipsisa64el \
-@@ -254,30 +279,40 @@
++	| mipsisa64r2 | mipsisa64r2el \
+ 	| mipsisa64sb1 | mipsisa64sb1el \
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
 +	| moxie \
 +	| mt \
  	| msp430 \
++	| nds32 | nds32le | nds32be \
 +	| nios | nios2 \
  	| ns16k | ns32k \
 -	| openrisc | or32 \
++	| open8 \
 +	| or32 \
  	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| powerpc | powerpc64 | powerpc64le | powerpcle \
  	| pyramid \
+-	| s390 | s390x \
 -	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 +	| rx \
 +	| score \
 +	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  	| sh64 | sh64le \
--	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 -	| strongarm \
+-	| tahoe | thumb | tic4x | tic80 | tron \
 +	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 +	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu | strongarm \
- 	| tahoe | thumb | tic4x | tic80 | tron \
++	| spu \
++	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 +	| ubicom32 \
  	| v850 | v850e \
  	| we32k \
 -	| x86 | xscale | xstormy16 | xtensa \
 -	| z8k)
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| x86 | xc16x | xstormy16 | xtensa \
 +	| z8k | z80)
  		basic_machine=$basic_machine-unknown
  		;;
 -	m6811 | m68hc11 | m6812 | m68hc12)
++	c54x)
++		basic_machine=tic54x-unknown
++		;;
++	c55x)
++		basic_machine=tic55x-unknown
++		;;
++	c6x)
++		basic_machine=tic6x-unknown
++		;;
 +	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
  		# Motorola 68HC11/12.
  		basic_machine=$basic_machine-unknown
@@ -17654,19 +16489,32 @@
 +	ms1)
 +		basic_machine=mt-unknown
 +		;;
++
++	strongarm | thumb | xscale)
++		basic_machine=arm-unknown
++		;;
++
++	xscaleeb)
++		basic_machine=armeb-unknown
++		;;
++
++	xscaleel)
++		basic_machine=armel-unknown
++		;;
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
-@@ -297,28 +332,32 @@
+@@ -295,55 +356,71 @@
  	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
  	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 -	| avr-* \
 -	| bs2000-* \
+-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+-	| clipper-* | cydra-* \
 +	| avr-* | avr32-* \
 +	| bfin-* | bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
--	| clipper-* | cydra-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 +	| clipper-* | craynv-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
  	| elxsi-* \
@@ -17675,8 +16523,9 @@
  	| h8300-* | h8500-* \
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
- 	| ip2k-* | iq2000-* \
+-	| ip2k-* \
 -	| m32r-* \
++	| ip2k-* | iq2000-* \
 +	| lm32-* \
 +	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -17697,7 +16546,7 @@
  	| mipsisa32-* | mipsisa32el-* \
  	| mipsisa32r2-* | mipsisa32r2el-* \
  	| mipsisa64-* | mipsisa64el-* \
-@@ -326,26 +365,36 @@
++	| mipsisa64r2-* | mipsisa64r2el-* \
  	| mipsisa64sb1-* | mipsisa64sb1el-* \
  	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
  	| mipstx39-* | mipstx39el-* \
@@ -17705,23 +16554,28 @@
 +	| mt-* \
  	| msp430-* \
 -	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
++	| nds32-* | nds32le-* | nds32be-* \
 +	| nios-* | nios2-* \
 +	| none-* | np1-* | ns16k-* | ns32k-* \
++	| open8-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
  	| pyramid-* \
 -	| romp-* | rs6000-* \
+-	| s390-* | s390x-* \
 -	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 +	| romp-* | rs6000-* | rx-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 -	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
--	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+-	| tahoe-* | thumb-* \
 +	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 +	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- 	| tahoe-* | thumb-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++	| tahoe-* \
  	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 +	| tile-* | tilegx-* \
  	| tron-* \
@@ -17730,7 +16584,7 @@
  	| we32k-* \
 -	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
 -	| xtensa-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* \
 +	| xstormy16-* | xtensa*-* \
  	| ymp-* \
 -	| z8k-*)
@@ -17742,7 +16596,27 @@
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
-@@ -409,6 +458,10 @@
+@@ -361,6 +438,9 @@
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
++	abacus)
++		basic_machine=abacus-unknown
++		;;
+ 	adobe68k)
+ 		basic_machine=m68010-adobe
+ 		os=-scout
+@@ -378,6 +458,9 @@
+ 	amd64)
+ 		basic_machine=x86_64-pc
+ 		;;
++	amd64-*)
++		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
+@@ -401,6 +484,10 @@
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -17753,7 +16627,7 @@
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -417,10 +470,26 @@
+@@ -409,10 +496,35 @@
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
@@ -17769,31 +16643,38 @@
 +		basic_machine=powerpc-ibm
 +		os=-cnk
 +		;;
++	c54x-*)
++		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c55x-*)
++		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c6x-*)
++		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
  	c90)
  		basic_machine=c90-cray
  		os=-unicos
  		;;
-+        cegcc)
++	cegcc)
 +		basic_machine=arm-unknown
 +		os=-cegcc
 +		;;
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -445,13 +514,20 @@
+@@ -437,12 +549,27 @@
  		basic_machine=j90-cray
  		os=-unicos
  		;;
--	cr16c)
--		basic_machine=cr16c-unknown
 +	craynv)
 +		basic_machine=craynv-cray
 +		os=-unicosmp
 +		;;
-+	cr16)
++	cr16 | cr16-*)
 +		basic_machine=cr16-unknown
- 		os=-elf
- 		;;
++		os=-elf
++		;;
  	crds | unos)
  		basic_machine=m68k-crds
  		;;
@@ -17803,7 +16684,14 @@
  	cris | cris-* | etrax*)
  		basic_machine=cris-axis
  		;;
-@@ -481,6 +557,14 @@
++	crx)
++		basic_machine=crx-unknown
++		os=-elf
++		;;
+ 	da30 | da30-*)
+ 		basic_machine=m68k-da30
+ 		;;
+@@ -465,6 +592,14 @@
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
@@ -17818,7 +16706,7 @@
  	dpx20 | dpx20-*)
  		basic_machine=rs6000-bull
  		os=-bosx
-@@ -631,6 +715,14 @@
+@@ -615,6 +750,14 @@
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
@@ -17833,11 +16721,11 @@
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
-@@ -642,10 +734,17 @@
+@@ -626,10 +769,17 @@
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
-+        microblaze)
++	microblaze)
 +		basic_machine=microblaze-xilinx
 +		;;
  	mingw32)
@@ -17851,7 +16739,7 @@
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
-@@ -659,10 +758,6 @@
+@@ -643,10 +793,6 @@
  	mips3*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
  		;;
@@ -17862,7 +16750,7 @@
  	monitor)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -675,6 +770,9 @@
+@@ -659,6 +805,9 @@
  		basic_machine=i386-pc
  		os=-msdos
  		;;
@@ -17872,18 +16760,22 @@
  	mvs)
  		basic_machine=i370-ibm
  		os=-mvs
-@@ -743,10 +841,6 @@
+@@ -727,9 +876,11 @@
  	np1)
  		basic_machine=np1-gould
  		;;
 -	nv1)
 -		basic_machine=nv1-cray
 -		os=-unicosmp
--		;;
++	neo-tandem)
++		basic_machine=neo-tandem
++		;;
++	nse-tandem)
++		basic_machine=nse-tandem
+ 		;;
  	nsr-tandem)
  		basic_machine=nsr-tandem
- 		;;
-@@ -754,9 +848,8 @@
+@@ -738,9 +889,12 @@
  		basic_machine=hppa1.1-oki
  		os=-proelf
  		;;
@@ -17891,10 +16783,14 @@
 +	openrisc | openrisc-*)
  		basic_machine=or32-unknown
 -		os=-coff
++		;;
++	os400)
++		basic_machine=powerpc-ibm
++		os=-os400
  		;;
- 	os400)
- 		basic_machine=powerpc-ibm
-@@ -778,6 +871,14 @@
+ 	OSE68000 | ose68000)
+ 		basic_machine=m68000-ericsson
+@@ -758,6 +912,14 @@
  		basic_machine=i860-intel
  		os=-osf
  		;;
@@ -17909,7 +16805,7 @@
  	pbd)
  		basic_machine=sparc-tti
  		;;
-@@ -787,6 +888,12 @@
+@@ -767,6 +929,12 @@
  	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
@@ -17922,7 +16818,20 @@
  	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
-@@ -843,6 +950,10 @@
+@@ -796,9 +964,10 @@
+ 		;;
+ 	power)	basic_machine=power-ibm
+ 		;;
+-	ppc)	basic_machine=powerpc-unknown
++	ppc | ppcbe)	basic_machine=powerpc-unknown
+ 		;;
+-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc-* | ppcbe-*)
++		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+@@ -823,6 +992,10 @@
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
@@ -17933,7 +16842,20 @@
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -869,6 +980,10 @@
+@@ -833,6 +1006,12 @@
+ 	rtpc | rtpc-*)
+ 		basic_machine=romp-ibm
+ 		;;
++	s390 | s390-*)
++		basic_machine=s390-ibm
++		;;
++	s390x | s390x-*)
++		basic_machine=s390x-ibm
++		;;
+ 	sa29200)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+@@ -843,6 +1022,10 @@
  	sb1el)
  		basic_machine=mipsisa64sb1el-unknown
  		;;
@@ -17944,7 +16866,7 @@
  	sei)
  		basic_machine=mips-sei
  		os=-seiux
-@@ -880,6 +995,9 @@
+@@ -854,6 +1037,9 @@
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
@@ -17954,23 +16876,54 @@
  	sh64)
  		basic_machine=sh64-unknown
  		;;
-@@ -969,6 +1087,15 @@
- 		basic_machine=tic6x-unknown
- 		os=-coff
+@@ -875,6 +1061,9 @@
+ 		basic_machine=i860-stratus
+ 		os=-sysv4
+ 		;;
++	strongarm-* | thumb-*)
++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+@@ -931,17 +1120,14 @@
+ 		basic_machine=t90-cray
+ 		os=-unicos
  		;;
-+        # This must be matched before tile*.
-+        tilegx*)
+-	tic54x | c54x*)
+-		basic_machine=tic54x-unknown
+-		os=-coff
+-		;;
+-	tic55x | c55x*)
+-		basic_machine=tic55x-unknown
+-		os=-coff
+-		;;
+-	tic6x | c6x*)
+-		basic_machine=tic6x-unknown
+-		os=-coff
++	# This must be matched before tile*.
++	tilegx*)
 +		basic_machine=tilegx-unknown
 +		os=-linux-gnu
 +		;;
 +	tile*)
 +		basic_machine=tile-unknown
 +		os=-linux-gnu
-+		;;
+ 		;;
  	tx39)
  		basic_machine=mipstx39-unknown
+@@ -956,6 +1142,10 @@
+ 	tower | tower-32)
+ 		basic_machine=m68k-ncr
  		;;
-@@ -1029,6 +1156,10 @@
++	tpf)
++		basic_machine=s390x-ibm
++		os=-tpf
++		;;
+ 	udi29k)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+@@ -999,9 +1189,16 @@
  		basic_machine=hppa1.1-winbond
  		os=-proelf
  		;;
@@ -17981,7 +16934,13 @@
  	xps | xps100)
  		basic_machine=xps100-honeywell
  		;;
-@@ -1040,6 +1171,10 @@
++	xscale-* | xscalee[bl]-*)
++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+@@ -1010,6 +1207,10 @@
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
@@ -17992,7 +16951,7 @@
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -1059,6 +1194,9 @@
+@@ -1029,6 +1230,9 @@
  	romp)
  		basic_machine=romp-ibm
  		;;
@@ -18002,7 +16961,7 @@
  	rs6000)
  		basic_machine=rs6000-ibm
  		;;
-@@ -1075,13 +1213,10 @@
+@@ -1045,13 +1249,10 @@
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -18013,22 +16972,27 @@
 -	sh64)
 -		basic_machine=sh64-unknown
 -		;;
--	sparc | sparcv9 | sparcv9b)
+-	sparc | sparcv8 | sparcv9 | sparcv9b)
 +	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
  		basic_machine=sparc-sun
  		;;
  	cydra)
-@@ -1128,6 +1263,9 @@
-         # First match some system type aliases
-         # that might get confused with valid system types.
+@@ -1095,9 +1296,12 @@
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+-        # First match some system type aliases
+-        # that might get confused with valid system types.
++	# First match some system type aliases
++	# that might get confused with valid system types.
  	# -solaris* is a basic system type, with this one exception.
-+        -auroraux)
-+	        os=-auroraux
++	-auroraux)
++		os=-auroraux
 +		;;
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  		;;
-@@ -1148,26 +1286,30 @@
+@@ -1118,25 +1322,31 @@
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -18042,31 +17006,33 @@
 +	      | -aos* | -aros* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 +	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
 +	      | -openbsd* | -solidbsd* \
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
++	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
++	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 -	      | -chorusos* | -chorusrdb* \
 +	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -mingw32* | -linux-gnu* | -linux-android* \
++	      | -linux-newlib* | -linux-uclibc* \
 +	      | -uxpv* | -beos* | -mpeix* | -udk* \
  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
--	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
 +	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 +	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1185,7 +1327,7 @@
+@@ -1154,12 +1364,15 @@
  		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
@@ -18075,17 +17041,45 @@
  	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  		;;
  	-mac*)
-@@ -1194,6 +1336,9 @@
- 	-linux-dietlibc)
- 		os=-linux-dietlibc
+ 		os=`echo $os | sed -e 's|mac|macos|'`
+ 		;;
++	-linux-dietlibc)
++		os=-linux-dietlibc
++		;;
+ 	-linux*)
+ 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ 		;;
+@@ -1172,6 +1385,9 @@
+ 	-opened*)
+ 		os=-openedition
  		;;
-+	-linux*)
-+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
++	-os400*)
++		os=-os400
 +		;;
- 	-sunos5*)
- 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ 	-wince*)
+ 		os=-wince
+ 		;;
+@@ -1193,6 +1409,9 @@
+ 	-atheos*)
+ 		os=-atheos
+ 		;;
++	-syllable*)
++		os=-syllable
++		;;
+ 	-386bsd)
+ 		os=-bsd
+ 		;;
+@@ -1215,6 +1434,9 @@
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
++	-tpf*)
++		os=-tpf
++		;;
+ 	-triton*)
+ 		os=-sysv3
  		;;
-@@ -1291,6 +1436,14 @@
+@@ -1251,6 +1473,14 @@
  	-kaos*)
  		os=-kaos
  		;;
@@ -18095,48 +17089,51 @@
 +	-dicos*)
 +		os=-dicos
 +		;;
-+        -nacl*)
-+	        ;;
++	-nacl*)
++		;;
  	-none)
  		;;
  	*)
-@@ -1313,6 +1466,12 @@
+@@ -1273,6 +1503,12 @@
  # system, and we'll never get to this point.
  
  case $basic_machine in
-+        score-*)
++	score-*)
 +		os=-elf
 +		;;
-+        spu-*)
++	spu-*)
 +		os=-elf
 +		;;
  	*-acorn)
  		os=-riscix1.2
  		;;
-@@ -1322,9 +1481,9 @@
- 	arm*-semi)
- 		os=-aout
+@@ -1285,6 +1521,15 @@
+ 	c4x-* | tic4x-*)
+ 		os=-coff
  		;;
--    c4x-* | tic4x-*)
--        os=-coff
--        ;;
-+        c4x-* | tic4x-*)
-+        	os=-coff
++	tic54x-*)
++		os=-coff
++		;;
++	tic55x-*)
++		os=-coff
++		;;
++	tic6x-*)
++		os=-coff
 +		;;
  	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
-@@ -1350,6 +1509,9 @@
+@@ -1310,6 +1555,9 @@
  	m68*-cisco)
  		os=-aout
  		;;
-+        mep-*)
++	mep-*)
 +		os=-elf
 +		;;
  	mips*-cisco)
  		os=-elf
  		;;
-@@ -1368,9 +1530,15 @@
+@@ -1328,9 +1576,15 @@
  	*-be)
  		os=-beos
  		;;
@@ -18146,13 +17143,13 @@
  	*-ibm)
  		os=-aix
  		;;
-+    	*-knuth)
++	*-knuth)
 +		os=-mmixware
 +		;;
  	*-wec)
  		os=-proelf
  		;;
-@@ -1473,7 +1641,7 @@
+@@ -1433,7 +1687,7 @@
  			-sunos*)
  				vendor=sun
  				;;
@@ -18161,7 +17158,23 @@
  				vendor=ibm
  				;;
  			-beos*)
-@@ -1536,7 +1704,7 @@
+@@ -1463,9 +1717,15 @@
+ 			-mvs* | -opened*)
+ 				vendor=ibm
+ 				;;
++			-os400*)
++				vendor=ibm
++				;;
+ 			-ptx*)
+ 				vendor=sequent
+ 				;;
++			-tpf*)
++				vendor=ibm
++				;;
+ 			-vxsim* | -vxworks* | -windiss*)
+ 				vendor=wrs
+ 				;;
+@@ -1490,7 +1750,7 @@
  esac
  
  echo $basic_machine$os
@@ -18170,18 +17183,18 @@
  
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
-Index: blcr-0.8.2/config/depcomp
+Index: blcr-0.8.4/config/depcomp
 ===================================================================
---- blcr-0.8.2.orig/config/depcomp	2010-10-12 10:44:38.000000000 +0100
-+++ blcr-0.8.2/config/depcomp	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/config/depcomp	2011-10-11 23:58:53.000000000 +0100
++++ blcr-0.8.4/config/depcomp	2011-10-12 13:18:43.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
--scriptversion=2003-11-08.23
+-scriptversion=2005-07-09.11
 +scriptversion=2009-04-28.21; # UTC
  
--# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
 +# Software Foundation, Inc.
  
@@ -18192,56 +17205,13 @@
  
  # You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+-# 02110-1301, USA.
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -43,17 +42,18 @@
-   depmode     Dependency tracking mode.
-   source      Source file read by `PROGRAMS ARGS'.
-   object      Object file output by `PROGRAMS ARGS'.
-+  DEPDIR      directory where to store dependencies.
-   depfile     Dependency file to output.
-   tmpdepfile  Temporary file to use when outputing dependencies.
-   libtool     Whether libtool is used (yes/no).
- 
- Report bugs to <bug-automake@gnu.org>.
- EOF
--    exit 0
-+    exit $?
-     ;;
-   -v | --v*)
-     echo "depcomp $scriptversion"
--    exit 0
-+    exit $?
-     ;;
- esac
- 
-@@ -61,18 +61,10 @@
-   echo "depcomp: Variables source, object and depmode must be set" 1>&2
-   exit 1
- fi
--# `libtool' can also be set to `yes' or `no'.
--
--if test -z "$depfile"; then
--   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
--   dir=`echo "$object" | sed 's,/.*$,/,'`
--   if test "$dir" = "$object"; then
--      dir=
--   fi
--   # FIXME: should be _deps on DOS.
--   depfile="$dir.deps/$base"
--fi
- 
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
- tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
- 
- rm -f "$tmpdepfile"
-@@ -93,12 +85,34 @@
+@@ -86,12 +85,34 @@
     depmode=dashmstdout
  fi
  
@@ -18277,7 +17247,7 @@
    stat=$?
    if test $stat -eq 0; then :
    else
-@@ -185,14 +199,14 @@
+@@ -178,14 +199,14 @@
  ' < "$tmpdepfile" \
      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
      tr '
@@ -18295,7 +17265,7 @@
    else
      # The sourcefile does not contain any dependencies, so just
      # store a dummy comment line, to avoid errors with the Makefile
-@@ -208,34 +222,39 @@
+@@ -201,34 +222,39 @@
    # current directory.  Also, the AIX compiler puts `$object:' at the
    # start of each line; $object doesn't have directory information.
    # Version 6 uses the directory in both cases.
@@ -18347,7 +17317,7 @@
    else
      # The sourcefile does not contain any dependencies, so just
      # store a dummy comment line, to avoid errors with the Makefile
-@@ -283,6 +302,51 @@
+@@ -276,6 +302,51 @@
    rm -f "$tmpdepfile"
    ;;
  
@@ -18399,61 +17369,23 @@
  tru64)
     # The Tru64 compiler uses -MD to generate dependencies as a side
     # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-@@ -294,27 +358,43 @@
-    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+@@ -288,13 +359,13 @@
  
     if test "$libtool" = yes; then
--      tmpdepfile1="$dir.libs/$base.lo.d"
--      tmpdepfile2="$dir.libs/$base.d"
-+      # With Tru64 cc, shared objects can also be used to make a
+       # With Tru64 cc, shared objects can also be used to make a
+-      # static library.  This mecanism is used in libtool 1.4 series to
 +      # static library.  This mechanism is used in libtool 1.4 series to
-+      # handle both shared and static libraries in a single compilation.
-+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+      #
-+      # With libtool 1.5 this exception was removed, and libtool now
-+      # generates 2 separate objects for the 2 libraries.  These two
+       # handle both shared and static libraries in a single compilation.
+       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+       #
+       # With libtool 1.5 this exception was removed, and libtool now
+       # generates 2 separate objects for the 2 libraries.  These two
+-      # compilations output dependencies in in $dir.libs/$base.o.d and
 +      # compilations output dependencies in $dir.libs/$base.o.d and
-+      # in $dir$base.o.d.  We have to check for both files, because
-+      # one of the two compilations can be disabled.  We should prefer
-+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+      # automatically cleaned when .libs/ is deleted, while ignoring
-+      # the former would cause a distcleancheck panic.
-+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-       "$@" -Wc,-MD
-    else
--      tmpdepfile1="$dir$base.o.d"
--      tmpdepfile2="$dir$base.d"
-+      tmpdepfile1=$dir$base.o.d
-+      tmpdepfile2=$dir$base.d
-+      tmpdepfile3=$dir$base.d
-+      tmpdepfile4=$dir$base.d
-       "$@" -MD
-    fi
- 
-    stat=$?
-    if test $stat -eq 0; then :
-    else
--      rm -f "$tmpdepfile1" "$tmpdepfile2"
-+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-       exit $stat
-    fi
- 
--   if test -f "$tmpdepfile1"; then
--      tmpdepfile="$tmpdepfile1"
--   else
--      tmpdepfile="$tmpdepfile2"
--   fi
-+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+   do
-+     test -f "$tmpdepfile" && break
-+   done
-    if test -f "$tmpdepfile"; then
-       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-       # That's a tab and a space in the [].
-@@ -336,7 +416,7 @@
+       # in $dir$base.o.d.  We have to check for both files, because
+       # one of the two compilations can be disabled.  We should prefer
+       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+@@ -345,7 +416,7 @@
  
    # Remove the call to Libtool.
    if test "$libtool" = yes; then
@@ -18462,7 +17394,7 @@
        shift
      done
      shift
-@@ -387,32 +467,39 @@
+@@ -396,32 +467,39 @@
    "$@" || exit $?
    # Remove any Libtool call
    if test "$libtool" = yes; then
@@ -18506,7 +17438,7 @@
    touch "$tmpdepfile"
    ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
    rm -f "$depfile"
-@@ -432,7 +519,7 @@
+@@ -441,7 +519,7 @@
  
    # Remove the call to Libtool.
    if test "$libtool" = yes; then
@@ -18515,17 +17447,7 @@
        shift
      done
      shift
-@@ -458,7 +545,8 @@
-   done
- 
-   "$@" -E |
--    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-     sed '$ s: \\$::' > "$tmpdepfile"
-   rm -f "$depfile"
-   echo "$object : \\" > "$depfile"
-@@ -469,13 +557,27 @@
+@@ -479,13 +557,27 @@
  
  msvisualcpp)
    # Important note: in order to support this mode, a compiler *must*
@@ -18555,7 +17477,7 @@
      "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
  	set fnord "$@"
  	shift
-@@ -488,16 +590,23 @@
+@@ -498,16 +590,23 @@
  	;;
      esac
    done
@@ -18583,7 +17505,7 @@
  none)
    exec "$@"
    ;;
-@@ -516,5 +625,6 @@
+@@ -526,5 +625,6 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -18591,21 +17513,21 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-Index: blcr-0.8.2/config/install-sh
+Index: blcr-0.8.4/config/install-sh
 ===================================================================
---- blcr-0.8.2.orig/config/install-sh	2010-10-12 10:44:38.000000000 +0100
-+++ blcr-0.8.2/config/install-sh	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/config/install-sh	2011-10-12 13:17:54.000000000 +0100
++++ blcr-0.8.4/config/install-sh	2011-10-12 13:18:42.000000000 +0100
 @@ -1,7 +1,7 @@
 -#!/bin/bash
 +#!/bin/sh
  # install - install a program, script, or datafile
  
--scriptversion=2004-02-15.20
+-scriptversion=2005-05-14.22
 +scriptversion=2009-04-28.21; # UTC
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
  # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -39,120 +39,157 @@
+@@ -39,38 +39,68 @@
  # when there is no Makefile.
  #
  # This script is compatible with the BSD install script, but was written
@@ -18631,7 +17553,15 @@
 -# put in absolute paths if you don't have them in your path; or use env. vars.
 +# Put in absolute file names if you don't have them in your path;
 +# or use environment vars.
-+
+ 
+-mvprog="${MVPROG-mv}"
+-cpprog="${CPPROG-cp}"
+-chmodprog="${CHMODPROG-chmod}"
+-chownprog="${CHOWNPROG-chown}"
+-chgrpprog="${CHGRPPROG-chgrp}"
+-stripprog="${STRIPPROG-strip}"
+-rmprog="${RMPROG-rm}"
+-mkdirprog="${MKDIRPROG-mkdir}"
 +chgrpprog=${CHGRPPROG-chgrp}
 +chmodprog=${CHMODPROG-chmod}
 +chownprog=${CHOWNPROG-chown}
@@ -18658,18 +17588,6 @@
 +# Desired mode of installed file.
 +mode=0755
  
--mvprog="${MVPROG-mv}"
--cpprog="${CPPROG-cp}"
--chmodprog="${CHMODPROG-chmod}"
--chownprog="${CHOWNPROG-chown}"
--chgrpprog="${CHGRPPROG-chgrp}"
--stripprog="${STRIPPROG-strip}"
--rmprog="${RMPROG-rm}"
--mkdirprog="${MKDIRPROG-mkdir}"
--
--transformbasename=
--transform_arg=
--instcmd="$mvprog"
 -chmodcmd="$chmodprog 0755"
 -chowncmd=
  chgrpcmd=
@@ -18684,34 +17602,30 @@
  src=
  dst=
  dir_arg=
+-dstarg=
 +dst_arg=
- 
--usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
-+copy_on_change=false
-+no_target_directory=
 +
++copy_on_change=false
+ no_target_directory=
+ 
+-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
 +usage="\
 +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
     or: $0 [OPTION]... SRCFILES... DIRECTORY
--   or: $0 -d DIRECTORIES...
-+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+   or: $0 [OPTION]... -d DIRECTORIES...
- 
--In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
--In the second, create the directory path DIR.
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
+    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+    or: $0 [OPTION]... -d DIRECTORIES...
+@@ -80,81 +110,86 @@
+ In the 4th, create DIRECTORIES.
  
  Options:
---b=TRANSFORMBASENAME
---c         copy source (using $cpprog) instead of moving (using $mvprog).
+--c         (ignored)
 --d         create directories instead of installing files.
---g GROUP   $chgrp installed files to GROUP.
---m MODE    $chmod installed files to MODE.
---o USER    $chown installed files to USER.
---s         strip installed files (using $stripprog).
---t=TRANSFORM
+--g GROUP   $chgrpprog installed files to GROUP.
+--m MODE    $chmodprog installed files to MODE.
+--o USER    $chownprog installed files to USER.
+--s         $stripprog installed files.
+--t DIRECTORY  install into DIRECTORY.
+--T         report an error if DSTFILE is a directory.
 ---help     display this help and exit.
 ---version  display version info and exit.
 +     --help     display this help and exit.
@@ -18736,19 +17650,13 @@
 -while test -n "$1"; do
 +while test $# -ne 0; do
    case $1 in
--    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
--        shift
--        continue;;
--
--    -c) instcmd=$cpprog
--        shift
+-    -c) shift
 -        continue;;
--
++    -c) ;;
+ 
 -    -d) dir_arg=true
 -        shift
 -        continue;;
-+    -c) ;;
-+
 +    -C) copy_on_change=true;;
 +
 +    -d) dir_arg=true;;
@@ -18757,17 +17665,14 @@
 -        shift
 -        shift
 -        continue;;
--
--    --help) echo "$usage"; exit 0;;
--
++	shift;;
+ 
+     --help) echo "$usage"; exit $?;;
+ 
 -    -m) chmodcmd="$chmodprog $2"
 -        shift
 -        shift
 -        continue;;
-+	shift;;
-+
-+    --help) echo "$usage"; exit $?;;
-+
 +    -m) mode=$2
 +	case $mode in
 +	  *' '* | *'	'* | *'
@@ -18786,14 +17691,28 @@
 -        shift
 -        continue;;
 -
--    -t=*) transformarg=`echo $1 | sed 's/-t=//'`
--        shift
--        continue;;
--
--    --version) echo "$0 $scriptversion"; exit 0;;
--
+-    -t) dstarg=$2
+-	shift
+-	shift
+-	continue;;
+-
+-    -T) no_target_directory=true
+-	shift
+-	continue;;
++	shift;;
++
++    -s) stripcmd=$stripprog;;
++
++    -t) dst_arg=$2
++	shift;;
++
++    -T) no_target_directory=true;;
+ 
+     --version) echo "$0 $scriptversion"; exit $?;;
+ 
 -    *)  # When -d is used, all remaining arguments are directories to create.
--	test -n "$dir_arg" && break
+-	# When -t is used, the destination is already specified.
+-	test -n "$dir_arg$dstarg" && break
 -        # Otherwise, the last argument is the destination.  Remove it from $@.
 -	for arg
 -	do
@@ -18805,17 +17724,6 @@
 -	  shift # arg
 -	  dstarg=$arg
 -	done
-+	shift;;
-+
-+    -s) stripcmd=$stripprog;;
-+
-+    -t) dst_arg=$2
-+	shift;;
-+
-+    -T) no_target_directory=true;;
-+
-+    --version) echo "$0 $scriptversion"; exit $?;;
-+
 +    --)	shift
  	break;;
 +
@@ -18848,7 +17756,7 @@
    if test -z "$dir_arg"; then
      echo "$0: no input file specified." >&2
      exit 1
-@@ -162,25 +199,48 @@
+@@ -164,24 +199,47 @@
    exit 0
  fi
  
@@ -18892,22 +17800,20 @@
 -    src=
 -
 -    if test -d "$dst"; then
--      instcmd=:
+-      mkdircmd=:
 -      chmodcmd=
 -    else
--      instcmd=$mkdirprog
+-      mkdircmd=$mkdirprog
 -    fi
 +    dstdir=$dst
 +    test -d "$dstdir"
 +    dstdir_status=$?
    else
--    # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 +
-+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
      # might cause directories to be created, which would be especially bad
      # if $src (and thus $dsttmp) contains '*'.
-     if test ! -f "$src" && test ! -d "$src"; then
-@@ -188,129 +248,273 @@
+@@ -190,71 +248,199 @@
        exit 1
      fi
  
@@ -18928,11 +17834,12 @@
      # If destination is a directory, append the input filename; won't work
      # if double slashes aren't ignored.
      if test -d "$dst"; then
--      dst=$dst/`basename "$src"`
-+      if test -n "$no_target_directory"; then
+       if test -n "$no_target_directory"; then
+-	echo "$0: $dstarg: Is a directory" >&2
 +	echo "$0: $dst_arg: Is a directory" >&2
-+	exit 1
-+      fi
+ 	exit 1
+       fi
+-      dst=$dst/`basename "$src"`
 +      dstdir=$dst
 +      dst=$dstdir/`basename "$src"`
 +      dstdir_status=0
@@ -18970,11 +17877,11 @@
    fi
  
 -  # This sed command emulates the dirname command.
--  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+-
+-  # Make sure that the destination directory exists.
 +  obsolete_mkdir_used=false
  
--  # Make sure that the destination directory exists.
--
 -  # Skip lots of stat calls in the usual case.
 -  if test ! -d "$dstdir"; then
 -    defaultIFS='
@@ -18984,7 +17891,8 @@
 -    oIFS=$IFS
 -    # Some sh's can't handle IFS=/ for some reason.
 -    IFS='%'
--    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+-    shift
 -    IFS=$oIFS
 +  if test $dstdir_status != 0; then
 +    case $posix_mkdir in
@@ -19082,11 +17990,11 @@
 +      set fnord $dstdir
        shift
 -      if test ! -d "$pathcomp"; then
--        $mkdirprog "$pathcomp" || lasterr=$?
+-        $mkdirprog "$pathcomp"
 -	# mkdir can fail with a `File exist' error in case several
 -	# install-sh are creating the directory concurrently.  This
 -	# is OK.
--	test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
+-	test -d "$pathcomp" || exit
 +      $posix_glob set +f
 +      IFS=$oIFS
 +
@@ -19129,7 +18037,7 @@
    fi
  
    if test -n "$dir_arg"; then
--    $doit $instcmd "$dst" \
+-    $doit $mkdircmd "$dst" \
 -      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
 -      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
 -      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
@@ -19140,60 +18048,62 @@
 +    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
 +      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
    else
--    # If we're going to rename the final executable, determine the name now.
--    if test -z "$transformarg"; then
--      dstfile=`basename "$dst"`
--    else
--      dstfile=`basename "$dst" $transformbasename \
--               | sed $transformarg`$transformbasename
--    fi
--
--    # don't allow the sed command to completely eliminate the filename.
--    test -z "$dstfile" && dstfile=`basename "$dst"`
+-    dstfile=`basename "$dst"`
  
      # Make a couple of temp file names in the proper directory.
      dsttmp=$dstdir/_inst.$$_
-     rmtmp=$dstdir/_rm.$$_
+@@ -262,10 +448,9 @@
  
      # Trap to clean up those temp files at exit.
--    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 -    trap '(exit $?); exit' 1 2 13 15
-+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
  
--    # Move or copy the file name to the temp name
--    $doit $instcmd "$src" "$dsttmp" &&
-+    # Copy the file name to the temp name.
+     # Copy the file name to the temp name.
+-    $doit $cpprog "$src" "$dsttmp" &&
 +    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
  
      # and set any options; do chmod last to preserve setuid bits.
      #
-     # If any of these fail, we abort the whole thing.  If we want to
+@@ -273,51 +458,63 @@
      # ignore errors from any of these, just make sure not to ignore
--    # errors from the above "$doit $instcmd $src $dsttmp" command.
-+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+     # errors from the above "$doit $cpprog $src $dsttmp" command.
      #
 -    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
 -      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
 -      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
 -      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
 -
--    # Now remove or move aside any old file at destination location.  We
--    # try this two ways since rm can't unlink itself on some systems and
--    # the destination file might be busy for other reasons.  In this case,
--    # the final cleanup might fail but the new file should still install
--    # successfully.
--    {
--      if test -f "$dstdir/$dstfile"; then
--        $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
--        || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
--        || {
--	  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
--	  (exit 1); exit
--        }
--      else
--        :
--      fi
--    } &&
+-    # Now rename the file to the real destination.
+-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+-      || {
+-	   # The rename failed, perhaps because mv can't rename something else
+-	   # to itself, or perhaps because mv is so ancient that it does not
+-	   # support -f.
+-
+-	   # Now remove or move aside any old file at destination location.
+-	   # We try this two ways since rm can't unlink itself on some
+-	   # systems and the destination file might be busy for other
+-	   # reasons.  In this case, the final cleanup might fail but the new
+-	   # file should still install successfully.
+-	   {
+-	     if test -f "$dstdir/$dstfile"; then
+-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+-	       || {
+-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+-		 (exit 1); exit 1
+-	       }
+-	     else
+-	       :
+-	     fi
+-	   } &&
+-
+-	   # Now rename the file to the real destination.
+-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+-	 }
+-    }
+-  fi || { (exit 1); exit 1; }
+-done
 +    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
 +    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
 +    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
@@ -19218,10 +18128,10 @@
 +      # Rename the file to the real destination.
 +      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
  
--    # Now rename the file to the real destination.
--    $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
--  fi || { (exit 1); exit; }
--done
+-# The final little trick to "correctly" pass the exit status to the exit trap.
+-{
+-  (exit 0); exit 0
+-}
 +      # The rename failed, perhaps because mv can't rename something else
 +      # to itself, or perhaps because mv is so ancient that it does not
 +      # support -f.
@@ -19246,11 +18156,7 @@
 +	$doit $mvcmd "$dsttmp" "$dst"
 +      }
 +    fi || exit 1
- 
--# The final little trick to "correctly" pass the exit status to the exit trap.
--{
--  (exit 0); exit
--}
++
 +    trap '' 0
 +  fi
 +done
@@ -19263,25 +18169,25 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-Index: blcr-0.8.2/config/ltmain.sh
+Index: blcr-0.8.4/config/ltmain.sh
 ===================================================================
---- blcr-0.8.2.orig/config/ltmain.sh	2010-10-12 10:44:37.000000000 +0100
-+++ blcr-0.8.2/config/ltmain.sh	2010-10-12 10:44:07.000000000 +0100
-@@ -1,540 +1,1040 @@
+--- blcr-0.8.4.orig/config/ltmain.sh	2009-12-08 17:40:22.000000000 +0000
++++ blcr-0.8.4/config/ltmain.sh	2011-10-12 13:18:35.000000000 +0100
+@@ -1,30 +1,129 @@
 -# ltmain.sh - Provide generalized library-building support services.
 -# NOTE: Changing this file will not affect anything until you rerun configure.
 -#
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
 -# Free Software Foundation, Inc.
 -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 -#
 -# This program is free software; you can redistribute it and/or modify
-+# Generated from ltmain.m4sh.
 +
-+# ltmain.sh (GNU libtool) 2.2.6b
++# libtool (GNU libtool) 2.4
 +# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 +
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 +# This is free software; see the source for copying conditions.  There is NO
 +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 +
@@ -19303,7 +18209,7 @@
  #
  # You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 +# along with GNU Libtool; see the file COPYING.  If not, a copy
 +# can be downloaded from http://www.gnu.org/licenses/gpl.html,
 +# or obtained by writing to the Free Software Foundation, Inc.,
@@ -19317,60 +18223,56 @@
 -# distribute this file as part of a program that contains a
 -# configuration script generated by Autoconf, you may include it under
 -# the same distribution terms that you use for the rest of that program.
-+#     --config             show all configuration variables
-+#     --debug              enable verbose shell tracing
-+# -n, --dry-run            display commands without modifying any files
-+#     --features           display basic configuration information and exit
-+#     --mode=MODE          use operation mode MODE
-+#     --preserve-dup-deps  don't remove duplicate dependency libraries
-+#     --quiet, --silent    don't print informational messages
-+#     --tag=TAG            use configuration variables from tag TAG
-+# -v, --verbose            print informational messages (default)
-+#     --version            print version information
-+# -h, --help               print short or long help message
++#       --config             show all configuration variables
++#       --debug              enable verbose shell tracing
++#   -n, --dry-run            display commands without modifying any files
++#       --features           display basic configuration information and exit
++#       --mode=MODE          use operation mode MODE
++#       --preserve-dup-deps  don't remove duplicate dependency libraries
++#       --quiet, --silent    don't print informational messages
++#       --no-quiet, --no-silent
++#                            print informational messages (default)
++#       --tag=TAG            use configuration variables from tag TAG
++#   -v, --verbose            print more informational messages than default
++#       --no-verbose         don't print the extra informational messages
++#       --version            print version information
++#   -h, --help, --help-all   print short, long, or detailed help message
 +#
 +# MODE must be one of the following:
 +#
-+#       clean              remove files from the build directory
-+#       compile            compile a source file into a libtool object
-+#       execute            automatically set library path, then run a program
-+#       finish             complete the installation of libtool libraries
-+#       install            install libraries or executables
-+#       link               create a library or an executable
-+#       uninstall          remove libraries from an installed directory
++#         clean              remove files from the build directory
++#         compile            compile a source file into a libtool object
++#         execute            automatically set library path, then run a program
++#         finish             complete the installation of libtool libraries
++#         install            install libraries or executables
++#         link               create a library or an executable
++#         uninstall          remove libraries from an installed directory
 +#
-+# MODE-ARGS vary depending on the MODE.
++# MODE-ARGS vary depending on the MODE.  When passed as first option,
++# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
 +# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
 +#
 +# When reporting a bug, please describe a test case to reproduce it and
 +# include the following information:
 +#
-+#       host-triplet:	$host
-+#       shell:		$SHELL
-+#       compiler:		$LTCC
-+#       compiler flags:		$LTCFLAGS
-+#       linker:		$LD (gnu? $with_gnu_ld)
-+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
-+#       automake:		$automake_version
-+#       autoconf:		$autoconf_version
++#         host-triplet:	$host
++#         shell:		$SHELL
++#         compiler:		$LTCC
++#         compiler flags:		$LTCFLAGS
++#         linker:		$LD (gnu? $with_gnu_ld)
++#         $progname:	(GNU libtool) 2.4 Debian-2.4-4
++#         automake:	$automake_version
++#         autoconf:	$autoconf_version
 +#
 +# Report bugs to <bug-libtool@gnu.org>.
- 
--# Check that we have a working $echo.
--if test "X$1" = X--no-reexec; then
--  # Discard the --no-reexec flag, and continue.
--  shift
--elif test "X$1" = X--fallback-echo; then
--  # Avoid inline document here, it may be left over
--  :
--elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
--  # Yippee, $echo works!
--  :
-+PROGRAM=ltmain.sh
++# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
++# General help using GNU software: <http://www.gnu.org/gethelp/>.
++
++PROGRAM=libtool
 +PACKAGE=libtool
-+VERSION="2.2.6b Debian-2.2.6b-2"
++VERSION="2.4 Debian-2.4-4"
 +TIMESTAMP=""
-+package_revision=1.3017
++package_revision=1.3293
 +
 +# Be Bourne compatible
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -19380,26 +18282,21 @@
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
- else
--  # Restart under the correct shell, and then maybe $echo will work.
--  exec $SHELL "$0" --no-reexec ${1+"$@"}
++else
 +  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
++fi
 +BIN_SH=xpg4; export BIN_SH # for Tru64
 +DUALCASE=1; export DUALCASE # for MKS sh
- 
--if test "X$1" = X--fallback-echo; then
--  # used as fallback echo
--  shift
--  cat <<EOF
--$*
--EOF
--  exit 0
--fi
++
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
++{
++  eval 'cat <<_LTECHO_EOF
++$1
++_LTECHO_EOF'
++}
++
 +# NLS nuisances: We save the old values to restore during execute mode.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
 +lt_user_locale=
 +lt_safe_locale=
 +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -19412,29 +18309,27 @@
 +	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 +	fi"
 +done
- 
--# The name of this program.
--progname=`$echo "$0" | ${SED} 's%^.*/%%'`
--modename="$progname"
++LC_ALL=C
++LANGUAGE=C
++export LANGUAGE LC_ALL
++
 +$lt_unset CDPATH
  
--# Constants.
--PROGRAM=ltmain.sh
--PACKAGE=libtool
--VERSION=1.5.2
--TIMESTAMP=" (1.1220.2.60 2004/01/25 12:25:08)"
+-basename="s,^.*/,,g"
  
--default_mode=
--help="Try \`$progname --help' for more information."
--magic="%%%MAGIC variable%%%"
--mkdir="mkdir"
--mv="mv -f"
--rm="rm -f"
-+
+ # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+ # is ksh but when the shell is invoked as "sh" and the current value of
+@@ -33,123 +132,427 @@
+ # function.
+ progpath="$0"
+ 
+-# The name of this program:
+-progname=`echo "$progpath" | $SED $basename`
+-modename="$progname"
 +
 +
 +: ${CP="cp -f"}
-+: ${ECHO="echo"}
++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
 +: ${EGREP="/bin/grep -E"}
 +: ${FGREP="/bin/grep -F"}
 +: ${GREP="/bin/grep"}
@@ -19446,22 +18341,86 @@
 +: ${SED="/bin/sed"}
 +: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 +: ${Xsed="$SED -e 1s/^X//"}
-+
-+# Global variables:
-+EXIT_SUCCESS=0
-+EXIT_FAILURE=1
+ 
+ # Global variables:
+ EXIT_SUCCESS=0
+ EXIT_FAILURE=1
 +EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
 +EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-+
+ 
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5.22
+-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 +exit_status=$EXIT_SUCCESS
-+
+ 
+-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '${1+"$@"}'='"$@"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+-fi
 +# Make sure IFS has a sensible default
 +lt_nl='
 +'
 +IFS=" 	$lt_nl"
-+
+ 
+-# Check that we have a working $echo.
+-if test "X$1" = X--no-reexec; then
+-  # Discard the --no-reexec flag, and continue.
+-  shift
+-elif test "X$1" = X--fallback-echo; then
+-  # Avoid inline document here, it may be left over
+-  :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+-  # Yippee, $echo works!
+-  :
+-else
+-  # Restart under the correct shell, and then maybe $echo will work.
+-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+-fi
 +dirname="s,/[^/]*$,,"
 +basename="s,^.*/,,"
+ 
+-if test "X$1" = X--fallback-echo; then
+-  # used as fallback echo
+-  shift
+-  cat <<EOF
+-$*
+-EOF
+-  exit $EXIT_SUCCESS
+-fi
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
++    if test "X$func_dirname_result" = "X${1}"; then
++      func_dirname_result="${3}"
++    else
++      func_dirname_result="$func_dirname_result${2}"
++    fi
++} # func_dirname may be replaced by extended shell implementation
+ 
+-default_mode=
+-help="Try \`$progname --help' for more information."
+-magic="%%%MAGIC variable%%%"
+-mkdir="mkdir"
+-mv="mv -f"
+-rm="rm -f"
++
++# func_basename file
++func_basename ()
++{
++    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++} # func_basename may be replaced by extended shell implementation
++
 +
 +# func_dirname_and_basename file append nondir_replacement
 +# perform func_basename and func_dirname in a single function
@@ -19477,33 +18436,183 @@
 +# those functions but instead duplicate the functionality here.
 +func_dirname_and_basename ()
 +{
-+  # Extract subdirectory from the argument.
-+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-+  if test "X$func_dirname_result" = "X${1}"; then
-+    func_dirname_result="${3}"
-+  else
-+    func_dirname_result="$func_dirname_result${2}"
-+  fi
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
++    # Extract subdirectory from the argument.
++    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
++    if test "X$func_dirname_result" = "X${1}"; then
++      func_dirname_result="${3}"
++    else
++      func_dirname_result="$func_dirname_result${2}"
++    fi
++    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
++} # func_dirname_and_basename may be replaced by extended shell implementation
++
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++    case ${2} in
++      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
++      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++    esac
++} # func_stripname may be replaced by extended shell implementation
++
++
++# These SED scripts presuppose an absolute path with a trailing slash.
++pathcar='s,^/\([^/]*\).*$,\1,'
++pathcdr='s,^/[^/]*,,'
++removedotparts=':dotsl
++		s@/\./@/@g
++		t dotsl
++		s,/\.$,/,'
++collapseslashes='s@/\{1,\}@/@g'
++finalslash='s,/*$,/,'
++
++# func_normal_abspath PATH
++# Remove doubled-up and trailing slashes, "." path components,
++# and cancel out any ".." path components in PATH after making
++# it an absolute path.
++#             value returned in "$func_normal_abspath_result"
++func_normal_abspath ()
++{
++  # Start from root dir and reassemble the path.
++  func_normal_abspath_result=
++  func_normal_abspath_tpath=$1
++  func_normal_abspath_altnamespace=
++  case $func_normal_abspath_tpath in
++    "")
++      # Empty path, that just means $cwd.
++      func_stripname '' '/' "`pwd`"
++      func_normal_abspath_result=$func_stripname_result
++      return
++    ;;
++    # The next three entries are used to spot a run of precisely
++    # two leading slashes without using negated character classes;
++    # we take advantage of case's first-match behaviour.
++    ///*)
++      # Unusual form of absolute path, do nothing.
++    ;;
++    //*)
++      # Not necessarily an ordinary path; POSIX reserves leading '//'
++      # and for example Cygwin uses it to access remote file shares
++      # over CIFS/SMB, so we conserve a leading double slash if found.
++      func_normal_abspath_altnamespace=/
++    ;;
++    /*)
++      # Absolute path, do nothing.
++    ;;
++    *)
++      # Relative path, prepend $cwd.
++      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
++    ;;
++  esac
++  # Cancel out all the simple stuff to save iterations.  We also want
++  # the path to end with a slash for ease of parsing, so make sure
++  # there is one (and only one) here.
++  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
++  while :; do
++    # Processed it all yet?
++    if test "$func_normal_abspath_tpath" = / ; then
++      # If we ascended to the root using ".." the result may be empty now.
++      if test -z "$func_normal_abspath_result" ; then
++        func_normal_abspath_result=/
++      fi
++      break
++    fi
++    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
++        -e "$pathcar"`
++    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++        -e "$pathcdr"`
++    # Figure out what to do with it
++    case $func_normal_abspath_tcomponent in
++      "")
++        # Trailing empty path component, ignore it.
++      ;;
++      ..)
++        # Parent dir; strip last assembled component from result.
++        func_dirname "$func_normal_abspath_result"
++        func_normal_abspath_result=$func_dirname_result
++      ;;
++      *)
++        # Actual path component, append it.
++        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
++      ;;
++    esac
++  done
++  # Restore leading double-slash if one was found on entry.
++  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
 +}
 +
-+# Generated shell functions inserted here.
++# func_relative_path SRCDIR DSTDIR
++# generates a relative path from SRCDIR to DSTDIR, with a trailing
++# slash if non-empty, suitable for immediately appending a filename
++# without needing to append a separator.
++#             value returned in "$func_relative_path_result"
++func_relative_path ()
++{
++  func_relative_path_result=
++  func_normal_abspath "$1"
++  func_relative_path_tlibdir=$func_normal_abspath_result
++  func_normal_abspath "$2"
++  func_relative_path_tbindir=$func_normal_abspath_result
++
++  # Ascend the tree starting from libdir
++  while :; do
++    # check if we have found a prefix of bindir
++    case $func_relative_path_tbindir in
++      $func_relative_path_tlibdir)
++        # found an exact match
++        func_relative_path_tcancelled=
++        break
++        ;;
++      $func_relative_path_tlibdir*)
++        # found a matching prefix
++        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
++        func_relative_path_tcancelled=$func_stripname_result
++        if test -z "$func_relative_path_result"; then
++          func_relative_path_result=.
++        fi
++        break
++        ;;
++      *)
++        func_dirname $func_relative_path_tlibdir
++        func_relative_path_tlibdir=${func_dirname_result}
++        if test "x$func_relative_path_tlibdir" = x ; then
++          # Have to descend all the way to the root!
++          func_relative_path_result=../$func_relative_path_result
++          func_relative_path_tcancelled=$func_relative_path_tbindir
++          break
++        fi
++        func_relative_path_result=../$func_relative_path_result
++        ;;
++    esac
++  done
++
++  # Now calculate path; take care to avoid doubling-up slashes.
++  func_stripname '' '/' "$func_relative_path_result"
++  func_relative_path_result=$func_stripname_result
++  func_stripname '/' '/' "$func_relative_path_tcancelled"
++  if test "x$func_stripname_result" != x ; then
++    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
++  fi
 +
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
++  # Normalisation. If bindir is libdir, return empty string,
++  # else relative path ending with a slash; either way, target
++  # file name can be directly appended.
++  if test ! -z "$func_relative_path_result"; then
++    func_stripname './' '' "$func_relative_path_result/"
++    func_relative_path_result=$func_stripname_result
++  fi
++}
 +
 +# The name of this program:
-+# In the unlikely event $progname began with a '-', it would play havoc with
-+# func_echo (imagine progname=-n), so we prepend ./ in that case:
 +func_dirname_and_basename "$progpath"
 +progname=$func_basename_result
-+case $progname in
-+  -*) progname=./$progname ;;
-+esac
 +
 +# Make sure we have an absolute path for reexecution:
 +case $progpath in
@@ -19531,14 +18640,15 @@
  Xsed="${SED}"' -e 1s/^X//'
 -sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
 -# test EBCDIC or ASCII
--case `echo A|tr A '\301'` in
-- A) # EBCDIC based system
--  SP2NL="tr '\100' '\n'"
--  NL2SP="tr '\r\n' '\100\100'"
--  ;;
-- *) # Assume ASCII based system
--  SP2NL="tr '\040' '\012'"
--  NL2SP="tr '\015\012' '\040\040'"
+-case `echo X|tr X '\101'` in
+- A) # ASCII based system
+-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+-  SP2NL='tr \040 \012'
+-  NL2SP='tr \015\012 \040\040'
+-  ;;
+- *) # EBCDIC based system
+-  SP2NL='tr \100 \n'
+-  NL2SP='tr \r\n \100\100'
 -  ;;
 -esac
 +sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
@@ -19548,18 +18658,30 @@
 -# These must not be set unconditionally because not all systems understand
 -# e.g. LANG=C (notably SCO).
 -# We save the old values to restore during execute mode.
--if test "${LC_ALL+set}" = set; then
--  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
--fi
--if test "${LANG+set}" = set; then
--  save_LANG="$LANG"; LANG=C; export LANG
--fi
+-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+-do
+-  eval "if test \"\${$lt_var+set}\" = set; then
+-         save_$lt_var=\$$lt_var
+-         $lt_var=C
+-         export $lt_var
+-       fi"
+-done
 +# Same as above, but do not quote variable references.
 +double_quote_subst='s/\(["`\\]\)/\\\1/g'
  
 -# Make sure IFS has a sensible default
--: ${IFS=" 	
--"}
+-lt_nl='
+-'
+-IFS=" 	$lt_nl"
++# Sed substitution that turns a string into a regex matching for the
++# string literally.
++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
++
++# Sed substitution that converts a w32 file name or path
++# which contains forward slashes, into one that contains
++# (escaped) backslashes.  A very naive implementation.
++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++
 +# Re-`\' parameter expansions in output of double_quote_subst that were
 +# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
 +# in input to double_quote_subst, that '$' was protected from expansion.
@@ -19588,13 +18710,13 @@
 +# name if it has been set yet.
 +func_echo ()
 +{
-+    $ECHO "$progname${mode+: }$mode: $*"
++    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 +}
  
 -if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
 -  $echo "$modename: not configured to build any kind of library" 1>&2
 -  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
--  exit 1
+-  exit $EXIT_FAILURE
 -fi
 +# func_verbose arg...
 +# Echo program name prefixed message in verbose mode only.
@@ -19611,70 +18733,42 @@
 -show="$echo"
 -show_help=
 -execute_dlfiles=
+-duplicate_deps=no
+-preserve_args=
 -lo2o="s/\\.lo\$/.${objext}/"
 -o2lo="s/\\.${objext}\$/.lo/"
+-extracted_archives=
+-extracted_serial=0
 +    # A bug in bash halts the script if the last line of a function
 +    # fails when set -e is in force, so we need another command to
 +    # work around that:
 +    :
 +}
- 
--#####################################
--# Shell function definitions:
--# This seems to be the best place for them
++
++# func_echo_all arg...
++# Invoke $ECHO with all args, space-separated.
++func_echo_all ()
++{
++    $ECHO "$*"
++}
++
 +# func_error arg...
 +# Echo program name prefixed message to standard error.
 +func_error ()
 +{
-+    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
++    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 +}
- 
--# Need a lot of goo to handle *both* DLLs and import libs
--# Has to be a shell function in order to 'eat' the argument
--# that is supplied when $file_magic_command is called.
--win32_libid () {
--  win32_libid_type="unknown"
--  win32_fileres=`file -L $1 2>/dev/null`
--  case $win32_fileres in
--  *ar\ archive\ import\ library*) # definitely import
--    win32_libid_type="x86 archive import"
--    ;;
--  *ar\ archive*) # could be an import, or static
--    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
--      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
--      win32_nmres=`eval $NM -f posix -A $1 | \
--	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
--      if test "X$win32_nmres" = "Ximport" ; then
--        win32_libid_type="x86 archive import"
--      else
--        win32_libid_type="x86 archive static"
--      fi
--    fi
--    ;;
--  *DLL*) 
--    win32_libid_type="x86 DLL"
--    ;;
--  *executable*) # but shell scripts are "executable" too...
--    case $win32_fileres in
--    *MS\ Windows\ PE\ Intel*)
--      win32_libid_type="x86 DLL"
--      ;;
--    esac
--    ;;
--  esac
--  $echo $win32_libid_type
++
 +# func_warning arg...
 +# Echo program name prefixed warning message to standard error.
 +func_warning ()
 +{
-+    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
++    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 +
 +    # bash bug again:
 +    :
- }
- 
--# End of Shell function definitions
--#####################################
++}
++
 +# func_fatal_error arg...
 +# Echo program name prefixed message to standard error, and exit.
 +func_fatal_error ()
@@ -19682,12 +18776,7 @@
 +    func_error ${1+"$@"}
 +    exit $EXIT_FAILURE
 +}
- 
--# Parse our command line options once, thoroughly.
--while test "$#" -gt 0
--do
--  arg="$1"
--  shift
++
 +# func_fatal_help arg...
 +# Echo program name prefixed message to standard error, followed by
 +# a help hint, and exit.
@@ -19697,129 +18786,44 @@
 +    func_fatal_error "$help"
 +}
 +help="Try \`$progname --help' for more information."  ## default
- 
--  case $arg in
--  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
--  *) optarg= ;;
--  esac
- 
--  # If the previous option needs an argument, assign it.
--  if test -n "$prev"; then
--    case $prev in
--    execute_dlfiles)
--      execute_dlfiles="$execute_dlfiles $arg"
--      ;;
--    tag)
--      tagname="$arg"
--      preserve_args="${preserve_args}=$arg"
--
--      # Check whether tagname contains only valid characters
--      case $tagname in
--      *[!-_A-Za-z0-9,/]*)
--	$echo "$progname: invalid tag name: $tagname" 1>&2
--	exit 1
--	;;
--      esac
++
++
 +# func_grep expression filename
 +# Check whether EXPRESSION matches any line of FILENAME, without output.
 +func_grep ()
 +{
 +    $GREP "$1" "$2" >/dev/null 2>&1
 +}
- 
--      case $tagname in
--      CC)
--	# Don't test for the "default" C tag, as we know, it's there, but
--	# not specially marked.
--	;;
--      *)
--	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
--	  taglist="$taglist $tagname"
--	  # Evaluate the configuration.
--	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
--	else
--	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
--	fi
--	;;
--      esac
--      ;;
--    *)
--      eval "$prev=\$arg"
--      ;;
--    esac
- 
--    prev=
--    prevopt=
--    continue
--  fi
++
++
 +# func_mkdir_p directory-path
 +# Make sure the entire path to DIRECTORY-PATH is available.
 +func_mkdir_p ()
 +{
 +    my_directory_path="$1"
 +    my_dir_list=
- 
--  # Have we seen a non-optional argument yet?
--  case $arg in
--  --help)
--    show_help=yes
--    ;;
++
 +    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
- 
--  --version)
--    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
--    $echo
--    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
--    $echo "This is free software; see the source for copying conditions.  There is NO"
--    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
--    exit 0
--    ;;
++
 +      # Protect directory names starting with `-'
 +      case $my_directory_path in
 +        -*) my_directory_path="./$my_directory_path" ;;
 +      esac
- 
--  --config)
--    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
--    # Now print the configurations for the tags.
--    for tagname in $taglist; do
--      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
--    done
--    exit 0
--    ;;
++
 +      # While some portion of DIR does not yet exist...
 +      while test ! -d "$my_directory_path"; do
 +        # ...make a list in topmost first order.  Use a colon delimited
 +	# list incase some portion of path contains whitespace.
 +        my_dir_list="$my_directory_path:$my_dir_list"
- 
--  --debug)
--    $echo "$progname: enabling shell trace mode"
--    set -x
--    preserve_args="$preserve_args $arg"
--    ;;
++
 +        # If the last portion added has no slash in it, the list is done
 +        case $my_directory_path in */*) ;; *) break ;; esac
- 
--  --dry-run | -n)
--    run=:
--    ;;
++
 +        # ...otherwise throw away the child directory and loop
-+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
++        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
 +      done
-+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
- 
--  --features)
--    $echo "host: $host"
--    if test "$build_libtool_libs" = yes; then
--      $echo "enable shared libraries"
--    else
--      $echo "disable shared libraries"
--    fi
--    if test "$build_old_libs" = yes; then
--      $echo "enable static libraries"
--    else
--      $echo "disable static libraries"
++      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
++
 +      save_mkdir_p_IFS="$IFS"; IFS=':'
 +      for my_dir in $my_dir_list; do
 +	IFS="$save_mkdir_p_IFS"
@@ -19833,86 +18837,64 @@
 +      # Bail out if we (or some other process) failed to create a directory.
 +      test -d "$my_directory_path" || \
 +        func_fatal_error "Failed to create \`$1'"
-     fi
--    exit 0
--    ;;
++    fi
 +}
  
--  --finish) mode="finish" ;;
- 
--  --mode) prevopt="--mode" prev=mode ;;
--  --mode=*) mode="$optarg" ;;
-+# func_mktempdir [string]
-+# Make a temporary directory that won't clash with other running
-+# libtool processes, and avoids race conditions if possible.  If
-+# given, STRING is the basename for that directory.
-+func_mktempdir ()
-+{
-+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+-#####################################
+-# Shell function definitions:
+-# This seems to be the best place for them
  
--  --preserve-dup-deps) duplicate_deps="yes" ;;
-+    if test "$opt_dry_run" = ":"; then
-+      # Return a directory name, but don't create it in dry-run mode
-+      my_tmpdir="${my_template}-$$"
-+    else
+ # func_mktempdir [string]
+ # Make a temporary directory that won't clash with other running
+@@ -159,7 +562,7 @@
+ {
+     my_template="${TMPDIR-/tmp}/${1-$progname}"
  
--  --quiet | --silent)
--    show=:
--    preserve_args="$preserve_args $arg"
--    ;;
-+      # If mktemp works, use that first and foremost
-+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+-    if test "$run" = ":"; then
++    if test "$opt_dry_run" = ":"; then
+       # Return a directory name, but don't create it in dry-run mode
+       my_tmpdir="${my_template}-$$"
+     else
+@@ -168,6321 +571,8865 @@
+       my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
  
--  --tag) prevopt="--tag" prev=tag ;;
--  --tag=*)
--    set tag "$optarg" ${1+"$@"}
--    shift
--    prev=tag
--    preserve_args="$preserve_args --tag"
--    ;;
-+      if test ! -d "$my_tmpdir"; then
+       if test ! -d "$my_tmpdir"; then
+-	# Failing that, at least try and use $RANDOM to avoid a race
+-	my_tmpdir="${my_template}-${RANDOM-0}$$"
 +        # Failing that, at least try and use $RANDOM to avoid a race
 +        my_tmpdir="${my_template}-${RANDOM-0}$$"
  
--  -dlopen)
--    prevopt="-dlopen"
--    prev=execute_dlfiles
--    ;;
+-	save_mktempdir_umask=`umask`
+-	umask 0077
+-	$mkdir "$my_tmpdir"
+-	umask $save_mktempdir_umask
 +        save_mktempdir_umask=`umask`
 +        umask 0077
 +        $MKDIR "$my_tmpdir"
 +        umask $save_mktempdir_umask
-+      fi
+       fi
  
--  -*)
--    $echo "$modename: unrecognized option \`$arg'" 1>&2
--    $echo "$help" 1>&2
--    exit 1
--    ;;
-+      # If we're not in dry-run mode, bomb out on failure
+       # If we're not in dry-run mode, bomb out on failure
+-      test -d "$my_tmpdir" || {
+-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+-	exit $EXIT_FAILURE
+-      }
 +      test -d "$my_tmpdir" || \
 +        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-+    fi
+     fi
  
--  *)
--    nonopt="$arg"
--    break
--    ;;
--  esac
--done
-+    $ECHO "X$my_tmpdir" | $Xsed
-+}
+-    $echo "X$my_tmpdir" | $Xsed
++    $ECHO "$my_tmpdir"
+ }
  
--if test -n "$prevopt"; then
--  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
--  $echo "$help" 1>&2
--  exit 1
--fi
  
--# If this variable is set in any of the actions, the command in it
--# will be execed at the end.  This prevents here-documents from being
--# left over by shells.
--exec_cmd=
+-# func_win32_libid arg
+-# return the library type of file 'arg'
+-#
+-# Need a lot of goo to handle *both* DLLs and import libs
+-# Has to be a shell function in order to 'eat' the argument
+-# that is supplied when $file_magic_command is called.
+-func_win32_libid ()
 +# func_quote_for_eval arg
 +# Aesthetically quote ARG to be evaled later.
 +# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
@@ -19920,15 +18902,29 @@
 +# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
 +# which are still active within double quotes backslashified.
 +func_quote_for_eval ()
-+{
+ {
+-  win32_libid_type="unknown"
+-  win32_fileres=`file -L $1 2>/dev/null`
+-  case $win32_fileres in
+-  *ar\ archive\ import\ library*) # definitely import
+-    win32_libid_type="x86 archive import"
+-    ;;
+-  *ar\ archive*) # could be an import, or static
+-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+-      win32_nmres=`eval $NM -f posix -A $1 | \
+-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+-      case $win32_nmres in
+-      import*)  win32_libid_type="x86 archive import";;
+-      *)        win32_libid_type="x86 archive static";;
+-      esac
 +    case $1 in
 +      *[\\\`\"\$]*)
-+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
++	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
 +      *)
 +        func_quote_for_eval_unquoted_result="$1" ;;
 +    esac
- 
--if test -z "$show_help"; then
++
 +    case $func_quote_for_eval_unquoted_result in
 +      # Double-quote args containing shell metacharacters to delay
 +      # word splitting, command substitution and and variable
@@ -19942,46 +18938,8 @@
 +        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
 +    esac
 +}
- 
--  # Infer the operation mode.
--  if test -z "$mode"; then
--    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
--    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
--    case $nonopt in
--    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
--      mode=link
--      for arg
--      do
--	case $arg in
--	-c)
--	   mode=compile
--	   break
--	   ;;
--	esac
--      done
--      ;;
--    *db | *dbx | *strace | *truss)
--      mode=execute
--      ;;
--    *install*|cp|mv)
--      mode=install
--      ;;
--    *rm)
--      mode=uninstall
--      ;;
--    *)
--      # If we have no mode, but dlfiles were specified, then do execute mode.
--      test -n "$execute_dlfiles" && mode=execute
- 
--      # Just use the default operation mode.
--      if test -z "$mode"; then
--	if test -n "$nonopt"; then
--	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
--	else
--	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
--	fi
--      fi
--      ;;
++
++
 +# func_quote_for_expand arg
 +# Aesthetically quote ARG to be evaled later; same as above,
 +# but do not quote variable references.
@@ -19989,19 +18947,12 @@
 +{
 +    case $1 in
 +      *[\\\`\"]*)
-+	my_arg=`$ECHO "X$1" | $Xsed \
++	my_arg=`$ECHO "$1" | $SED \
 +	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
 +      *)
 +        my_arg="$1" ;;
-     esac
--  fi
- 
--  # Only execute mode is allowed to have -dlopen flags.
--  if test -n "$execute_dlfiles" && test "$mode" != execute; then
--    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
--    $echo "$help" 1>&2
--    exit 1
--  fi
++    esac
++
 +    case $my_arg in
 +      # Double-quote args containing shell metacharacters to delay
 +      # word splitting and command substitution for a subsequent eval.
@@ -20011,35 +18962,11 @@
 +        my_arg="\"$my_arg\""
 +        ;;
 +    esac
- 
--  # Change the help message to a mode-specific one.
--  generic_help="$help"
--  help="Try \`$modename --help --mode=$mode' for more information."
++
 +    func_quote_for_expand_result="$my_arg"
 +}
- 
--  # These modes are in order of execution frequency so that they run quickly.
--  case $mode in
--  # libtool compile mode
--  compile)
--    modename="$modename: compile"
--    # Get the compilation command and the source file.
--    base_compile=
--    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
--    suppress_opt=yes
--    suppress_output=
--    arg_mode=normal
--    libobj=
--    later=
- 
--    for arg
--    do
--      case "$arg_mode" in
--      arg  )
--	# do not "continue".  Instead, add this to base_compile
--	lastarg="$arg"
--	arg_mode=normal
--	;;
++
++
 +# func_show_eval cmd [fail_exp]
 +# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
 +# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
@@ -20048,12 +18975,7 @@
 +{
 +    my_cmd="$1"
 +    my_fail_exp="${2-:}"
- 
--      target )
--	libobj="$arg"
--	arg_mode=normal
--	continue
--	;;
++
 +    ${opt_silent-false} || {
 +      func_quote_for_expand "$my_cmd"
 +      eval "func_echo $func_quote_for_expand_result"
@@ -20065,25 +18987,10 @@
 +      if test "$my_status" -eq 0; then :; else
 +	eval "(exit $my_status); $my_fail_exp"
 +      fi
-+    fi
+     fi
 +}
- 
--      normal )
--	# Accept any command-line options.
--	case $arg in
--	-o)
--	  if test -n "$libobj" ; then
--	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
--	    exit 1
--	  fi
--	  arg_mode=target
--	  continue
--	  ;;
- 
--	-static | -prefer-pic | -prefer-non-pic)
--	  later="$later $arg"
--	  continue
--	  ;;
++
++
 +# func_show_eval_locale cmd [fail_exp]
 +# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
 +# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
@@ -20092,11 +18999,7 @@
 +{
 +    my_cmd="$1"
 +    my_fail_exp="${2-:}"
- 
--	-no-suppress)
--	  suppress_opt=no
--	  continue
--	  ;;
++
 +    ${opt_silent-false} || {
 +      func_quote_for_expand "$my_cmd"
 +      eval "func_echo $func_quote_for_expand_result"
@@ -20112,52 +19015,113 @@
 +      fi
 +    fi
 +}
++
++# func_tr_sh
++# Turn $1 into a string suitable for a shell variable name.
++# Result is stored in $func_tr_sh_result.  All characters
++# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
++# if $1 begins with a digit, a '_' is prepended as well.
++func_tr_sh ()
++{
++  case $1 in
++  [0-9]* | *[!a-zA-Z0-9_]*)
++    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+     ;;
+-  *DLL*)
+-    win32_libid_type="x86 DLL"
+-    ;;
+-  *executable*) # but shell scripts are "executable" too...
+-    case $win32_fileres in
+-    *MS\ Windows\ PE\ Intel*)
+-      win32_libid_type="x86 DLL"
+-      ;;
+-    esac
++  * )
++    func_tr_sh_result=$1
+     ;;
+   esac
+-  $echo $win32_libid_type
+ }
  
--	-Xcompiler)
--	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
--	  continue      #  The current "srcfile" will either be retained or
--	  ;;            #  replaced later.  I would guess that would be a bug.
- 
--	-Wc,*)
--	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
--	  lastarg=
--	  save_ifs="$IFS"; IFS=','
--	  for arg in $args; do
--	    IFS="$save_ifs"
  
+-# func_infer_tag arg
+-# Infer tagged configuration to use if any are available and
+-# if one wasn't chosen via the "--tag" command line option.
+-# Only attempt this if the compiler in the base compile
+-# command doesn't match the default compiler.
+-# arg is usually of the form 'gcc ...'
+-func_infer_tag ()
++# func_version
++# Echo version message to standard output and exit.
++func_version ()
+ {
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      CC_quoted=
+-      for arg in $CC; do
+-	case $arg in
+-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	  arg="\"$arg\""
+-	  ;;
+-	esac
+-	CC_quoted="$CC_quoted $arg"
+-      done
+-      case $@ in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+-	    CC_quoted=
+-	    for arg in $CC; do
 -	    # Double-quote args containing other shell metacharacters.
--	    # Many Bourne shells cannot handle close brackets correctly
--	    # in scan sets, so we specify it separately.
 -	    case $arg in
 -	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 -	      arg="\"$arg\""
 -	      ;;
 -	    esac
--	    lastarg="$lastarg $arg"
+-	    CC_quoted="$CC_quoted $arg"
 -	  done
--	  IFS="$save_ifs"
--	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
- 
--	  # Add the arguments to base_compile.
--	  base_compile="$base_compile $lastarg"
--	  continue
--	  ;;
- 
--	* )
--	  # Accept the current argument as the source file.
--	  # The previous "srcfile" becomes the current argument.
--	  #
--	  lastarg="$srcfile"
--	  srcfile="$arg"
--	  ;;
--	esac  #  case $arg
+-	    case "$@ " in
+-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+-	      # The compiler in the base compile command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit $EXIT_FAILURE
+-#        else
+-#          $echo "$modename: using $tagname tagged configuration"
+-	fi
 -	;;
--      esac    #  case $arg_mode
-+# func_version
-+# Echo version message to standard output and exit.
-+func_version ()
-+{
-+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+-      esac
+-    fi
+-}
++    $opt_debug
+ 
++    $SED -n '/(C)/!b go
++	:more
++	/\./!{
++	  N
++	  s/\n# / /
++	  b more
++	}
++	:go
++	/^# '$PROGRAM' (GNU /,/# warranty; / {
 +        s/^# //
 +	s/^# *$//
 +        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -20166,36 +19130,60 @@
 +     exit $?
 +}
  
--      # Aesthetically quote the previous argument.
--      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+-# func_extract_an_archive dir oldlib
+-func_extract_an_archive ()
 +# func_usage
 +# Echo short help message to standard output and exit.
 +func_usage ()
-+{
-+    $SED -n '/^# Usage:/,/# -h/ {
+ {
+-    f_ex_an_ar_dir="$1"; shift
+-    f_ex_an_ar_oldlib="$1"
++    $opt_debug
+ 
+-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
+-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
+-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+-     :
+-    else
+-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+-      exit $EXIT_FAILURE
+-    fi
++    $SED -n '/^# Usage:/,/^#  *.*--help/ {
 +        s/^# //
 +	s/^# *$//
 +	s/\$progname/'$progname'/
 +	p
 +    }' < "$progpath"
-+    $ECHO
++    echo
 +    $ECHO "run \`$progname --help | more' for full usage"
 +    exit $?
-+}
+ }
  
--      case $lastarg in
--      # Double-quote args containing other shell metacharacters.
--      # Many Bourne shells cannot handle close brackets correctly
--      # in scan sets, so we specify it separately.
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	lastarg="\"$lastarg\""
--	;;
--      esac
-+# func_help
-+# Echo long help message to standard output and exit.
+-# func_extract_archives gentop oldlib ...
+-func_extract_archives ()
++# func_help [NOEXIT]
++# Echo long help message to standard output and exit,
++# unless 'noexit' is passed as argument.
 +func_help ()
-+{
+ {
+-    my_gentop="$1"; shift
+-    my_oldlibs=${1+"$@"}
+-    my_oldobjs=""
+-    my_xlib=""
+-    my_xabs=""
+-    my_xdir=""
+-    my_status=""
++    $opt_debug
+ 
+-    $show "${rm}r $my_gentop"
+-    $run ${rm}r "$my_gentop"
+-    $show "$mkdir $my_gentop"
+-    $run $mkdir "$my_gentop"
+-    my_status=$?
+-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
+-      exit $my_status
 +    $SED -n '/^# Usage:/,/# Report bugs to/ {
++	:print
 +        s/^# //
 +	s/^# *$//
 +	s*\$progname*'$progname'*
@@ -20208,82 +19196,264 @@
 +	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
 +	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
 +	p
-+     }' < "$progpath"
-+    exit $?
++	d
++     }
++     /^# .* home page:/b print
++     /^# General help using/b print
++     ' < "$progpath"
++    ret=$?
++    if test -z "$1"; then
++      exit $ret
+     fi
 +}
  
--      base_compile="$base_compile $lastarg"
--    done # for arg
+-    for my_xlib in $my_oldlibs; do
+-      # Extract the objects.
+-      case $my_xlib in
+-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+-	*) my_xabs=`pwd`"/$my_xlib" ;;
+-      esac
+-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+-      my_xlib_u=$my_xlib
+-      while :; do
+-        case " $extracted_archives " in
+-       *" $my_xlib_u "*)
+-         extracted_serial=`expr $extracted_serial + 1`
+-         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+-       *) break ;;
+-       esac
+-      done
+-      extracted_archives="$extracted_archives $my_xlib_u"
+-      my_xdir="$my_gentop/$my_xlib_u"
 +# func_missing_arg argname
 +# Echo program name prefixed message to standard error and set global
 +# exit_cmd.
 +func_missing_arg ()
 +{
-+    func_error "missing argument for $1"
++    $opt_debug
+ 
+-      $show "${rm}r $my_xdir"
+-      $run ${rm}r "$my_xdir"
+-      $show "$mkdir $my_xdir"
+-      $run $mkdir "$my_xdir"
+-      exit_status=$?
+-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
+-	exit $exit_status
+-      fi
+-      case $host in
+-      *-darwin*)
+-	$show "Extracting $my_xabs"
+-	# Do not bother doing anything if just a dry run
+-	if test -z "$run"; then
+-	  darwin_orig_dir=`pwd`
+-	  cd $my_xdir || exit $?
+-	  darwin_archive=$my_xabs
+-	  darwin_curdir=`pwd`
+-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
+-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
+-	  if test -n "$darwin_arches"; then 
+-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
+-	    darwin_arch=
+-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
+-	    for darwin_arch in  $darwin_arches ; do
+-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+-	      cd "$darwin_curdir"
+-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+-	    done # $darwin_arches
+-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
+-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
+-	    darwin_file=
+-	    darwin_files=
+-	    for darwin_file in $darwin_filelist; do
+-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+-	      lipo -create -output "$darwin_file" $darwin_files
+-	    done # $darwin_filelist
+-	    ${rm}r unfat-$$
+-	    cd "$darwin_orig_dir"
+-	  else
+-	    cd "$darwin_orig_dir"
+- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
+-	  fi # $darwin_arches
+-	fi # $run
+-	;;
+-      *)
+-        func_extract_an_archive "$my_xdir" "$my_xabs"
+-        ;;
+-      esac
+-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-    done
+-    func_extract_archives_result="$my_oldobjs"
++    func_error "missing argument for $1."
 +    exit_cmd=exit
-+}
+ }
+-# End of Shell function definitions
+-#####################################
  
--    case $arg_mode in
--    arg)
--      $echo "$modename: you must specify an argument for -Xcompile"
--      exit 1
+-# Darwin sucks
+-eval std_shrext=\"$shrext_cmds\"
+ 
+-disable_libs=no
++# func_split_short_opt shortopt
++# Set func_split_short_opt_name and func_split_short_opt_arg shell
++# variables after splitting SHORTOPT after the 2nd character.
++func_split_short_opt ()
++{
++    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
++    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+ 
+-# Parse our command line options once, thoroughly.
+-while test "$#" -gt 0
+-do
+-  arg="$1"
+-  shift
++    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
++    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
++} # func_split_short_opt may be replaced by extended shell implementation
+ 
+-  case $arg in
+-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+-  *) optarg= ;;
+-  esac
+ 
+-  # If the previous option needs an argument, assign it.
+-  if test -n "$prev"; then
+-    case $prev in
+-    execute_dlfiles)
+-      execute_dlfiles="$execute_dlfiles $arg"
 -      ;;
--    target)
--      $echo "$modename: you must specify a target with \`-o'" 1>&2
--      exit 1
+-    tag)
+-      tagname="$arg"
+-      preserve_args="${preserve_args}=$arg"
+-
+-      # Check whether tagname contains only valid characters
+-      case $tagname in
+-      *[!-_A-Za-z0-9,/]*)
+-	$echo "$progname: invalid tag name: $tagname" 1>&2
+-	exit $EXIT_FAILURE
+-	;;
+-      esac
++# func_split_long_opt longopt
++# Set func_split_long_opt_name and func_split_long_opt_arg shell
++# variables after splitting LONGOPT at the `=' sign.
++func_split_long_opt ()
++{
++    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
++    my_sed_long_arg='1s/^--[^=]*=//'
+ 
+-      case $tagname in
+-      CC)
+-	# Don't test for the "default" C tag, as we know, it's there, but
+-	# not specially marked.
+-	;;
+-      *)
+-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+-	  taglist="$taglist $tagname"
+-	  # Evaluate the configuration.
+-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+-	else
+-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+-	fi
+-	;;
+-      esac
+-      ;;
+-    *)
+-      eval "$prev=\$arg"
+-      ;;
+-    esac
++    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
++    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
++} # func_split_long_opt may be replaced by extended shell implementation
+ 
+-    prev=
+-    prevopt=
+-    continue
+-  fi
 +exit_cmd=:
+ 
+-  # Have we seen a non-optional argument yet?
+-  case $arg in
+-  --help)
+-    show_help=yes
+-    ;;
+ 
+-  --version)
+-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+-    $echo
+-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
+-    $echo "This is free software; see the source for copying conditions.  There is NO"
+-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+-    exit $?
+-    ;;
+ 
+-  --config)
+-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
 +
 +
-+
-+
-+
-+# Check that we have a working $ECHO.
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $ECHO works!
-+  :
-+else
-+  # Restart under the correct shell, and then maybe $ECHO will work.
-+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit $EXIT_SUCCESS
-+fi
-+
 +magic="%%%MAGIC variable%%%"
 +magic_exe="%%%MAGIC EXE variable%%%"
 +
 +# Global variables.
-+# $mode is unset
 +nonopt=
-+execute_dlfiles=
 +preserve_args=
 +lo2o="s/\\.lo\$/.${objext}/"
 +o2lo="s/\\.${objext}\$/.lo/"
 +extracted_archives=
 +extracted_serial=0
 +
-+opt_dry_run=false
-+opt_duplicate_deps=false
-+opt_silent=false
-+opt_debug=:
-+
 +# If this variable is set in any of the actions, the command in it
 +# will be execed at the end.  This prevents here-documents from being
 +# left over by shells.
 +exec_cmd=
 +
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++    eval "${1}=\$${1}\${2}"
++} # func_append may be replaced by extended shell implementation
++
++# func_append_quoted var value
++# Quote VALUE and append to the end of shell variable VAR, separated
++# by a space.
++func_append_quoted ()
++{
++    func_quote_for_eval "${2}"
++    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
++} # func_append_quoted may be replaced by extended shell implementation
++
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++    func_arith_result=`expr "${@}"`
++} # func_arith may be replaced by extended shell implementation
++
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
++} # func_len may be replaced by extended shell implementation
++
++
++# func_lo2o object
++func_lo2o ()
++{
++    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
++} # func_lo2o may be replaced by extended shell implementation
++
++
++# func_xform libobj-or-source
++func_xform ()
++{
++    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
++} # func_xform may be replaced by extended shell implementation
++
++
 +# func_fatal_configuration arg...
 +# Echo program name prefixed message to standard error, followed by
 +# a configuration failure hint, and exit.
@@ -20305,33 +19475,58 @@
 +    # Default configuration.
 +    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
 +
-+    # Now print the configurations for the tags.
-+    for tagname in $taglist; do
+     # Now print the configurations for the tags.
+     for tagname in $taglist; do
+-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
 +      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-+    done
-+
+     done
+-    exit $?
+-    ;;
+-
+-  --debug)
+-    $echo "$progname: enabling shell trace mode"
+-    set -x
+-    preserve_args="$preserve_args $arg"
+-    ;;
+ 
+-  --dry-run | -n)
+-    run=:
+-    ;;
 +    exit $?
 +}
-+
+ 
+-  --features)
+-    $echo "host: $host"
 +# func_features
 +# Display the features supported by this script.
 +func_features ()
 +{
-+    $ECHO "host: $host"
-+    if test "$build_libtool_libs" = yes; then
-+      $ECHO "enable shared libraries"
-+    else
-+      $ECHO "disable shared libraries"
-+    fi
-+    if test "$build_old_libs" = yes; then
-+      $ECHO "enable static libraries"
-+    else
-+      $ECHO "disable static libraries"
-+    fi
-+
++    echo "host: $host"
+     if test "$build_libtool_libs" = yes; then
+-      $echo "enable shared libraries"
++      echo "enable shared libraries"
+     else
+-      $echo "disable shared libraries"
++      echo "disable shared libraries"
+     fi
+     if test "$build_old_libs" = yes; then
+-      $echo "enable static libraries"
++      echo "enable static libraries"
+     else
+-      $echo "disable static libraries"
++      echo "disable static libraries"
+     fi
+-    exit $?
+-    ;;
+-
+-  --finish) mode="finish" ;;
+ 
+-  --mode) prevopt="--mode" prev=mode ;;
+-  --mode=*) mode="$optarg" ;;
 +    exit $?
 +}
-+
+ 
+-  --preserve-dup-deps) duplicate_deps="yes" ;;
 +# func_enable_tag tagname
 +# Verify that TAGNAME is valid, and either flag an error and exit, or
 +# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
@@ -20340,7 +19535,11 @@
 +{
 +  # Global variable:
 +  tagname="$1"
-+
+ 
+-  --quiet | --silent)
+-    show=:
+-    preserve_args="$preserve_args $arg"
+-    ;;
 +  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
 +  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
 +  sed_extractcf="/$re_begincf/,/$re_endcf/p"
@@ -20349,19 +19548,32 @@
 +  case $tagname in
 +    *[!-_A-Za-z0-9,/]*)
 +      func_fatal_error "invalid tag name: $tagname"
-       ;;
++      ;;
 +  esac
-+
+ 
+-  --tag)
+-    prevopt="--tag"
+-    prev=tag
+-    preserve_args="$preserve_args --tag"
+-    ;;
+-  --tag=*)
+-    set tag "$optarg" ${1+"$@"}
+-    shift
+-    prev=tag
+-    preserve_args="$preserve_args --tag"
+-    ;;
 +  # Don't test for the "default" C tag, as we know it's
 +  # there but not specially marked.
 +  case $tagname in
 +    CC) ;;
-     *)
--      # Get the name of the library object.
--      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
++    *)
 +      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
 +	taglist="$taglist $tagname"
-+
+ 
+-  -dlopen)
+-    prevopt="-dlopen"
+-    prev=execute_dlfiles
+-    ;;
 +	# Evaluate the configuration.  Be careful to quote the path
 +	# and the sed script, to avoid splitting on whitespace, but
 +	# also don't use non-portable quotes within backquotes within
@@ -20371,160 +19583,15 @@
 +      else
 +	func_error "ignoring unknown tag $tagname"
 +      fi
-       ;;
--    esac
++      ;;
 +  esac
 +}
  
--    # Recognize several different file suffixes.
--    # If the user specifies -o file.o, it is replaced with file.lo
--    xform='[cCFSifmso]'
--    case $libobj in
--    *.ada) xform=ada ;;
--    *.adb) xform=adb ;;
--    *.ads) xform=ads ;;
--    *.asm) xform=asm ;;
--    *.c++) xform=c++ ;;
--    *.cc) xform=cc ;;
--    *.ii) xform=ii ;;
--    *.class) xform=class ;;
--    *.cpp) xform=cpp ;;
--    *.cxx) xform=cxx ;;
--    *.f90) xform=f90 ;;
--    *.for) xform=for ;;
--    *.java) xform=java ;;
-+# Parse options once, thoroughly.  This comes as soon as possible in
-+# the script to make things like `libtool --version' happen quickly.
-+{
-+
-+  # Shorthand for --mode=foo, only valid as the first argument
-+  case $1 in
-+  clean|clea|cle|cl)
-+    shift; set dummy --mode clean ${1+"$@"}; shift
-+    ;;
-+  compile|compil|compi|comp|com|co|c)
-+    shift; set dummy --mode compile ${1+"$@"}; shift
-+    ;;
-+  execute|execut|execu|exec|exe|ex|e)
-+    shift; set dummy --mode execute ${1+"$@"}; shift
-+    ;;
-+  finish|finis|fini|fin|fi|f)
-+    shift; set dummy --mode finish ${1+"$@"}; shift
-+    ;;
-+  install|instal|insta|inst|ins|in|i)
-+    shift; set dummy --mode install ${1+"$@"}; shift
-+    ;;
-+  link|lin|li|l)
-+    shift; set dummy --mode link ${1+"$@"}; shift
-+    ;;
-+  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-+    shift; set dummy --mode uninstall ${1+"$@"}; shift
-+    ;;
-+  esac
-+
-+  # Parse non-mode specific arguments:
-+  while test "$#" -gt 0; do
-+    opt="$1"
-+    shift
-+
-+    case $opt in
-+      --config)		func_config					;;
-+
-+      --debug)		preserve_args="$preserve_args $opt"
-+			func_echo "enabling shell trace mode"
-+			opt_debug='set -x'
-+			$opt_debug
-+			;;
-+
-+      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-+			execute_dlfiles="$execute_dlfiles $1"
-+			shift
-+			;;
-+
-+      --dry-run | -n)	opt_dry_run=:					;;
-+      --features)       func_features					;;
-+      --finish)		mode="finish"					;;
-+
-+      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-+			case $1 in
-+			  # Valid mode arguments:
-+			  clean)	;;
-+			  compile)	;;
-+			  execute)	;;
-+			  finish)	;;
-+			  install)	;;
-+			  link)		;;
-+			  relink)	;;
-+			  uninstall)	;;
-+
-+			  # Catch anything else as an error
-+			  *) func_error "invalid argument for $opt"
-+			     exit_cmd=exit
-+			     break
-+			     ;;
-+		        esac
-+
-+			mode="$1"
-+			shift
-+			;;
-+
-+      --preserve-dup-deps)
-+			opt_duplicate_deps=:				;;
-+
-+      --quiet|--silent)	preserve_args="$preserve_args $opt"
-+			opt_silent=:
-+			;;
-+
-+      --verbose| -v)	preserve_args="$preserve_args $opt"
-+			opt_silent=false
-+			;;
-+
-+      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-+			preserve_args="$preserve_args $opt $1"
-+			func_enable_tag "$1"	# tagname is set here
-+			shift
-+			;;
-+
-+      # Separate optargs to long options:
-+      -dlopen=*|--mode=*|--tag=*)
-+			func_opt_split "$opt"
-+			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-+			shift
-+			;;
-+
-+      -\?|-h)		func_usage					;;
-+      --help)		opt_help=:					;;
-+      --version)	func_version					;;
-+
-+      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-+
-+      *)		nonopt="$opt"
-+			break
-+			;;
-     esac
-+  done
- 
--    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
- 
--    case $libobj in
--    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-+  case $host in
-+    *cygwin* | *mingw* | *pw32* | *cegcc*)
-+      # don't eliminate duplications in $postdeps and $predeps
-+      opt_duplicate_compiler_generated_deps=:
-+      ;;
-     *)
--      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
--      exit 1
-+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-       ;;
-+  esac
-+
-+  # Having warned about all mis-specified options, bail out if
-+  # anything was wrong.
-+  $exit_cmd $EXIT_FAILURE
-+}
-+
+-  -*)
+-    $echo "$modename: unrecognized option \`$arg'" 1>&2
+-    $echo "$help" 1>&2
+-    exit $EXIT_FAILURE
+-    ;;
 +# func_check_version_match
 +# Ensure that we are using m4 macros, and libtool script from the same
 +# release of libtool.
@@ -20555,43 +19622,402 @@
 +$progname: of $PACKAGE $VERSION and run autoconf again.
 +_LT_EOF
 +    fi
-+
+ 
+-  *)
+-    nonopt="$arg"
+-    break
+-    ;;
+-  esac
+-done
 +    exit $EXIT_MISMATCH
 +  fi
 +}
+ 
+-if test -n "$prevopt"; then
+-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+-  $echo "$help" 1>&2
+-  exit $EXIT_FAILURE
+-fi
+ 
+-case $disable_libs in
+-no) 
++# Shorthand for --mode=foo, only valid as the first argument
++case $1 in
++clean|clea|cle|cl)
++  shift; set dummy --mode clean ${1+"$@"}; shift
++  ;;
++compile|compil|compi|comp|com|co|c)
++  shift; set dummy --mode compile ${1+"$@"}; shift
++  ;;
++execute|execut|execu|exec|exe|ex|e)
++  shift; set dummy --mode execute ${1+"$@"}; shift
++  ;;
++finish|finis|fini|fin|fi|f)
++  shift; set dummy --mode finish ${1+"$@"}; shift
+   ;;
+-shared)
+-  build_libtool_libs=no
+-  build_old_libs=yes
++install|instal|insta|inst|ins|in|i)
++  shift; set dummy --mode install ${1+"$@"}; shift
+   ;;
+-static)
+-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++link|lin|li|l)
++  shift; set dummy --mode link ${1+"$@"}; shift
++  ;;
++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
++  shift; set dummy --mode uninstall ${1+"$@"}; shift
+   ;;
+ esac
+ 
+-# If this variable is set in any of the actions, the command in it
+-# will be execed at the end.  This prevents here-documents from being
+-# left over by shells.
+-exec_cmd=
+ 
+-if test -z "$show_help"; then
+ 
+-  # Infer the operation mode.
+-  if test -z "$mode"; then
+-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+-    case $nonopt in
+-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+-      mode=link
+-      for arg
+-      do
+-	case $arg in
+-	-c)
+-	   mode=compile
+-	   break
+-	   ;;
+-	esac
+-      done
+-      ;;
+-    *db | *dbx | *strace | *truss)
+-      mode=execute
+-      ;;
+-    *install*|cp|mv)
+-      mode=install
+-      ;;
+-    *rm)
+-      mode=uninstall
+-      ;;
+-    *)
+-      # If we have no mode, but dlfiles were specified, then do execute mode.
+-      test -n "$execute_dlfiles" && mode=execute
++# Option defaults:
++opt_debug=:
++opt_dry_run=false
++opt_config=false
++opt_preserve_dup_deps=false
++opt_features=false
++opt_finish=false
++opt_help=false
++opt_help_all=false
++opt_silent=:
++opt_verbose=:
++opt_silent=false
++opt_verbose=false
+ 
+-      # Just use the default operation mode.
+-      if test -z "$mode"; then
+-	if test -n "$nonopt"; then
+-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+-	else
+-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+-	fi
+-      fi
+-      ;;
 +
++# Parse options once, thoroughly.  This comes as soon as possible in the
++# script to make things like `--version' happen as quickly as we can.
++{
++  # this just eases exit handling
++  while test $# -gt 0; do
++    opt="$1"
++    shift
++    case $opt in
++      --debug|-x)	opt_debug='set -x'
++			func_echo "enabling shell trace mode"
++			$opt_debug
++			;;
++      --dry-run|--dryrun|-n)
++			opt_dry_run=:
++			;;
++      --config)
++			opt_config=:
++func_config
++			;;
++      --dlopen|-dlopen)
++			optarg="$1"
++			opt_dlopen="${opt_dlopen+$opt_dlopen
++}$optarg"
++			shift
++			;;
++      --preserve-dup-deps)
++			opt_preserve_dup_deps=:
++			;;
++      --features)
++			opt_features=:
++func_features
++			;;
++      --finish)
++			opt_finish=:
++set dummy --mode finish ${1+"$@"}; shift
++			;;
++      --help)
++			opt_help=:
++			;;
++      --help-all)
++			opt_help_all=:
++opt_help=': help-all'
++			;;
++      --mode)
++			test $# = 0 && func_missing_arg $opt && break
++			optarg="$1"
++			opt_mode="$optarg"
++case $optarg in
++  # Valid mode arguments:
++  clean|compile|execute|finish|install|link|relink|uninstall) ;;
++
++  # Catch anything else as an error
++  *) func_error "invalid argument for $opt"
++     exit_cmd=exit
++     break
++     ;;
++esac
++			shift
++			;;
++      --no-silent|--no-quiet)
++			opt_silent=false
++func_append preserve_args " $opt"
++			;;
++      --no-verbose)
++			opt_verbose=false
++func_append preserve_args " $opt"
++			;;
++      --silent|--quiet)
++			opt_silent=:
++func_append preserve_args " $opt"
++        opt_verbose=false
++			;;
++      --verbose|-v)
++			opt_verbose=:
++func_append preserve_args " $opt"
++opt_silent=false
++			;;
++      --tag)
++			test $# = 0 && func_missing_arg $opt && break
++			optarg="$1"
++			opt_tag="$optarg"
++func_append preserve_args " $opt $optarg"
++func_enable_tag "$optarg"
++			shift
++			;;
 +
-+## ----------- ##
-+##    Main.    ##
-+## ----------- ##
-+
-+$opt_help || {
-+  # Sanity checks first:
-+  func_check_version_match
-+
-+  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+    func_fatal_configuration "not configured to build any kind of library"
-+  fi
-+
-+  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-+
++      -\?|-h)		func_usage				;;
++      --help)		func_help				;;
++      --version)	func_version				;;
 +
-+  # Darwin sucks
-+  eval std_shrext=\"$shrext_cmds\"
++      # Separate optargs to long options:
++      --*=*)
++			func_split_long_opt "$opt"
++			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
++			shift
++			;;
 +
++      # Separate non-argument short options:
++      -\?*|-h*|-n*|-v*)
++			func_split_short_opt "$opt"
++			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
++			shift
++			;;
 +
-+  # Only execute mode is allowed to have -dlopen flags.
-+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-+    func_error "unrecognized option \`-dlopen'"
-+    $ECHO "$help" 1>&2
-+    exit $EXIT_FAILURE
-+  fi
++      --)		break					;;
++      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
++      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
+     esac
+-  fi
++  done
+ 
+-  # Only execute mode is allowed to have -dlopen flags.
+-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+-    $echo "$help" 1>&2
+-    exit $EXIT_FAILURE
++  # Validate options:
 +
-+  # Change the help message to a mode-specific one.
-+  generic_help="$help"
-+  help="Try \`$progname --help --mode=$mode' for more information."
++  # save first non-option argument
++  if test "$#" -gt 0; then
++    nonopt="$opt"
++    shift
+   fi
+ 
+-  # Change the help message to a mode-specific one.
+-  generic_help="$help"
+-  help="Try \`$modename --help --mode=$mode' for more information."
+-
+-  # These modes are in order of execution frequency so that they run quickly.
+-  case $mode in
+-  # libtool compile mode
+-  compile)
+-    modename="$modename: compile"
+-    # Get the compilation command and the source file.
+-    base_compile=
+-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+-    suppress_opt=yes
+-    suppress_output=
+-    arg_mode=normal
+-    libobj=
+-    later=
+-
+-    for arg
+-    do
+-      case $arg_mode in
+-      arg  )
+-	# do not "continue".  Instead, add this to base_compile
+-	lastarg="$arg"
+-	arg_mode=normal
+-	;;
+-
+-      target )
+-	libobj="$arg"
+-	arg_mode=normal
+-	continue
+-	;;
++  # preserve --debug
++  test "$opt_debug" = : || func_append preserve_args " --debug"
+ 
+-      normal )
+-	# Accept any command-line options.
+-	case $arg in
+-	-o)
+-	  if test -n "$libobj" ; then
+-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+-	    exit $EXIT_FAILURE
+-	  fi
+-	  arg_mode=target
+-	  continue
+-	  ;;
++  case $host in
++    *cygwin* | *mingw* | *pw32* | *cegcc*)
++      # don't eliminate duplications in $postdeps and $predeps
++      opt_duplicate_compiler_generated_deps=:
++      ;;
++    *)
++      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
++      ;;
++  esac
+ 
+-	-static | -prefer-pic | -prefer-non-pic)
+-	  later="$later $arg"
+-	  continue
+-	  ;;
++  $opt_help || {
++    # Sanity checks first:
++    func_check_version_match
+ 
+-	-no-suppress)
+-	  suppress_opt=no
+-	  continue
+-	  ;;
++    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++      func_fatal_configuration "not configured to build any kind of library"
++    fi
+ 
+-	-Xcompiler)
+-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+-	  continue      #  The current "srcfile" will either be retained or
+-	  ;;            #  replaced later.  I would guess that would be a bug.
++    # Darwin sucks
++    eval std_shrext=\"$shrext_cmds\"
+ 
+-	-Wc,*)
+-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+-	  lastarg=
+-	  save_ifs="$IFS"; IFS=','
+- 	  for arg in $args; do
+-	    IFS="$save_ifs"
++    # Only execute mode is allowed to have -dlopen flags.
++    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
++      func_error "unrecognized option \`-dlopen'"
++      $ECHO "$help" 1>&2
++      exit $EXIT_FAILURE
++    fi
+ 
+-	    # Double-quote args containing other shell metacharacters.
+-	    # Many Bourne shells cannot handle close brackets correctly
+-	    # in scan sets, so we specify it separately.
+-	    case $arg in
+-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	      arg="\"$arg\""
+-	      ;;
+-	    esac
+-	    lastarg="$lastarg $arg"
+-	  done
+-	  IFS="$save_ifs"
+-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
++    # Change the help message to a mode-specific one.
++    generic_help="$help"
++    help="Try \`$progname --help --mode=$opt_mode' for more information."
++  }
+ 
+-	  # Add the arguments to base_compile.
+-	  base_compile="$base_compile $lastarg"
+-	  continue
+-	  ;;
+ 
+-	* )
+-	  # Accept the current argument as the source file.
+-	  # The previous "srcfile" becomes the current argument.
+-	  #
+-	  lastarg="$srcfile"
+-	  srcfile="$arg"
+-	  ;;
+-	esac  #  case $arg
+-	;;
+-      esac    #  case $arg_mode
++  # Bail if the options were screwed
++  $exit_cmd $EXIT_FAILURE
 +}
-+
+ 
+-      # Aesthetically quote the previous argument.
+-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+ 
+-      case $lastarg in
+-      # Double-quote args containing other shell metacharacters.
+-      # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
+-      # in scan sets (worked around with variable expansion),
+-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
+-      # at all, so we specify them separately.
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	lastarg="\"$lastarg\""
+-	;;
+-      esac
+ 
+-      base_compile="$base_compile $lastarg"
+-    done # for arg
+ 
+-    case $arg_mode in
+-    arg)
+-      $echo "$modename: you must specify an argument for -Xcompile"
+-      exit $EXIT_FAILURE
+-      ;;
+-    target)
+-      $echo "$modename: you must specify a target with \`-o'" 1>&2
+-      exit $EXIT_FAILURE
+-      ;;
+-    *)
+-      # Get the name of the library object.
+-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+-      ;;
+-    esac
++## ----------- ##
++##    Main.    ##
++## ----------- ##
 +
 +# func_lalib_p file
 +# True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -20603,7 +20029,26 @@
 +      $SED -e 4q "$1" 2>/dev/null \
 +        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
 +}
-+
+ 
+-    # Recognize several different file suffixes.
+-    # If the user specifies -o file.o, it is replaced with file.lo
+-    xform='[cCFSifmso]'
+-    case $libobj in
+-    *.ada) xform=ada ;;
+-    *.adb) xform=adb ;;
+-    *.ads) xform=ads ;;
+-    *.asm) xform=asm ;;
+-    *.c++) xform=c++ ;;
+-    *.cc) xform=cc ;;
+-    *.ii) xform=ii ;;
+-    *.class) xform=class ;;
+-    *.cpp) xform=cpp ;;
+-    *.cxx) xform=cxx ;;
+-    *.f90) xform=f90 ;;
+-    *.for) xform=for ;;
+-    *.java) xform=java ;;
+-    *.obj) xform=obj ;;
+-    esac
 +# func_lalib_unsafe_p file
 +# True iff FILE is a libtool `.la' library or `.lo' object file.
 +# This function implements the same check as func_lalib_p without
@@ -20626,7 +20071,8 @@
 +    fi
 +    test "$lalib_p" = yes
 +}
-+
+ 
+-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
 +# func_ltwrapper_script_p file
 +# True iff FILE is a libtool wrapper script
 +# This function is only a basic sanity check; it will hardly flush out
@@ -20635,7 +20081,13 @@
 +{
 +    func_lalib_p "$1"
 +}
-+
+ 
+-    case $libobj in
+-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+-    *)
+-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+-      exit $EXIT_FAILURE
+-      ;;
 +# func_ltwrapper_executable_p file
 +# True iff FILE is a libtool wrapper executable
 +# This function is only a basic sanity check; it will hardly flush out
@@ -20646,24 +20098,28 @@
 +    case $1 in
 +    *.exe) ;;
 +    *) func_ltwrapper_exec_suffix=.exe ;;
-+    esac
+     esac
 +    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
 +}
-+
+ 
+-    func_infer_tag $base_compile
 +# func_ltwrapper_scriptname file
 +# Assumes file is an ltwrapper_executable
 +# uses $file to determine the appropriate filename for a
 +# temporary ltwrapper_script.
 +func_ltwrapper_scriptname ()
 +{
-+    func_ltwrapper_scriptname_result=""
-+    if func_ltwrapper_executable_p "$1"; then
-+	func_dirname_and_basename "$1" "" "."
-+	func_stripname '' '.exe' "$func_basename_result"
-+	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-+    fi
++    func_dirname_and_basename "$1" "" "."
++    func_stripname '' '.exe' "$func_basename_result"
++    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 +}
-+
+ 
+-    for arg in $later; do
+-      case $arg in
+-      -static)
+-	build_old_libs=yes
+-	continue
+-	;;
 +# func_ltwrapper_p file
 +# True iff FILE is a libtool wrapper script or wrapper executable
 +# This function is only a basic sanity check; it will hardly flush out
@@ -20672,8 +20128,17 @@
 +{
 +    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
 +}
-+
-+
+ 
+-      -prefer-pic)
+-	pic_mode=yes
+-	continue
+-	;;
+ 
+-      -prefer-non-pic)
+-	pic_mode=no
+-	continue
+-	;;
+-      esac
 +# func_execute_cmds commands fail_cmd
 +# Execute tilde-delimited COMMANDS.
 +# If FAIL_CMD is given, eval that upon failure.
@@ -20686,11 +20151,32 @@
 +      IFS=$save_ifs
 +      eval cmd=\"$cmd\"
 +      func_show_eval "$cmd" "${2-:}"
-+    done
+     done
 +    IFS=$save_ifs
 +}
-+
-+
+ 
+-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
+-    case $qlibobj in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	qlibobj="\"$qlibobj\"" ;;
+-    esac
+-    test "X$libobj" != "X$qlibobj" \
+-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
+-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+-    if test "X$xdir" = "X$obj"; then
+-      xdir=
+-    else
+-      xdir=$xdir/
+-    fi
+-    lobj=${xdir}$objdir/$objname
+ 
+-    if test -z "$base_compile"; then
+-      $echo "$modename: you must specify a compilation command" 1>&2
+-      $echo "$help" 1>&2
+-      exit $EXIT_FAILURE
+-    fi
 +# func_source file
 +# Source FILE, adding directory component if necessary.
 +# Note that it is not necessary on cygwin/mingw to append a dot to
@@ -20703,14 +20189,70 @@
 +    case $1 in
 +    */* | *\\*)	. "$1" ;;
 +    *)		. "./$1" ;;
-     esac
++    esac
++}
+ 
+-    # Delete any leftover library objects.
+-    if test "$build_old_libs" = yes; then
+-      removelist="$obj $lobj $libobj ${libobj}T"
+-    else
+-      removelist="$lobj $libobj ${libobj}T"
+-    fi
+ 
+-    $run $rm $removelist
+-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
++# func_resolve_sysroot PATH
++# Replace a leading = in PATH with a sysroot.  Store the result into
++# func_resolve_sysroot_result
++func_resolve_sysroot ()
++{
++  func_resolve_sysroot_result=$1
++  case $func_resolve_sysroot_result in
++  =*)
++    func_stripname '=' '' "$func_resolve_sysroot_result"
++    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
++    ;;
++  esac
++}
+ 
+-    # On Cygwin there's no "real" PIC flag so we must build both object types
+-    case $host_os in
+-    cygwin* | mingw* | pw32* | os2*)
+-      pic_mode=default
+-      ;;
+-    esac
+-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+-      # non-PIC code in shared libraries is not supported
+-      pic_mode=default
+-    fi
++# func_replace_sysroot PATH
++# If PATH begins with the sysroot, replace it with = and
++# store the result into func_replace_sysroot_result.
++func_replace_sysroot ()
++{
++  case "$lt_sysroot:$1" in
++  ?*:"$lt_sysroot"*)
++    func_stripname "$lt_sysroot" '' "$1"
++    func_replace_sysroot_result="=$func_stripname_result"
++    ;;
++  *)
++    # Including no sysroot.
++    func_replace_sysroot_result=$1
++    ;;
++  esac
 +}
-+
  
--    # Infer tagged configuration to use if any are available and
--    # if one wasn't chosen via the "--tag" command line option.
--    # Only attempt this if the compiler in the base compile
--    # command doesn't match the default compiler.
+-    # Calculate the filename of the output object if compiler does
+-    # not support -o with -c
+-    if test "$compiler_c_o" = no; then
+-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+-      lockfile="$output_obj.lock"
+-      removelist="$removelist $output_obj $lockfile"
+-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+-    else
+-      output_obj=
+-      need_locks=no
+-      lockfile=
 +# func_infer_tag arg
 +# Infer tagged configuration to use if any are available and
 +# if one wasn't chosen via the "--tag" command line option.
@@ -20720,82 +20262,82 @@
 +func_infer_tag ()
 +{
 +    $opt_debug
-     if test -n "$available_tags" && test -z "$tagname"; then
--      case $base_compile in
++    if test -n "$available_tags" && test -z "$tagname"; then
 +      CC_quoted=
 +      for arg in $CC; do
-+        func_quote_for_eval "$arg"
-+	CC_quoted="$CC_quoted $func_quote_for_eval_result"
++	func_append_quoted CC_quoted "$arg"
 +      done
++      CC_expanded=`func_echo_all $CC`
++      CC_quoted_expanded=`func_echo_all $CC_quoted`
 +      case $@ in
-       # Blanks in the command may have been stripped by the calling shell,
-       # but not from the CC environment variable when configure was run.
--      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
-+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-       # Blanks at the start of $base_compile will cause this to fail
-       # if we don't check for them as well.
-       *)
- 	for z in $available_tags; do
--	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
++      # Blanks in the command may have been stripped by the calling shell,
++      # but not from the CC environment variable when configure was run.
++      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
++      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
++      # Blanks at the start of $base_compile will cause this to fail
++      # if we don't check for them as well.
++      *)
++	for z in $available_tags; do
 +	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
- 	    # Evaluate the configuration.
--	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
--	    case "$base_compile " in
--	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
++	    # Evaluate the configuration.
 +	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
 +	    CC_quoted=
 +	    for arg in $CC; do
 +	      # Double-quote args containing other shell metacharacters.
-+	      func_quote_for_eval "$arg"
-+	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
++	      func_append_quoted CC_quoted "$arg"
 +	    done
++	    CC_expanded=`func_echo_all $CC`
++	    CC_quoted_expanded=`func_echo_all $CC_quoted`
 +	    case "$@ " in
-+	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
- 	      # The compiler in the base compile command matches
- 	      # the one in the tagged configuration.
- 	      # Assume this is the tagged configuration we want.
-@@ -548,78 +1048,248 @@
- 	# was found and let the user know that the "--tag" command
- 	# line option must be used.
- 	if test -z "$tagname"; then
--	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
--#        else
--#          $echo "$modename: using $tagname tagged configuration"
++	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
++	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
++	      # The compiler in the base compile command matches
++	      # the one in the tagged configuration.
++	      # Assume this is the tagged configuration we want.
++	      tagname=$z
++	      break
++	      ;;
++	    esac
++	  fi
++	done
++	# If $tagname still isn't set, then no tagged configuration
++	# was found and let the user know that the "--tag" command
++	# line option must be used.
++	if test -z "$tagname"; then
 +	  func_echo "unable to infer tagged configuration"
 +	  func_fatal_error "specify a tag with \`--tag'"
 +#	else
 +#	  func_verbose "using $tagname tagged configuration"
- 	fi
- 	;;
-       esac
++	fi
++	;;
++      esac
      fi
 +}
  
--    for arg in $later; do
--      case $arg in
--      -static)
--	build_old_libs=yes
--	continue
--	;;
--
--      -prefer-pic)
--	pic_mode=yes
--	continue
--	;;
+-    # Lock this critical section if it is needed
+-    # We use this script file to make the link, it avoids creating a new file
+-    if test "$need_locks" = yes; then
+-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+-	$show "Waiting for $lockfile to be removed"
+-	sleep 2
+-      done
+-    elif test "$need_locks" = warn; then
+-      if test -f "$lockfile"; then
+-	$echo "\
+-*** ERROR, $lockfile exists and contains:
+-`cat $lockfile 2>/dev/null`
  
--      -prefer-non-pic)
--	pic_mode=no
--	continue
--	;;
--      esac
--    done
+-This indicates that another process is trying to use the same
+-temporary object file, and libtool could not work around it because
+-your compiler does not support \`-c' and \`-o' together.  If you
+-repeat this compilation, it may succeed, by chance, but you had better
+-avoid parallel builds (make -j) in this platform, or get a better
+-compiler."
  
--    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
--    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
--    if test "X$xdir" = "X$obj"; then
--      xdir=
+-	$run $rm $removelist
+-	exit $EXIT_FAILURE
+-      fi
+-      $echo "$srcfile" > "$lockfile"
 +# func_write_libtool_object output_name pic_name nonpic_name
 +# Create a libtool object file (analogous to a ".la" file),
 +# but don't create it if we're doing a dry run.
@@ -20804,372 +20346,212 @@
 +    write_libobj=${1}
 +    if test "$build_libtool_libs" = yes; then
 +      write_lobj=\'${2}\'
-     else
--      xdir=$xdir/
--    fi
--    lobj=${xdir}$objdir/$objname
--
--    if test -z "$base_compile"; then
--      $echo "$modename: you must specify a compilation command" 1>&2
--      $echo "$help" 1>&2
--      exit 1
++    else
 +      write_lobj=none
      fi
  
--    # Delete any leftover library objects.
-     if test "$build_old_libs" = yes; then
--      removelist="$obj $lobj $libobj ${libobj}T"
+-    if test -n "$fix_srcfile_path"; then
+-      eval srcfile=\"$fix_srcfile_path\"
++    if test "$build_old_libs" = yes; then
 +      write_oldobj=\'${3}\'
-     else
--      removelist="$lobj $libobj ${libobj}T"
++    else
 +      write_oldobj=none
      fi
- 
--    $run $rm $removelist
--    trap "$run $rm $removelist; exit 1" 1 2 15
-+    $opt_dry_run || {
-+      cat >${write_libobj}T <<EOF
-+# $write_libobj - a libtool object file
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
- 
--    # On Cygwin there's no "real" PIC flag so we must build both object types
--    case $host_os in
--    cygwin* | mingw* | pw32* | os2*)
--      pic_mode=default
--      ;;
+-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
+-    case $qsrcfile in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-      qsrcfile="\"$qsrcfile\"" ;;
 -    esac
--    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
--      # non-PIC code in shared libraries is not supported
--      pic_mode=default
--    fi
-+# Name of the PIC object.
-+pic_object=$write_lobj
- 
--    # Calculate the filename of the output object if compiler does
-+# Name of the non-PIC object
-+non_pic_object=$write_oldobj
-+
-+EOF
-+      $MV "${write_libobj}T" "${write_libobj}"
-+    }
-+}
-+
-+# func_mode_compile arg...
-+func_mode_compile ()
-+{
-+    $opt_debug
-+    # Get the compilation command and the source file.
-+    base_compile=
-+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-+    suppress_opt=yes
-+    suppress_output=
-+    arg_mode=normal
-+    libobj=
-+    later=
-+    pie_flag=
-+
-+    for arg
-+    do
-+      case $arg_mode in
-+      arg  )
-+	# do not "continue".  Instead, add this to base_compile
-+	lastarg="$arg"
-+	arg_mode=normal
-+	;;
-+
-+      target )
-+	libobj="$arg"
-+	arg_mode=normal
-+	continue
-+	;;
-+
-+      normal )
-+	# Accept any command-line options.
-+	case $arg in
-+	-o)
-+	  test -n "$libobj" && \
-+	    func_fatal_error "you cannot specify \`-o' more than once"
-+	  arg_mode=target
-+	  continue
-+	  ;;
-+
-+	-pie | -fpie | -fPIE)
-+          pie_flag="$pie_flag $arg"
-+	  continue
-+	  ;;
-+
-+	-shared | -static | -prefer-pic | -prefer-non-pic)
-+	  later="$later $arg"
-+	  continue
-+	  ;;
-+
-+	-no-suppress)
-+	  suppress_opt=no
-+	  continue
-+	  ;;
-+
-+	-Xcompiler)
-+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-+	  continue      #  The current "srcfile" will either be retained or
-+	  ;;            #  replaced later.  I would guess that would be a bug.
-+
-+	-Wc,*)
-+	  func_stripname '-Wc,' '' "$arg"
-+	  args=$func_stripname_result
-+	  lastarg=
-+	  save_ifs="$IFS"; IFS=','
-+	  for arg in $args; do
-+	    IFS="$save_ifs"
-+	    func_quote_for_eval "$arg"
-+	    lastarg="$lastarg $func_quote_for_eval_result"
-+	  done
-+	  IFS="$save_ifs"
-+	  func_stripname ' ' '' "$lastarg"
-+	  lastarg=$func_stripname_result
-+
-+	  # Add the arguments to base_compile.
-+	  base_compile="$base_compile $lastarg"
-+	  continue
-+	  ;;
-+
-+	*)
-+	  # Accept the current argument as the source file.
-+	  # The previous "srcfile" becomes the current argument.
-+	  #
-+	  lastarg="$srcfile"
-+	  srcfile="$arg"
-+	  ;;
-+	esac  #  case $arg
-+	;;
-+      esac    #  case $arg_mode
-+
-+      # Aesthetically quote the previous argument.
-+      func_quote_for_eval "$lastarg"
-+      base_compile="$base_compile $func_quote_for_eval_result"
-+    done # for arg
-+
-+    case $arg_mode in
-+    arg)
-+      func_fatal_error "you must specify an argument for -Xcompile"
-+      ;;
-+    target)
-+      func_fatal_error "you must specify a target with \`-o'"
-+      ;;
-+    *)
-+      # Get the name of the library object.
-+      test -z "$libobj" && {
-+	func_basename "$srcfile"
-+	libobj="$func_basename_result"
-+      }
-+      ;;
-+    esac
-+
-+    # Recognize several different file suffixes.
-+    # If the user specifies -o file.o, it is replaced with file.lo
-+    case $libobj in
-+    *.[cCFSifmso] | \
-+    *.ada | *.adb | *.ads | *.asm | \
-+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-+      func_xform "$libobj"
-+      libobj=$func_xform_result
-+      ;;
-+    esac
-+
-+    case $libobj in
-+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-+    *)
-+      func_fatal_error "cannot determine name of library object from \`$libobj'"
-+      ;;
-+    esac
-+
-+    func_infer_tag $base_compile
-+
-+    for arg in $later; do
-+      case $arg in
-+      -shared)
-+	test "$build_libtool_libs" != yes && \
-+	  func_fatal_configuration "can not build a shared library"
-+	build_old_libs=no
-+	continue
-+	;;
-+
-+      -static)
-+	build_libtool_libs=no
-+	build_old_libs=yes
-+	continue
-+	;;
-+
-+      -prefer-pic)
-+	pic_mode=yes
-+	continue
-+	;;
-+
-+      -prefer-non-pic)
-+	pic_mode=no
-+	continue
-+	;;
-+      esac
-+    done
-+
-+    func_quote_for_eval "$libobj"
-+    test "X$libobj" != "X$func_quote_for_eval_result" \
-+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-+    func_dirname_and_basename "$obj" "/" ""
-+    objname="$func_basename_result"
-+    xdir="$func_dirname_result"
-+    lobj=${xdir}$objdir/$objname
-+
-+    test -z "$base_compile" && \
-+      func_fatal_help "you must specify a compilation command"
-+
-+    # Delete any leftover library objects.
-+    if test "$build_old_libs" = yes; then
-+      removelist="$obj $lobj $libobj ${libobj}T"
-+    else
-+      removelist="$lobj $libobj ${libobj}T"
-+    fi
-+
-+    # On Cygwin there's no "real" PIC flag so we must build both object types
-+    case $host_os in
-+    cygwin* | mingw* | pw32* | os2* | cegcc*)
-+      pic_mode=default
-+      ;;
-+    esac
-+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-+      # non-PIC code in shared libraries is not supported
-+      pic_mode=default
-+    fi
-+
-+    # Calculate the filename of the output object if compiler does
-     # not support -o with -c
-     if test "$compiler_c_o" = no; then
--      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
--      removelist="$removelist $output_obj $lockfile"
--      trap "$run $rm $removelist; exit 1" 1 2 15
-     else
-       output_obj=
-       need_locks=no
-@@ -629,13 +1299,13 @@
-     # Lock this critical section if it is needed
-     # We use this script file to make the link, it avoids creating a new file
-     if test "$need_locks" = yes; then
--      until $run ln "$0" "$lockfile" 2>/dev/null; do
--	$show "Waiting for $lockfile to be removed"
-+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-+	func_echo "Waiting for $lockfile to be removed"
- 	sleep 2
-       done
-     elif test "$need_locks" = warn; then
-       if test -f "$lockfile"; then
--	$echo "\
-+	$ECHO "\
- *** ERROR, $lockfile exists and contains:
- `cat $lockfile 2>/dev/null`
- 
-@@ -646,29 +1316,22 @@
- avoid parallel builds (make -j) in this platform, or get a better
- compiler."
- 
--	$run $rm $removelist
--	exit 1
-+	$opt_dry_run || $RM $removelist
-+	exit $EXIT_FAILURE
-       fi
--      $echo $srcfile > "$lockfile"
-+      removelist="$removelist $output_obj"
-+      $ECHO "$srcfile" > "$lockfile"
-     fi
- 
-+    $opt_dry_run || $RM $removelist
-+    removelist="$removelist $lockfile"
-+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-+
-     if test -n "$fix_srcfile_path"; then
-       eval srcfile=\"$fix_srcfile_path\"
-     fi
 -
 -    $run $rm "$libobj" "${libobj}T"
--
+ 
 -    # Create a libtool object file (analogous to a ".la" file),
 -    # but don't create it if we're doing a dry run.
 -    test -z "$run" && cat > ${libobj}T <<EOF
 -# $libobj - a libtool object file
 -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
--#
--# Please DO NOT delete this file!
--# It is necessary for linking the library.
--
--# Name of the PIC object.
--EOF
-+    func_quote_for_eval "$srcfile"
-+    qsrcfile=$func_quote_for_eval_result
++    $opt_dry_run || {
++      cat >${write_libobj}T <<EOF
++# $write_libobj - a libtool object file
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
  
-     # Only build a PIC object if we are building libtool libraries.
-     if test "$build_libtool_libs" = yes; then
-@@ -676,38 +1339,25 @@
-       fbsd_hideous_sh_bug=$base_compile
+ # Name of the PIC object.
+-EOF
+-
+-    # Only build a PIC object if we are building libtool libraries.
+-    if test "$build_libtool_libs" = yes; then
+-      # Without this assignment, base_compile gets emptied.
+-      fbsd_hideous_sh_bug=$base_compile
++pic_object=$write_lobj
  
-       if test "$pic_mode" != no; then
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       else
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       fi
+-      if test "$pic_mode" != no; then
+-	command="$base_compile $qsrcfile $pic_flag"
+-      else
+-	# Don't build PIC code
+-	command="$base_compile $qsrcfile"
+-      fi
++# Name of the non-PIC object
++non_pic_object=$write_oldobj
  
 -      if test ! -d "${xdir}$objdir"; then
 -	$show "$mkdir ${xdir}$objdir"
 -	$run $mkdir ${xdir}$objdir
--	status=$?
--	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
--	  exit $status
+-	exit_status=$?
+-	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
+-	  exit $exit_status
 -	fi
 -      fi
-+      func_mkdir_p "$xdir$objdir"
++EOF
++      $MV "${write_libobj}T" "${write_libobj}"
++    }
++}
  
-       if test -z "$output_obj"; then
- 	# Place PIC objects in $objdir
- 	command="$command -o $lobj"
-       fi
+-      if test -z "$output_obj"; then
+-	# Place PIC objects in $objdir
+-	command="$command -o $lobj"
+-      fi
  
 -      $run $rm "$lobj" "$output_obj"
--
++##################################################
++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
++##################################################
++
++# func_convert_core_file_wine_to_w32 ARG
++# Helper function used by file name conversion functions when $build is *nix,
++# and $host is mingw, cygwin, or some other w32 environment. Relies on a
++# correctly configured wine environment available, with the winepath program
++# in $build's $PATH.
++#
++# ARG is the $build file name to be converted to w32 format.
++# Result is available in $func_convert_core_file_wine_to_w32_result, and will
++# be empty on error (or when ARG is empty)
++func_convert_core_file_wine_to_w32 ()
++{
++  $opt_debug
++  func_convert_core_file_wine_to_w32_result="$1"
++  if test -n "$1"; then
++    # Unfortunately, winepath does not exit with a non-zero error code, so we
++    # are forced to check the contents of stdout. On the other hand, if the
++    # command is not found, the shell will set an exit code of 127 and print
++    # *an error message* to stdout. So we must check for both error code of
++    # zero AND non-empty stdout, which explains the odd construction:
++    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
++    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
++      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
++        $SED -e "$lt_sed_naive_backslashify"`
++    else
++      func_convert_core_file_wine_to_w32_result=
++    fi
++  fi
++}
++# end: func_convert_core_file_wine_to_w32
+ 
 -      $show "$command"
 -      if $run eval "$command"; then :
 -      else
 -	test -n "$output_obj" && $run $rm $removelist
--	exit 1
--      fi
-+      func_show_eval_locale "$command"	\
-+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+-	exit $EXIT_FAILURE
++
++# func_convert_core_path_wine_to_w32 ARG
++# Helper function used by path conversion functions when $build is *nix, and
++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
++# configured wine environment available, with the winepath program in $build's
++# $PATH. Assumes ARG has no leading or trailing path separator characters.
++#
++# ARG is path to be converted from $build format to win32.
++# Result is available in $func_convert_core_path_wine_to_w32_result.
++# Unconvertible file (directory) names in ARG are skipped; if no directory names
++# are convertible, then the result may be empty.
++func_convert_core_path_wine_to_w32 ()
++{
++  $opt_debug
++  # unfortunately, winepath doesn't convert paths, only file names
++  func_convert_core_path_wine_to_w32_result=""
++  if test -n "$1"; then
++    oldIFS=$IFS
++    IFS=:
++    for func_convert_core_path_wine_to_w32_f in $1; do
++      IFS=$oldIFS
++      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
++      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
++        if test -z "$func_convert_core_path_wine_to_w32_result"; then
++          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
++        else
++          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
++        fi
+       fi
++    done
++    IFS=$oldIFS
++  fi
++}
++# end: func_convert_core_path_wine_to_w32
  
-       if test "$need_locks" = warn &&
- 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+-      if test "$need_locks" = warn &&
+-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 -	$echo "\
-+	$ECHO "\
- *** ERROR, $lockfile contains:
- `cat $lockfile 2>/dev/null`
+-*** ERROR, $lockfile contains:
+-`cat $lockfile 2>/dev/null`
+ 
+-but it should contain:
+-$srcfile
++# func_cygpath ARGS...
++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
++# (2), returns the Cygwin file name or path in func_cygpath_result (input
++# file name or path is assumed to be in w32 format, as previously converted
++# from $build's *nix or MSYS format). In case (3), returns the w32 file name
++# or path in func_cygpath_result (input file name or path is assumed to be in
++# Cygwin format). Returns an empty string on error.
++#
++# ARGS are passed to cygpath, with the last one being the file name or path to
++# be converted.
++#
++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
++# environment variable; do not put it in $PATH.
++func_cygpath ()
++{
++  $opt_debug
++  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
++    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
++    if test "$?" -ne 0; then
++      # on failure, ensure result is empty
++      func_cygpath_result=
++    fi
++  else
++    func_cygpath_result=
++    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
++  fi
++}
++#end: func_cygpath
  
-@@ -721,47 +1371,29 @@
- avoid parallel builds (make -j) in this platform, or get a better
- compiler."
+-This indicates that another process is trying to use the same
+-temporary object file, and libtool could not work around it because
+-your compiler does not support \`-c' and \`-o' together.  If you
+-repeat this compilation, it may succeed, by chance, but you had better
+-avoid parallel builds (make -j) in this platform, or get a better
+-compiler."
  
 -	$run $rm $removelist
--	exit 1
-+	$opt_dry_run || $RM $removelist
-+	exit $EXIT_FAILURE
-       fi
+-	exit $EXIT_FAILURE
+-      fi
++# func_convert_core_msys_to_w32 ARG
++# Convert file name or path ARG from MSYS format to w32 format.  Return
++# result in func_convert_core_msys_to_w32_result.
++func_convert_core_msys_to_w32 ()
++{
++  $opt_debug
++  # awkward: cmd appends spaces to result
++  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
++    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
++}
++#end: func_convert_core_msys_to_w32
  
-       # Just move the object if needed, then go on to compile the next one
-       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+-      # Just move the object if needed, then go on to compile the next one
+-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
 -	$show "$mv $output_obj $lobj"
 -	if $run $mv $output_obj $lobj; then :
 -	else
@@ -21177,75 +20559,140 @@
 -	  $run $rm $removelist
 -	  exit $error
 -	fi
-+	func_show_eval '$MV "$output_obj" "$lobj"' \
-+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-       fi
+-      fi
  
 -      # Append the name of the PIC object to the libtool object file.
 -      test -z "$run" && cat >> ${libobj}T <<EOF
 -pic_object='$objdir/$objname'
--
++# func_convert_file_check ARG1 ARG2
++# Verify that ARG1 (a file name in $build format) was converted to $host
++# format in ARG2. Otherwise, emit an error message, but continue (resetting
++# func_to_host_file_result to ARG1).
++func_convert_file_check ()
++{
++  $opt_debug
++  if test -z "$2" && test -n "$1" ; then
++    func_error "Could not determine host file name corresponding to"
++    func_error "  \`$1'"
++    func_error "Continuing, but uninstalled executables may not work."
++    # Fallback:
++    func_to_host_file_result="$1"
++  fi
++}
++# end func_convert_file_check
+ 
 -EOF
--
-       # Allow error messages only from the first compilation.
-       if test "$suppress_opt" = yes; then
+ 
+-      # Allow error messages only from the first compilation.
+-      if test "$suppress_opt" = yes; then
 -        suppress_output=' >/dev/null 2>&1'
-+	suppress_output=' >/dev/null 2>&1'
-       fi
--    else
+-      fi
++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
++# Verify that FROM_PATH (a path in $build format) was converted to $host
++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
++# func_to_host_file_result to a simplistic fallback value (see below).
++func_convert_path_check ()
++{
++  $opt_debug
++  if test -z "$4" && test -n "$3"; then
++    func_error "Could not determine the host path corresponding to"
++    func_error "  \`$3'"
++    func_error "Continuing, but uninstalled executables may not work."
++    # Fallback.  This is a deliberately simplistic "conversion" and
++    # should not be "improved".  See libtool.info.
++    if test "x$1" != "x$2"; then
++      lt_replace_pathsep_chars="s|$1|$2|g"
++      func_to_host_path_result=`echo "$3" |
++        $SED -e "$lt_replace_pathsep_chars"`
+     else
 -      # No PIC object so indicate it doesn't exist in the libtool
 -      # object file.
 -      test -z "$run" && cat >> ${libobj}T <<EOF
 -pic_object=none
 -
 -EOF
++      func_to_host_path_result="$3"
      fi
++  fi
++}
++# end func_convert_path_check
  
-     # Only build a position-dependent object if we build old libraries.
-     if test "$build_old_libs" = yes; then
-       if test "$pic_mode" != yes; then
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile$pie_flag"
-       else
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
- 	command="$command -o $obj"
-@@ -769,17 +1401,12 @@
+-    # Only build a position-dependent object if we build old libraries.
+-    if test "$build_old_libs" = yes; then
+-      if test "$pic_mode" != yes; then
+-	# Don't build PIC code
+-	command="$base_compile $qsrcfile"
+-      else
+-	command="$base_compile $qsrcfile $pic_flag"
+-      fi
+-      if test "$compiler_c_o" = yes; then
+-	command="$command -o $obj"
+-      fi
  
-       # Suppress compiler output if we already did a PIC compilation.
-       command="$command$suppress_output"
+-      # Suppress compiler output if we already did a PIC compilation.
+-      command="$command$suppress_output"
 -      $run $rm "$obj" "$output_obj"
 -      $show "$command"
 -      if $run eval "$command"; then :
 -      else
 -	$run $rm $removelist
--	exit 1
+-	exit $EXIT_FAILURE
 -      fi
-+      func_show_eval_locale "$command" \
-+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
++# and appending REPL if ORIG matches BACKPAT.
++func_convert_path_front_back_pathsep ()
++{
++  $opt_debug
++  case $4 in
++  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
++    ;;
++  esac
++  case $4 in
++  $2 ) func_append func_to_host_path_result "$3"
++    ;;
++  esac
++}
++# end func_convert_path_front_back_pathsep
  
-       if test "$need_locks" = warn &&
- 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+-      if test "$need_locks" = warn &&
+-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 -	$echo "\
-+	$ECHO "\
- *** ERROR, $lockfile contains:
- `cat $lockfile 2>/dev/null`
+-*** ERROR, $lockfile contains:
+-`cat $lockfile 2>/dev/null`
+ 
+-but it should contain:
+-$srcfile
++##################################################
++# $build to $host FILE NAME CONVERSION FUNCTIONS #
++##################################################
++# invoked via `$to_host_file_cmd ARG'
++#
++# In each case, ARG is the path to be converted from $build to $host format.
++# Result will be available in $func_to_host_file_result.
  
-@@ -793,5197 +1420,6784 @@
- avoid parallel builds (make -j) in this platform, or get a better
- compiler."
+-This indicates that another process is trying to use the same
+-temporary object file, and libtool could not work around it because
+-your compiler does not support \`-c' and \`-o' together.  If you
+-repeat this compilation, it may succeed, by chance, but you had better
+-avoid parallel builds (make -j) in this platform, or get a better
+-compiler."
  
 -	$run $rm $removelist
--	exit 1
-+	$opt_dry_run || $RM $removelist
-+	exit $EXIT_FAILURE
-       fi
+-	exit $EXIT_FAILURE
+-      fi
++# func_to_host_file ARG
++# Converts the file name ARG from $build format to $host format. Return result
++# in func_to_host_file_result.
++func_to_host_file ()
++{
++  $opt_debug
++  $to_host_file_cmd "$1"
++}
++# end func_to_host_file
  
-       # Just move the object if needed
-       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+-      # Just move the object if needed
+-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
 -	$show "$mv $output_obj $obj"
 -	if $run $mv $output_obj $obj; then :
 -	else
@@ -21253,18 +20700,31 @@
 -	  $run $rm $removelist
 -	  exit $error
 -	fi
-+	func_show_eval '$MV "$output_obj" "$obj"' \
-+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-       fi
-+    fi
+-      fi
  
 -      # Append the name of the non-PIC object the libtool object file.
 -      # Only append if the libtool object file exists.
 -      test -z "$run" && cat >> ${libobj}T <<EOF
 -# Name of the non-PIC object.
 -non_pic_object='$objname'
-+    $opt_dry_run || {
-+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
++# func_to_tool_file ARG LAZY
++# converts the file name ARG from $build format to toolchain format. Return
++# result in func_to_tool_file_result.  If the conversion in use is listed
++# in (the comma separated) LAZY, no conversion takes place.
++func_to_tool_file ()
++{
++  $opt_debug
++  case ,$2, in
++    *,"$to_tool_file_cmd",*)
++      func_to_tool_file_result=$1
++      ;;
++    *)
++      $to_tool_file_cmd "$1"
++      func_to_tool_file_result=$func_to_host_file_result
++      ;;
++  esac
++}
++# end func_to_tool_file
  
 -EOF
 -    else
@@ -21273,42 +20733,41 @@
 -      test -z "$run" && cat >> ${libobj}T <<EOF
 -# Name of the non-PIC object.
 -non_pic_object=none
-+      # Unlock the critical section if it was locked
-+      if test "$need_locks" != no; then
-+	removelist=$lockfile
-+        $RM "$lockfile"
-+      fi
-+    }
  
 -EOF
 -    fi
-+    exit $EXIT_SUCCESS
++# func_convert_file_noop ARG
++# Copy ARG to func_to_host_file_result.
++func_convert_file_noop ()
++{
++  func_to_host_file_result="$1"
 +}
++# end func_convert_file_noop
  
 -    $run $mv "${libobj}T" "${libobj}"
-+$opt_help || {
-+test "$mode" = compile && func_mode_compile ${1+"$@"}
-+}
  
 -    # Unlock the critical section if it was locked
 -    if test "$need_locks" != no; then
 -      $run $rm "$lockfile"
 -    fi
-+func_mode_help ()
++# func_convert_file_msys_to_w32 ARG
++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
++# conversion to w32 is not available inside the cwrapper.  Returns result in
++# func_to_host_file_result.
++func_convert_file_msys_to_w32 ()
 +{
-+    # We need to display help for each of the modes.
-+    case $mode in
-+      "")
-+        # Generic help is extracted from the usage comments
-+        # at the start of this file.
-+        func_help
-+        ;;
++  $opt_debug
++  func_to_host_file_result="$1"
++  if test -n "$1"; then
++    func_convert_core_msys_to_w32 "$1"
++    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
++  fi
++  func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_msys_to_w32
  
--    exit 0
+-    exit $EXIT_SUCCESS
 -    ;;
-+      clean)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
  
 -  # libtool link mode
 -  link | relink)
@@ -21320,7 +20779,21 @@
 -      # which system we are compiling for in order to pass an extra
 -      # flag for every libtool invocation.
 -      # allow_undefined=no
-+Remove files from the build directory.
++# func_convert_file_cygwin_to_w32 ARG
++# Convert file name ARG from Cygwin to w32 format.  Returns result in
++# func_to_host_file_result.
++func_convert_file_cygwin_to_w32 ()
++{
++  $opt_debug
++  func_to_host_file_result="$1"
++  if test -n "$1"; then
++    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
++    # LT_CYGPATH in this case.
++    func_to_host_file_result=`cygpath -m "$1"`
++  fi
++  func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_cygwin_to_w32
  
 -      # FIXME: Unfortunately, there are problems with the above when trying
 -      # to make a dll which has undefined symbols, in which case not
@@ -21337,9 +20810,6 @@
 -    base_compile="$nonopt $@"
 -    compile_command="$nonopt"
 -    finalize_command="$nonopt"
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
  
 -    compile_rpath=
 -    finalize_rpath=
@@ -21354,9 +20824,20 @@
 -    dllsearchpath=
 -    lib_search_path=`pwd`
 -    inst_prefix_dir=
-+If FILE is a libtool library, object or program, all the files associated
-+with it are deleted. Otherwise, only FILE itself is deleted using RM."
-+        ;;
++# func_convert_file_nix_to_w32 ARG
++# Convert file name ARG from *nix to w32 format.  Requires a wine environment
++# and a working winepath. Returns result in func_to_host_file_result.
++func_convert_file_nix_to_w32 ()
++{
++  $opt_debug
++  func_to_host_file_result="$1"
++  if test -n "$1"; then
++    func_convert_core_file_wine_to_w32 "$1"
++    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
++  fi
++  func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_nix_to_w32
  
 -    avoid_version=no
 -    dlfiles=
@@ -21372,6 +20853,7 @@
 -    no_install=no
 -    objs=
 -    non_pic_objects=
+-    notinst_path= # paths that contain not-installed libtool libraries
 -    precious_files_regex=
 -    prefer_static_libs=no
 -    preload=no
@@ -21385,86 +20867,78 @@
 -    thread_safe=no
 -    vinfo=
 -    vinfo_number=no
-+      compile)
-+      $ECHO \
-+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
  
--    # Infer tagged configuration to use if any are available and
--    # if one wasn't chosen via the "--tag" command line option.
--    # Only attempt this if the compiler in the base link
--    # command doesn't match the default compiler.
--    if test -n "$available_tags" && test -z "$tagname"; then
--      case $base_compile in
--      # Blanks in the command may have been stripped by the calling shell,
--      # but not from the CC environment variable when configure was run.
--      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
--      # Blanks at the start of $base_compile will cause this to fail
--      # if we don't check for them as well.
--      *)
--	for z in $available_tags; do
--	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
--	    # Evaluate the configuration.
--	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
--	    case $base_compile in
--	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
--	      # The compiler in $compile_command matches
--	      # the one in the tagged configuration.
--	      # Assume this is the tagged configuration we want.
--	      tagname=$z
--	      break
--	      ;;
--	    esac
--	  fi
--	done
--	# If $tagname still isn't set, then no tagged configuration
--	# was found and let the user know that the "--tag" command
--	# line option must be used.
--	if test -z "$tagname"; then
--	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
--#       else
--#         $echo "$modename: using $tagname tagged configuration"
--	fi
--	;;
--      esac
--    fi
-+Compile a source file into a libtool library object.
+-    func_infer_tag $base_compile
++# func_convert_file_msys_to_cygwin ARG
++# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
++# Returns result in func_to_host_file_result.
++func_convert_file_msys_to_cygwin ()
++{
++  $opt_debug
++  func_to_host_file_result="$1"
++  if test -n "$1"; then
++    func_convert_core_msys_to_w32 "$1"
++    func_cygpath -u "$func_convert_core_msys_to_w32_result"
++    func_to_host_file_result="$func_cygpath_result"
++  fi
++  func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_msys_to_cygwin
  
 -    # We need to know -static, to get the right output filenames.
 -    for arg
 -    do
 -      case $arg in
--      -all-static | -static)
--	if test "X$arg" = "X-all-static"; then
+-      -all-static | -static | -static-libtool-libs)
+-    case $arg in
+-    -all-static)
 -	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 -	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 -	  fi
 -	  if test -n "$link_static_flag"; then
 -	    dlopen_self=$dlopen_self_static
 -	  fi
--	else
+-	  prefer_static_libs=yes
+-	  ;;
+-    -static)
 -	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 -	    dlopen_self=$dlopen_self_static
 -	  fi
--	fi
+-	  prefer_static_libs=built
+-	  ;;
+-    -static-libtool-libs)
+-      if test -z "$pic_flag" && test -n "$link_static_flag"; then
+-        dlopen_self=$dlopen_self_static
+-      fi
+-      prefer_static_libs=yes
+-      ;;
+-    esac
 -	build_libtool_libs=no
 -	build_old_libs=yes
--	prefer_static_libs=yes
 -	break
 -	;;
 -      esac
 -    done
-+This mode accepts the following additional options:
  
 -    # See if our shared archives depend on static archives.
 -    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-+  -no-suppress      do not suppress compiler output for multiple passes
-+  -prefer-pic       try to building PIC objects only
-+  -prefer-non-pic   try to building non-PIC objects only
-+  -shared           do not build a \`.o' file suitable for static linking
-+  -static           only build a \`.o' file suitable for static linking
++# func_convert_file_nix_to_cygwin ARG
++# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
++# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
++# in func_to_host_file_result.
++func_convert_file_nix_to_cygwin ()
++{
++  $opt_debug
++  func_to_host_file_result="$1"
++  if test -n "$1"; then
++    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
++    func_convert_core_file_wine_to_w32 "$1"
++    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
++    func_to_host_file_result="$func_cygpath_result"
++  fi
++  func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_nix_to_cygwin
  
 -    # Go through the arguments, transforming them on the way.
 -    while test "$#" -gt 0; do
@@ -21477,8 +20951,6 @@
 -      *) qarg=$arg ;;
 -      esac
 -      libtool_args="$libtool_args $qarg"
-+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-+from the given SOURCEFILE.
  
 -      # If the previous option needs an argument, assign it.
 -      if test -n "$prev"; then
@@ -21488,10 +20960,25 @@
 -	  finalize_command="$finalize_command @OUTPUT@"
 -	  ;;
 -	esac
-+The output file name is determined by removing the directory component from
-+SOURCEFILE, then substituting the C source code suffix \`.c' with the
-+library object suffix, \`.lo'."
-+        ;;
++#############################################
++# $build to $host PATH CONVERSION FUNCTIONS #
++#############################################
++# invoked via `$to_host_path_cmd ARG'
++#
++# In each case, ARG is the path to be converted from $build to $host format.
++# The result will be available in $func_to_host_path_result.
++#
++# Path separators are also converted from $build format to $host format.  If
++# ARG begins or ends with a path separator character, it is preserved (but
++# converted to $host format) on output.
++#
++# All path conversion functions are named using the following convention:
++#   file name conversion function    : func_convert_file_X_to_Y ()
++#   path conversion function         : func_convert_path_X_to_Y ()
++# where, for any given $build/$host combination the 'X_to_Y' value is the
++# same.  If conversion functions are added for new $build/$host combinations,
++# the two new functions must follow this pattern, or func_init_to_host_path_cmd
++# will break.
  
 -	case $prev in
 -	dlfiles|dlprefiles)
@@ -21538,7 +21025,7 @@
 -	  export_symbols="$arg"
 -	  if test ! -f "$arg"; then
 -	    $echo "$modename: symbol file \`$arg' does not exist"
--	    exit 1
+-	    exit $EXIT_FAILURE
 -	  fi
 -	  prev=
 -	  continue
@@ -21572,15 +21059,23 @@
 -#	      moreargs="$moreargs $fil"
 -	      arg=$fil
 -	      # A libtool-controlled object.
-+      execute)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
  
 -	      # Check to see that this really is a libtool object.
 -	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
 -		pic_object=
 -		non_pic_object=
-+Automatically set library path, then run a program.
++# func_init_to_host_path_cmd
++# Ensures that function "pointer" variable $to_host_path_cmd is set to the
++# appropriate value, based on the value of $to_host_file_cmd.
++to_host_path_cmd=
++func_init_to_host_path_cmd ()
++{
++  $opt_debug
++  if test -z "$to_host_path_cmd"; then
++    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
++    to_host_path_cmd="func_convert_path_${func_stripname_result}"
++  fi
++}
  
 -		# Read the .lo file
 -		# If there is no directory component, then add one.
@@ -21588,16 +21083,24 @@
 -		*/* | *\\*) . $arg ;;
 -		*) . ./$arg ;;
 -		esac
-+This mode accepts the following additional options:
  
 -		if test -z "$pic_object" || \
 -		   test -z "$non_pic_object" ||
 -		   test "$pic_object" = none && \
 -		   test "$non_pic_object" = none; then
 -		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
--		  exit 1
+-		  exit $EXIT_FAILURE
 -		fi
-+  -dlopen FILE      add the directory containing FILE to the library path
++# func_to_host_path ARG
++# Converts the path ARG from $build format to $host format. Return result
++# in func_to_host_path_result.
++func_to_host_path ()
++{
++  $opt_debug
++  func_init_to_host_path_cmd
++  $to_host_path_cmd "$1"
++}
++# end func_to_host_path
  
 -		# Extract subdirectory from the argument.
 -		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
@@ -21606,15 +21109,17 @@
 -		else
 -		  xdir="$xdir/"
 -		fi
-+This mode sets the library path environment variable according to \`-dlopen'
-+flags.
  
 -		if test "$pic_object" != none; then
 -		  # Prepend the subdirectory the object is found in.
 -		  pic_object="$xdir$pic_object"
-+If any of the ARGS are libtool executable wrappers, then they are translated
-+into their corresponding uninstalled binary, and any of their required library
-+directories are added to the library path.
++# func_convert_path_noop ARG
++# Copy ARG to func_to_host_path_result.
++func_convert_path_noop ()
++{
++  func_to_host_path_result="$1"
++}
++# end func_convert_path_noop
  
 -		  if test "$prev" = dlfiles; then
 -		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -21626,8 +21131,6 @@
 -		      prev=dlprefiles
 -		    fi
 -		  fi
-+Then, COMMAND is executed, with ARGS as arguments."
-+        ;;
  
 -		  # CHECK ME:  I think I busted this.  -Ossama
 -		  if test "$prev" = dlprefiles; then
@@ -21635,38 +21138,75 @@
 -		    dlprefiles="$dlprefiles $pic_object"
 -		    prev=
 -		  fi
-+      finish)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
- 
++# func_convert_path_msys_to_w32 ARG
++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
++# conversion to w32 is not available inside the cwrapper.  Returns result in
++# func_to_host_path_result.
++func_convert_path_msys_to_w32 ()
++{
++  $opt_debug
++  func_to_host_path_result="$1"
++  if test -n "$1"; then
++    # Remove leading and trailing path separator characters from ARG.  MSYS
++    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
++    # and winepath ignores them completely.
++    func_stripname : : "$1"
++    func_to_host_path_tmp1=$func_stripname_result
++    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
++    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
++    func_convert_path_check : ";" \
++      "$func_to_host_path_tmp1" "$func_to_host_path_result"
++    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
++  fi
++}
++# end func_convert_path_msys_to_w32
+ 
 -		  # A PIC object.
 -		  libobjs="$libobjs $pic_object"
 -		  arg="$pic_object"
 -		fi
-+Complete the installation of libtool libraries.
  
 -		# Non-PIC object.
 -		if test "$non_pic_object" != none; then
 -		  # Prepend the subdirectory the object is found in.
 -		  non_pic_object="$xdir$non_pic_object"
-+Each LIBDIR is a directory that contains libtool libraries.
++# func_convert_path_cygwin_to_w32 ARG
++# Convert path ARG from Cygwin to w32 format.  Returns result in
++# func_to_host_file_result.
++func_convert_path_cygwin_to_w32 ()
++{
++  $opt_debug
++  func_to_host_path_result="$1"
++  if test -n "$1"; then
++    # See func_convert_path_msys_to_w32:
++    func_stripname : : "$1"
++    func_to_host_path_tmp1=$func_stripname_result
++    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
++    func_convert_path_check : ";" \
++      "$func_to_host_path_tmp1" "$func_to_host_path_result"
++    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
++  fi
++}
++# end func_convert_path_cygwin_to_w32
  
 -		  # A standard non-PIC object
 -		  non_pic_objects="$non_pic_objects $non_pic_object"
 -		  if test -z "$pic_object" || test "$pic_object" = none ; then
 -		    arg="$non_pic_object"
 -		  fi
+-		else
+-		  # If the PIC object exists, use it instead.
+-		  # $xdir was prepended to $pic_object above.
+-		  non_pic_object="$pic_object"
+-		  non_pic_objects="$non_pic_objects $non_pic_object"
 -		fi
 -	      else
 -		# Only an error if not doing a dry-run.
 -		if test -z "$run"; then
 -		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
--		  exit 1
+-		  exit $EXIT_FAILURE
 -		else
 -		  # Dry-run case.
-+The commands that this mode executes may require superuser privileges.  Use
-+the \`--dry-run' option if you just want to see what would be executed."
-+        ;;
  
 -		  # Extract subdirectory from the argument.
 -		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
@@ -21675,9 +21215,25 @@
 -		  else
 -		    xdir="$xdir/"
 -		  fi
-+      install)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
++# func_convert_path_nix_to_w32 ARG
++# Convert path ARG from *nix to w32 format.  Requires a wine environment and
++# a working winepath.  Returns result in func_to_host_file_result.
++func_convert_path_nix_to_w32 ()
++{
++  $opt_debug
++  func_to_host_path_result="$1"
++  if test -n "$1"; then
++    # See func_convert_path_msys_to_w32:
++    func_stripname : : "$1"
++    func_to_host_path_tmp1=$func_stripname_result
++    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
++    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
++    func_convert_path_check : ";" \
++      "$func_to_host_path_tmp1" "$func_to_host_path_result"
++    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
++  fi
++}
++# end func_convert_path_nix_to_w32
  
 -		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
 -		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
@@ -21688,7 +21244,7 @@
 -	    done
 -	  else
 -	    $echo "$modename: link input file \`$save_arg' does not exist"
--	    exit 1
+-	    exit $EXIT_FAILURE
 -	  fi
 -	  arg=$save_arg
 -	  prev=
@@ -21700,7 +21256,7 @@
 -	  [\\/]* | [A-Za-z]:[\\/]*) ;;
 -	  *)
 -	    $echo "$modename: only absolute run-paths are allowed" 1>&2
--	    exit 1
+-	    exit $EXIT_FAILURE
 -	    ;;
 -	  esac
 -	  if test "$prev" = rpath; then
@@ -21722,88 +21278,272 @@
 -	  prev=
 -	  compile_command="$compile_command $qarg"
 -	  finalize_command="$finalize_command $qarg"
--	  continue
--	  ;;
++
++# func_convert_path_msys_to_cygwin ARG
++# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
++# Returns result in func_to_host_file_result.
++func_convert_path_msys_to_cygwin ()
++{
++  $opt_debug
++  func_to_host_path_result="$1"
++  if test -n "$1"; then
++    # See func_convert_path_msys_to_w32:
++    func_stripname : : "$1"
++    func_to_host_path_tmp1=$func_stripname_result
++    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
++    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
++    func_to_host_path_result="$func_cygpath_result"
++    func_convert_path_check : : \
++      "$func_to_host_path_tmp1" "$func_to_host_path_result"
++    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
++  fi
++}
++# end func_convert_path_msys_to_cygwin
++
++
++# func_convert_path_nix_to_cygwin ARG
++# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
++# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
++# func_to_host_file_result.
++func_convert_path_nix_to_cygwin ()
++{
++  $opt_debug
++  func_to_host_path_result="$1"
++  if test -n "$1"; then
++    # Remove leading and trailing path separator characters from
++    # ARG. msys behavior is inconsistent here, cygpath turns them
++    # into '.;' and ';.', and winepath ignores them completely.
++    func_stripname : : "$1"
++    func_to_host_path_tmp1=$func_stripname_result
++    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
++    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
++    func_to_host_path_result="$func_cygpath_result"
++    func_convert_path_check : : \
++      "$func_to_host_path_tmp1" "$func_to_host_path_result"
++    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
++  fi
++}
++# end func_convert_path_nix_to_cygwin
++
++
++# func_mode_compile arg...
++func_mode_compile ()
++{
++    $opt_debug
++    # Get the compilation command and the source file.
++    base_compile=
++    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
++    suppress_opt=yes
++    suppress_output=
++    arg_mode=normal
++    libobj=
++    later=
++    pie_flag=
++
++    for arg
++    do
++      case $arg_mode in
++      arg  )
++	# do not "continue".  Instead, add this to base_compile
++	lastarg="$arg"
++	arg_mode=normal
++	;;
++
++      target )
++	libobj="$arg"
++	arg_mode=normal
++	continue
++	;;
++
++      normal )
++	# Accept any command-line options.
++	case $arg in
++	-o)
++	  test -n "$libobj" && \
++	    func_fatal_error "you cannot specify \`-o' more than once"
++	  arg_mode=target
+ 	  continue
+ 	  ;;
 -	xlinker)
 -	  linker_flags="$linker_flags $qarg"
 -	  compiler_flags="$compiler_flags $wl$qarg"
 -	  prev=
 -	  compile_command="$compile_command $wl$qarg"
 -	  finalize_command="$finalize_command $wl$qarg"
--	  continue
--	  ;;
++
++	-pie | -fpie | -fPIE)
++          func_append pie_flag " $arg"
+ 	  continue
+ 	  ;;
 -	xcclinker)
 -	  linker_flags="$linker_flags $qarg"
 -	  compiler_flags="$compiler_flags $qarg"
 -	  prev=
 -	  compile_command="$compile_command $qarg"
 -	  finalize_command="$finalize_command $qarg"
--	  continue
--	  ;;
--	*)
++
++	-shared | -static | -prefer-pic | -prefer-non-pic)
++	  func_append later " $arg"
+ 	  continue
+ 	  ;;
+-	shrext)
+-  	  shrext_cmds="$arg"
+-	  prev=
++
++	-no-suppress)
++	  suppress_opt=no
+ 	  continue
+ 	  ;;
+-	darwin_framework|darwin_framework_skip)
+-	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
+-	  compile_command="$compile_command $arg"
+-	  finalize_command="$finalize_command $arg"
+-	  prev=
++
++	-Xcompiler)
++	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
++	  continue      #  The current "srcfile" will either be retained or
++	  ;;            #  replaced later.  I would guess that would be a bug.
++
++	-Wc,*)
++	  func_stripname '-Wc,' '' "$arg"
++	  args=$func_stripname_result
++	  lastarg=
++	  save_ifs="$IFS"; IFS=','
++	  for arg in $args; do
++	    IFS="$save_ifs"
++	    func_append_quoted lastarg "$arg"
++	  done
++	  IFS="$save_ifs"
++	  func_stripname ' ' '' "$lastarg"
++	  lastarg=$func_stripname_result
++
++	  # Add the arguments to base_compile.
++	  func_append base_compile " $lastarg"
+ 	  continue
+ 	  ;;
++
+ 	*)
 -	  eval "$prev=\"\$arg\""
 -	  prev=
 -	  continue
--	  ;;
++	  # Accept the current argument as the source file.
++	  # The previous "srcfile" becomes the current argument.
++	  #
++	  lastarg="$srcfile"
++	  srcfile="$arg"
+ 	  ;;
 -	esac
 -      fi # test -n "$prev"
-+Install executables or libraries.
++	esac  #  case $arg
++	;;
++      esac    #  case $arg_mode
  
 -      prevarg="$arg"
-+INSTALL-COMMAND is the installation command.  The first component should be
-+either the \`install' or \`cp' program.
++      # Aesthetically quote the previous argument.
++      func_append_quoted base_compile "$lastarg"
++    done # for arg
++
++    case $arg_mode in
++    arg)
++      func_fatal_error "you must specify an argument for -Xcompile"
++      ;;
++    target)
++      func_fatal_error "you must specify a target with \`-o'"
++      ;;
++    *)
++      # Get the name of the library object.
++      test -z "$libobj" && {
++	func_basename "$srcfile"
++	libobj="$func_basename_result"
++      }
++      ;;
++    esac
++
++    # Recognize several different file suffixes.
++    # If the user specifies -o file.o, it is replaced with file.lo
++    case $libobj in
++    *.[cCFSifmso] | \
++    *.ada | *.adb | *.ads | *.asm | \
++    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
++    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
++      func_xform "$libobj"
++      libobj=$func_xform_result
++      ;;
++    esac
++
++    case $libobj in
++    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
++    *)
++      func_fatal_error "cannot determine name of library object from \`$libobj'"
++      ;;
++    esac
++
++    func_infer_tag $base_compile
  
--      case $arg in
++    for arg in $later; do
+       case $arg in
 -      -all-static)
 -	if test -n "$link_static_flag"; then
 -	  compile_command="$compile_command $link_static_flag"
 -	  finalize_command="$finalize_command $link_static_flag"
 -	fi
--	continue
--	;;
-+The following components of INSTALL-COMMAND are treated specially:
++      -shared)
++	test "$build_libtool_libs" != yes && \
++	  func_fatal_configuration "can not build a shared library"
++	build_old_libs=no
+ 	continue
+ 	;;
  
 -      -allow-undefined)
 -	# FIXME: remove this flag sometime in the future.
 -	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
--	continue
--	;;
-+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
++      -static)
++	build_libtool_libs=no
++	build_old_libs=yes
+ 	continue
+ 	;;
  
 -      -avoid-version)
 -	avoid_version=yes
--	continue
--	;;
-+The rest of the components are interpreted as arguments to that command (only
-+BSD-compatible install options are recognized)."
-+        ;;
++      -prefer-pic)
++	pic_mode=yes
+ 	continue
+ 	;;
  
 -      -dlopen)
 -	prev=dlfiles
--	continue
--	;;
-+      link)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
++      -prefer-non-pic)
++	pic_mode=no
+ 	continue
+ 	;;
++      esac
++    done
  
 -      -dlpreopen)
 -	prev=dlprefiles
 -	continue
 -	;;
-+Link object files or libraries together to form another library, or to
-+create an executable program.
++    func_quote_for_eval "$libobj"
++    test "X$libobj" != "X$func_quote_for_eval_result" \
++      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
++      && func_warning "libobj name \`$libobj' may not contain shell special characters."
++    func_dirname_and_basename "$obj" "/" ""
++    objname="$func_basename_result"
++    xdir="$func_dirname_result"
++    lobj=${xdir}$objdir/$objname
  
 -      -export-dynamic)
 -	export_dynamic=yes
 -	continue
 -	;;
-+LINK-COMMAND is a command using the C compiler that you would use to create
-+a program from several object files.
++    test -z "$base_compile" && \
++      func_fatal_help "you must specify a compilation command"
  
 -      -export-symbols | -export-symbols-regex)
 -	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 -	  $echo "$modename: more than one -exported-symbols argument is not allowed"
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	fi
 -	if test "X$arg" = "X-export-symbols"; then
 -	  prev=expsyms
@@ -21812,42 +21552,49 @@
 -	fi
 -	continue
 -	;;
-+The following components of LINK-COMMAND are treated specially:
++    # Delete any leftover library objects.
++    if test "$build_old_libs" = yes; then
++      removelist="$obj $lobj $libobj ${libobj}T"
++    else
++      removelist="$lobj $libobj ${libobj}T"
++    fi
+ 
+-      -framework|-arch|-isysroot)
+-	case " $CC " in
+-	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
+-		prev=darwin_framework_skip ;;
+-	  *) compiler_flags="$compiler_flags $arg"
+-	     prev=darwin_framework ;;
+-	esac
+-	compile_command="$compile_command $arg"
+-	finalize_command="$finalize_command $arg"
+-	continue
+-	;;
++    # On Cygwin there's no "real" PIC flag so we must build both object types
++    case $host_os in
++    cygwin* | mingw* | pw32* | os2* | cegcc*)
++      pic_mode=default
++      ;;
++    esac
++    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
++      # non-PIC code in shared libraries is not supported
++      pic_mode=default
++    fi
  
 -      -inst-prefix-dir)
 -	prev=inst_prefix
 -	continue
 -	;;
-+  -all-static       do not do any dynamic linking at all
-+  -avoid-version    do not add a version suffix if possible
-+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-+  -export-symbols SYMFILE
-+                    try to export only the symbols listed in SYMFILE
-+  -export-symbols-regex REGEX
-+                    try to export only the symbols matching REGEX
-+  -LLIBDIR          search LIBDIR for required installed libraries
-+  -lNAME            OUTPUT-FILE requires the installed library libNAME
-+  -module           build a library that can dlopened
-+  -no-fast-install  disable the fast-install mode
-+  -no-install       link a not-installable executable
-+  -no-undefined     declare that a library does not refer to external symbols
-+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-+  -objectlist FILE  Use a list of object files found in FILE to specify objects
-+  -precious-files-regex REGEX
-+                    don't remove output files matching REGEX
-+  -release RELEASE  specify package release information
-+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-+  -shared           only do dynamic linking of libtool libraries
-+  -shrext SUFFIX    override the standard shared library file extension
-+  -static           do not do any dynamic linking of uninstalled libtool libraries
-+  -static-libtool-libs
-+                    do not do any dynamic linking of libtool libraries
-+  -version-info CURRENT[:REVISION[:AGE]]
-+                    specify library version info [each variable defaults to 0]
-+  -weak LIBNAME     declare that the target provides the LIBNAME interface
++    # Calculate the filename of the output object if compiler does
++    # not support -o with -c
++    if test "$compiler_c_o" = no; then
++      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
++      lockfile="$output_obj.lock"
++    else
++      output_obj=
++      need_locks=no
++      lockfile=
++    fi
  
 -      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
 -      # so, if we see these flags be careful not to treat them like -L
@@ -21860,7 +21607,18 @@
 -	esac
 -	continue
 -	;;
-+All other options (arguments beginning with \`-') are ignored.
++    # Lock this critical section if it is needed
++    # We use this script file to make the link, it avoids creating a new file
++    if test "$need_locks" = yes; then
++      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
++	func_echo "Waiting for $lockfile to be removed"
++	sleep 2
++      done
++    elif test "$need_locks" = warn; then
++      if test -f "$lockfile"; then
++	$ECHO "\
++*** ERROR, $lockfile exists and contains:
++`cat $lockfile 2>/dev/null`
  
 -      -L*)
 -	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
@@ -21871,7 +21629,8 @@
 -	  absdir=`cd "$dir" && pwd`
 -	  if test -z "$absdir"; then
 -	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
--	    exit 1
+-	    absdir="$dir"
+-	    notinst_path="$notinst_path $dir"
 -	  fi
 -	  dir="$absdir"
 -	  ;;
@@ -21885,30 +21644,38 @@
 -	esac
 -	case $host in
 -	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+-	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 -	  case :$dllsearchpath: in
 -	  *":$dir:"*) ;;
 -	  *) dllsearchpath="$dllsearchpath:$dir";;
 -	  esac
+-	  case :$dllsearchpath: in
+-	  *":$testbindir:"*) ;;
+-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+-	  esac
 -	  ;;
 -	esac
 -	continue
 -	;;
-+Every other argument is treated as a filename.  Files ending in \`.la' are
-+treated as uninstalled libtool libraries, other files are standard or library
-+object files.
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
  
 -      -l*)
 -	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 -	  case $host in
--	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
 -	    # These systems don't actually have a C or math library (as such)
 -	    continue
 -	    ;;
--	  *-*-mingw* | *-*-os2*)
+-	  *-*-os2*)
 -	    # These systems don't actually have a C library (as such)
 -	    test "X$arg" = "X-lc" && continue
 -	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 -	    # Do not include libc due to us having libc/libc_r.
 -	    test "X$arg" = "X-lc" && continue
 -	    ;;
@@ -21916,10 +21683,19 @@
 -	    # Rhapsody C and math libraries are in the System framework
 -	    deplibs="$deplibs -framework System"
 -	    continue
+-	    ;;
+-	  *-*-sco3.2v5* | *-*-sco5v6*)
+-	    # Causes problems with __ctype
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+-	    # Compiler inserts libc in the correct place for threads to work
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
 -	  esac
 -	elif test "X$arg" = "X-lc_r"; then
 -	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
+-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 -	   # Do not include libc_r directly, use -pthread flag.
 -	   continue
 -	   ;;
@@ -21928,32 +21704,67 @@
 -	deplibs="$deplibs $arg"
 -	continue
 -	;;
-+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-+only library objects (\`.lo' files) may be specified, and \`-rpath' is
-+required, except when creating a convenience library.
++	$opt_dry_run || $RM $removelist
++	exit $EXIT_FAILURE
++      fi
++      func_append removelist " $output_obj"
++      $ECHO "$srcfile" > "$lockfile"
++    fi
+ 
+-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+-      # classes, name mangling, and exception handling.
+-      -model)
+-	compile_command="$compile_command $arg"
+-	compiler_flags="$compiler_flags $arg"
+-	finalize_command="$finalize_command $arg"
+-	prev=xcompiler
+-	continue
+-	;;
++    $opt_dry_run || $RM $removelist
++    func_append removelist " $lockfile"
++    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
++
++    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
++    srcfile=$func_to_tool_file_result
++    func_quote_for_eval "$srcfile"
++    qsrcfile=$func_quote_for_eval_result
  
 -     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
--	deplibs="$deplibs $arg"
+-	compiler_flags="$compiler_flags $arg"
+-	compile_command="$compile_command $arg"
+-	finalize_command="$finalize_command $arg"
 -	continue
 -	;;
-+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-+using \`ar' and \`ranlib', or on Windows using \`lib'.
++    # Only build a PIC object if we are building libtool libraries.
++    if test "$build_libtool_libs" = yes; then
++      # Without this assignment, base_compile gets emptied.
++      fbsd_hideous_sh_bug=$base_compile
  
 -      -module)
 -	module=yes
 -	continue
 -	;;
-+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-+is created, otherwise an executable program is created."
-+        ;;
++      if test "$pic_mode" != no; then
++	command="$base_compile $qsrcfile $pic_flag"
++      else
++	# Don't build PIC code
++	command="$base_compile $qsrcfile"
++      fi
+ 
+-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+-      # +DA*, +DD* enable 64-bit mode on the HP compiler
+-      # -q* pass through compiler args for the IBM compiler
+-      # -m* pass through architecture-specific compiler args for GCC
+-      # -m*, -t[45]*, -txscale* pass through architecture-specific
+-      # compiler args for GCC
+-      # -pg pass through profiling flag for GCC
+-      # @file GCC response files
+-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+-      -t[45]*|-txscale*|@*)
++      func_mkdir_p "$xdir$objdir"
  
--      # gcc -m* arguments should be passed to the linker via $compiler_flags
--      # in order to pass architecture information to the linker
--      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
--      # but this is not reliable with gcc because gcc may use -mfoo to
--      # select a different linker, different libraries, etc, while
--      # -Wl,-mfoo simply passes -mfoo to the linker.
--      -m*)
 -	# Unknown arguments in both finalize_command and compile_command need
 -	# to be aesthetically quoted because they are evaled later.
 -	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
@@ -21964,39 +21775,30 @@
 -	esac
 -        compile_command="$compile_command $arg"
 -        finalize_command="$finalize_command $arg"
--        if test "$with_gcc" = "yes" ; then
--          compiler_flags="$compiler_flags $arg"
--        fi
+-        compiler_flags="$compiler_flags $arg"
 -        continue
-+      uninstall)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-+
-+Remove libraries from an installation directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, all the files associated with it are deleted.
-+Otherwise, only FILE itself is deleted using RM."
-         ;;
+-        ;;
++      if test -z "$output_obj"; then
++	# Place PIC objects in $objdir
++	func_append command " -o $lobj"
++      fi
  
 -      -shrext)
 -	prev=shrext
 -	continue
 -	;;
-+      *)
-+        func_fatal_help "invalid operation mode \`$mode'"
-+        ;;
-+    esac
++      func_show_eval_locale "$command"	\
++          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
  
 -      -no-fast-install)
 -	fast_install=no
 -	continue
 -	;;
-+    $ECHO
-+    $ECHO "Try \`$progname --help' for more information about other modes."
++      if test "$need_locks" = warn &&
++	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
++	$ECHO "\
++*** ERROR, $lockfile contains:
++`cat $lockfile 2>/dev/null`
  
 -      -no-install)
 -	case $host in
@@ -22011,87 +21813,79 @@
 -	esac
 -	continue
 -	;;
-+    exit $?
-+}
++but it should contain:
++$srcfile
  
 -      -no-undefined)
 -	allow_undefined=no
 -	continue
 -	;;
-+  # Now that we've collected a possible --mode arg, show help if necessary
-+  $opt_help && func_mode_help
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
  
 -      -objectlist)
 -	prev=objectlist
 -	continue
 -	;;
++	$opt_dry_run || $RM $removelist
++	exit $EXIT_FAILURE
++      fi
  
 -      -o) prev=output ;;
-+# func_mode_execute arg...
-+func_mode_execute ()
-+{
-+    $opt_debug
-+    # The first argument is the command name.
-+    cmd="$nonopt"
-+    test -z "$cmd" && \
-+      func_fatal_help "you must specify a COMMAND"
++      # Just move the object if needed, then go on to compile the next one
++      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
++	func_show_eval '$MV "$output_obj" "$lobj"' \
++	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
++      fi
  
 -      -precious-files-regex)
 -	prev=precious_regex
 -	continue
 -	;;
-+    # Handle -dlopen flags immediately.
-+    for file in $execute_dlfiles; do
-+      test -f "$file" \
-+	|| func_fatal_help "\`$file' is not a file"
++      # Allow error messages only from the first compilation.
++      if test "$suppress_opt" = yes; then
++	suppress_output=' >/dev/null 2>&1'
++      fi
++    fi
  
 -      -release)
 -	prev=release
 -	continue
 -	;;
-+      dir=
-+      case $file in
-+      *.la)
-+	# Check to see that this really is a libtool archive.
-+	func_lalib_unsafe_p "$file" \
-+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
++    # Only build a position-dependent object if we build old libraries.
++    if test "$build_old_libs" = yes; then
++      if test "$pic_mode" != yes; then
++	# Don't build PIC code
++	command="$base_compile $qsrcfile$pie_flag"
++      else
++	command="$base_compile $qsrcfile $pic_flag"
++      fi
++      if test "$compiler_c_o" = yes; then
++	func_append command " -o $obj"
++      fi
  
 -      -rpath)
 -	prev=rpath
 -	continue
-+	# Read the libtool library.
-+	dlname=
-+	library_names=
-+	func_source "$file"
-+
-+	# Skip this library if it cannot be dlopened.
-+	if test -z "$dlname"; then
-+	  # Warn if it was a shared library.
-+	  test -n "$library_names" && \
-+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-+	  continue
-+	fi
-+
-+	func_dirname "$file" "" "."
-+	dir="$func_dirname_result"
-+
-+	if test -f "$dir/$objdir/$dlname"; then
-+	  dir="$dir/$objdir"
-+	else
-+	  if test ! -f "$dir/$dlname"; then
-+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-+	  fi
-+	fi
- 	;;
+-	;;
++      # Suppress compiler output if we already did a PIC compilation.
++      func_append command "$suppress_output"
++      func_show_eval_locale "$command" \
++        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
  
 -      -R)
 -	prev=xrpath
 -	continue
-+      *.lo)
-+	# Just add the directory containing the .lo file.
-+	func_dirname "$file" "" "."
-+	dir="$func_dirname_result"
- 	;;
+-	;;
++      if test "$need_locks" = warn &&
++	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
++	$ECHO "\
++*** ERROR, $lockfile contains:
++`cat $lockfile 2>/dev/null`
  
 -      -R*)
 -	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
@@ -22100,20 +21894,19 @@
 -	[\\/]* | [A-Za-z]:[\\/]*) ;;
 -	*)
 -	  $echo "$modename: only absolute run-paths are allowed" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	  ;;
 -	esac
 -	case "$xrpath " in
 -	*" $dir "*) ;;
 -	*) xrpath="$xrpath $dir" ;;
 -	esac
-+      *)
-+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
- 	continue
- 	;;
-+      esac
+-	continue
+-	;;
++but it should contain:
++$srcfile
  
--      -static)
+-      -static | -static-libtool-libs)
 -	# The effects of -static are defined in a previous loop.
 -	# We used to do the same as -all-static on platforms that
 -	# didn't have a PIC flag, but the assumption that the effects
@@ -22121,14 +21914,20 @@
 -	# Digital Unix and AIX.
 -	continue
 -	;;
--
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
+ 
 -      -thread-safe)
 -	thread_safe=yes
 -	continue
 -	;;
-+      # Get the absolute pathname.
-+      absdir=`cd "$dir" && pwd`
-+      test -n "$absdir" && dir="$absdir"
++	$opt_dry_run || $RM $removelist
++	exit $EXIT_FAILURE
++      fi
  
 -      -version-info)
 -	prev=vinfo
@@ -22139,13 +21938,12 @@
 -	vinfo_number=yes
 -	continue
 -	;;
-+      # Now add the directory to shlibpath_var.
-+      if eval "test -z \"\$$shlibpath_var\""; then
-+	eval "$shlibpath_var=\"\$dir\""
-+      else
-+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
++      # Just move the object if needed
++      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
++	func_show_eval '$MV "$output_obj" "$obj"' \
++	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
 +      fi
-+    done
++    fi
  
 -      -Wc,*)
 -	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
@@ -22164,9 +21962,8 @@
 -	IFS="$save_ifs"
 -	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
 -	;;
-+    # This variable tells wrapper scripts just to set shlibpath_var
-+    # rather than running their programs.
-+    libtool_execute_magic="$magic"
++    $opt_dry_run || {
++      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
  
 -      -Wl,*)
 -	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
@@ -22185,71 +21982,42 @@
 -	done
 -	IFS="$save_ifs"
 -	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+    # Check if any of the arguments is a wrapper script.
-+    args=
-+    for file
-+    do
-+      case $file in
-+      -*) ;;
-+      *)
-+	# Do a test to see if this is really a libtool program.
-+	if func_ltwrapper_script_p "$file"; then
-+	  func_source "$file"
-+	  # Transform arg to wrapped name.
-+	  file="$progdir/$program"
-+	elif func_ltwrapper_executable_p "$file"; then
-+	  func_ltwrapper_scriptname "$file"
-+	  func_source "$func_ltwrapper_scriptname_result"
-+	  # Transform arg to wrapped name.
-+	  file="$progdir/$program"
-+	fi
- 	;;
-+      esac
-+      # Quote arguments (to preserve shell metacharacters).
-+      func_quote_for_eval "$file"
-+      args="$args $func_quote_for_eval_result"
-+    done
+-	;;
++      # Unlock the critical section if it was locked
++      if test "$need_locks" != no; then
++	removelist=$lockfile
++        $RM "$lockfile"
++      fi
++    }
  
 -      -Xcompiler)
 -	prev=xcompiler
 -	continue
 -	;;
-+    if test "X$opt_dry_run" = Xfalse; then
-+      if test -n "$shlibpath_var"; then
-+	# Export the shlibpath_var.
-+	eval "export $shlibpath_var"
-+      fi
++    exit $EXIT_SUCCESS
++}
  
 -      -Xlinker)
 -	prev=xlinker
 -	continue
 -	;;
-+      # Restore saved environment variables
-+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+      do
-+	eval "if test \"\${save_$lt_var+set}\" = set; then
-+                $lt_var=\$save_$lt_var; export $lt_var
-+	      else
-+		$lt_unset $lt_var
-+	      fi"
-+      done
++$opt_help || {
++  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
++}
  
 -      -XCClinker)
 -	prev=xcclinker
 -	continue
 -	;;
-+      # Now prepare to actually exec the command.
-+      exec_cmd="\$cmd$args"
-+    else
-+      # Display what would be done.
-+      if test -n "$shlibpath_var"; then
-+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-+	$ECHO "export $shlibpath_var"
-+      fi
-+      $ECHO "$cmd$args"
-+      exit $EXIT_SUCCESS
-+    fi
-+}
++func_mode_help ()
++{
++    # We need to display help for each of the modes.
++    case $opt_mode in
++      "")
++        # Generic help is extracted from the usage comments
++        # at the start of this file.
++        func_help
++        ;;
  
 -      # Some other compiler flag.
 -      -* | +*)
@@ -22262,31 +22030,29 @@
 -	  ;;
 -	esac
 -	;;
-+test "$mode" = execute && func_mode_execute ${1+"$@"}
- 
--      *.$objext)
++      clean)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+ 
+-      *.$objext)
 -	# A standard object.
 -	objs="$objs $arg"
 -	;;
++Remove files from the build directory.
  
 -      *.lo)
 -	# A libtool-controlled object.
-+# func_mode_finish arg...
-+func_mode_finish ()
-+{
-+    $opt_debug
-+    libdirs="$nonopt"
-+    admincmds=
++RM is the name of the program to use to delete files associated with each FILE
++(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
++to RM.
  
 -	# Check to see that this really is a libtool object.
 -	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
 -	  pic_object=
 -	  non_pic_object=
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+      for dir
-+      do
-+	libdirs="$libdirs $dir"
-+      done
++If FILE is a libtool library, object or program, all the files associated
++with it are deleted. Otherwise, only FILE itself is deleted using RM."
++        ;;
  
 -	  # Read the .lo file
 -	  # If there is no directory component, then add one.
@@ -22294,30 +22060,18 @@
 -	  */* | *\\*) . $arg ;;
 -	  *) . ./$arg ;;
 -	  esac
-+      for libdir in $libdirs; do
-+	if test -n "$finish_cmds"; then
-+	  # Do each command in the finish commands.
-+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-+'"$cmd"'"'
-+	fi
-+	if test -n "$finish_eval"; then
-+	  # Do the single finish_eval.
-+	  eval cmds=\"$finish_eval\"
-+	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-+       $cmds"
-+	fi
-+      done
-+    fi
++      compile)
++      $ECHO \
++"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
  
 -	  if test -z "$pic_object" || \
 -	     test -z "$non_pic_object" ||
 -	     test "$pic_object" = none && \
 -	     test "$non_pic_object" = none; then
 -	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
--	    exit 1
+-	    exit $EXIT_FAILURE
 -	  fi
-+    # Exit here if they wanted silent mode.
-+    $opt_silent && exit $EXIT_SUCCESS
++Compile a source file into a libtool library object.
  
 -	  # Extract subdirectory from the argument.
 -	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
@@ -22326,40 +22080,18 @@
 - 	  else
 -	    xdir="$xdir/"
 -	  fi
-+    $ECHO "X----------------------------------------------------------------------" | $Xsed
-+    $ECHO "Libraries have been installed in:"
-+    for libdir in $libdirs; do
-+      $ECHO "   $libdir"
-+    done
-+    $ECHO
-+    $ECHO "If you ever happen to want to link against installed libraries"
-+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+    $ECHO "flag during linking and do at least one of the following:"
-+    if test -n "$shlibpath_var"; then
-+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+      $ECHO "     during execution"
-+    fi
-+    if test -n "$runpath_var"; then
-+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-+      $ECHO "     during linking"
-+    fi
-+    if test -n "$hardcode_libdir_flag_spec"; then
-+      libdir=LIBDIR
-+      eval flag=\"$hardcode_libdir_flag_spec\"
++This mode accepts the following additional options:
  
 -	  if test "$pic_object" != none; then
 -	    # Prepend the subdirectory the object is found in.
 -	    pic_object="$xdir$pic_object"
-+      $ECHO "   - use the \`$flag' linker flag"
-+    fi
-+    if test -n "$admincmds"; then
-+      $ECHO "   - have your system administrator run these commands:$admincmds"
-+    fi
-+    if test -f /etc/ld.so.conf; then
-+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+    fi
-+    $ECHO
++  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
++  -no-suppress      do not suppress compiler output for multiple passes
++  -prefer-pic       try to build PIC objects only
++  -prefer-non-pic   try to build non-PIC objects only
++  -shared           do not build a \`.o' file suitable for static linking
++  -static           only build a \`.o' file suitable for static linking
++  -Wc,FLAG          pass FLAG directly to the compiler
  
 -	    if test "$prev" = dlfiles; then
 -	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -22371,19 +22103,8 @@
 -		prev=dlprefiles
 -	      fi
 -	    fi
-+    $ECHO "See any operating system documentation about shared libraries for"
-+    case $host in
-+      solaris2.[6789]|solaris2.1[0-9])
-+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-+	$ECHO "pages."
-+	;;
-+      *)
-+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-+        ;;
-+    esac
-+    $ECHO "X----------------------------------------------------------------------" | $Xsed
-+    exit $EXIT_SUCCESS
-+}
++COMPILE-COMMAND is a command to be used in creating a \`standard' object file
++from the given SOURCEFILE.
  
 -	    # CHECK ME:  I think I busted this.  -Ossama
 -	    if test "$prev" = dlprefiles; then
@@ -22391,53 +22112,44 @@
 -	      dlprefiles="$dlprefiles $pic_object"
 -	      prev=
 -	    fi
-+test "$mode" = finish && func_mode_finish ${1+"$@"}
++The output file name is determined by removing the directory component from
++SOURCEFILE, then substituting the C source code suffix \`.c' with the
++library object suffix, \`.lo'."
++        ;;
  
 -	    # A PIC object.
 -	    libobjs="$libobjs $pic_object"
 -	    arg="$pic_object"
 -	  fi
++      execute)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
  
 -	  # Non-PIC object.
 -	  if test "$non_pic_object" != none; then
 -	    # Prepend the subdirectory the object is found in.
 -	    non_pic_object="$xdir$non_pic_object"
-+# func_mode_install arg...
-+func_mode_install ()
-+{
-+    $opt_debug
-+    # There may be an optional sh(1) argument at the beginning of
-+    # install_prog (especially on Windows NT).
-+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-+       # Allow the use of GNU shtool's install command.
-+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-+      # Aesthetically quote it.
-+      func_quote_for_eval "$nonopt"
-+      install_prog="$func_quote_for_eval_result "
-+      arg=$1
-+      shift
-+    else
-+      install_prog=
-+      arg=$nonopt
-+    fi
++Automatically set library path, then run a program.
  
 -	    # A standard non-PIC object
 -	    non_pic_objects="$non_pic_objects $non_pic_object"
 -	    if test -z "$pic_object" || test "$pic_object" = none ; then
 -	      arg="$non_pic_object"
 -	    fi
+-	  else
+-	    # If the PIC object exists, use it instead.
+-	    # $xdir was prepended to $pic_object above.
+-	    non_pic_object="$pic_object"
+-	    non_pic_objects="$non_pic_objects $non_pic_object"
 -	  fi
 -	else
 -	  # Only an error if not doing a dry-run.
 -	  if test -z "$run"; then
 -	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
--	    exit 1
+-	    exit $EXIT_FAILURE
 -	  else
 -	    # Dry-run case.
-+    # The real first argument should be the name of the installation program.
-+    # Aesthetically quote it.
-+    func_quote_for_eval "$arg"
-+    install_prog="$install_prog$func_quote_for_eval_result"
++This mode accepts the following additional options:
  
 -	    # Extract subdirectory from the argument.
 -	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
@@ -22446,21 +22158,7 @@
 -	    else
 -	      xdir="$xdir/"
 -	    fi
-+    # We need to accept at least all the BSD install flags.
-+    dest=
-+    files=
-+    opts=
-+    prev=
-+    install_type=
-+    isdir=no
-+    stripme=
-+    for arg
-+    do
-+      if test -n "$dest"; then
-+	files="$files $dest"
-+	dest=$arg
-+	continue
-+      fi
++  -dlopen FILE      add the directory containing FILE to the library path
  
 -	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
 -	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
@@ -22468,30 +22166,25 @@
 -	    non_pic_objects="$non_pic_objects $non_pic_object"
 -	  fi
 -	fi
-+      case $arg in
-+      -d) isdir=yes ;;
-+      -f)
-+	case " $install_prog " in
-+	*[\\\ /]cp\ *) ;;
-+	*) prev=$arg ;;
-+	esac
- 	;;
--
+-	;;
++This mode sets the library path environment variable according to \`-dlopen'
++flags.
+ 
 -      *.$libext)
 -	# An archive.
 -	deplibs="$deplibs $arg"
 -	old_deplibs="$old_deplibs $arg"
-+      -g | -m | -o)
-+	prev=$arg
-+	;;
-+      -s)
-+	stripme=" -s"
- 	continue
- 	;;
--
+-	continue
+-	;;
++If any of the ARGS are libtool executable wrappers, then they are translated
++into their corresponding uninstalled binary, and any of their required library
++directories are added to the library path.
+ 
 -      *.la)
 -	# A libtool-controlled library.
--
++Then, COMMAND is executed, with ARGS as arguments."
++        ;;
+ 
 -	if test "$prev" = dlfiles; then
 -	  # This library was specified with -dlopen.
 -	  dlfiles="$dlfiles $arg"
@@ -22499,20 +22192,15 @@
 -	elif test "$prev" = dlprefiles; then
 -	  # The library was specified with -dlpreopen.
 -	  dlprefiles="$dlprefiles $arg"
-+      -*)
-+	;;
-+      *)
-+	# If the previous option needed an argument, then skip it.
-+	if test -n "$prev"; then
- 	  prev=
- 	else
+-	  prev=
+-	else
 -	  deplibs="$deplibs $arg"
-+	  dest=$arg
-+	  continue
- 	fi
+-	fi
 -	continue
- 	;;
-+      esac
+-	;;
++      finish)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
  
 -      # Some other compiler argument.
 -      *)
@@ -22526,10 +22214,7 @@
 -	esac
 -	;;
 -      esac # arg
-+      # Aesthetically quote the argument.
-+      func_quote_for_eval "$arg"
-+      install_prog="$install_prog $func_quote_for_eval_result"
-+    done
++Complete the installation of libtool libraries.
  
 -      # Now actually substitute the argument into the commands.
 -      if test -n "$arg"; then
@@ -22537,53 +22222,42 @@
 -	finalize_command="$finalize_command $arg"
 -      fi
 -    done # argument parsing loop
-+    test -z "$install_prog" && \
-+      func_fatal_help "you must specify an install program"
++Each LIBDIR is a directory that contains libtool libraries.
  
 -    if test -n "$prev"; then
 -      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
 -      $echo "$help" 1>&2
--      exit 1
+-      exit $EXIT_FAILURE
 -    fi
-+    test -n "$prev" && \
-+      func_fatal_help "the \`$prev' option requires an argument"
++The commands that this mode executes may require superuser privileges.  Use
++the \`--dry-run' option if you just want to see what would be executed."
++        ;;
  
 -    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
 -      eval arg=\"$export_dynamic_flag_spec\"
 -      compile_command="$compile_command $arg"
 -      finalize_command="$finalize_command $arg"
-+    if test -z "$files"; then
-+      if test -z "$dest"; then
-+	func_fatal_help "no file or destination specified"
-+      else
-+	func_fatal_help "you must specify a destination"
-+      fi
-     fi
+-    fi
++      install)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
  
 -    oldlibs=
 -    # calculate the name of the file, without its directory
 -    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
 -    libobjs_save="$libobjs"
-+    # Strip any trailing slash from the destination.
-+    func_stripname '' '/' "$dest"
-+    dest=$func_stripname_result
++Install executables or libraries.
  
 -    if test -n "$shlibpath_var"; then
 -      # get the directories listed in $shlibpath_var
 -      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+    # Check to see that the destination is a directory.
-+    test -d "$dest" && isdir=yes
-+    if test "$isdir" = yes; then
-+      destdir="$dest"
-+      destname=
-     else
+-    else
 -      shlib_search_path=
 -    fi
 -    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
 -    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-+      func_dirname_and_basename "$dest" "" "."
-+      destdir="$func_dirname_result"
-+      destname="$func_basename_result"
++INSTALL-COMMAND is the installation command.  The first component should be
++either the \`install' or \`cp' program.
  
 -    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
 -    if test "X$output_objdir" = "X$output"; then
@@ -22595,47 +22269,123 @@
 -    if test ! -d "$output_objdir"; then
 -      $show "$mkdir $output_objdir"
 -      $run $mkdir $output_objdir
--      status=$?
--      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
--	exit $status
+-      exit_status=$?
+-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
+-	exit $exit_status
 -      fi
-+      # Not a directory, so check to see that there is only one file specified.
-+      set dummy $files; shift
-+      test "$#" -gt 1 && \
-+	func_fatal_help "\`$dest' is not a directory"
-     fi
--
+-    fi
++The following components of INSTALL-COMMAND are treated specially:
+ 
 -    # Determine the type of output
 -    case $output in
 -    "")
 -      $echo "$modename: you must specify an output file" 1>&2
 -      $echo "$help" 1>&2
--      exit 1
+-      exit $EXIT_FAILURE
 -      ;;
 -    *.$libext) linkmode=oldlib ;;
 -    *.lo | *.$objext) linkmode=obj ;;
 -    *.la) linkmode=lib ;;
 -    *) linkmode=prog ;; # Anything else should be a program.
 -    esac
--
++  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+ 
 -    case $host in
 -    *cygwin* | *mingw* | *pw32*)
--      # don't eliminate duplcations in $postdeps and $predeps
+-      # don't eliminate duplications in $postdeps and $predeps
 -      duplicate_compiler_generated_deps=yes
 -      ;;
-+    case $destdir in
-+    [\\/]* | [A-Za-z]:[\\/]*) ;;
-     *)
+-    *)
 -      duplicate_compiler_generated_deps=$duplicate_deps
-+      for file in $files; do
-+	case $file in
-+	*.lo) ;;
-+	*)
-+	  func_fatal_help "\`$destdir' must be an absolute directory name"
-+	  ;;
-+	esac
-+      done
-       ;;
+-      ;;
++The rest of the components are interpreted as arguments to that command (only
++BSD-compatible install options are recognized)."
++        ;;
++
++      link)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
++
++Link object files or libraries together to form another library, or to
++create an executable program.
++
++LINK-COMMAND is a command using the C compiler that you would use to create
++a program from several object files.
++
++The following components of LINK-COMMAND are treated specially:
++
++  -all-static       do not do any dynamic linking at all
++  -avoid-version    do not add a version suffix if possible
++  -bindir BINDIR    specify path to binaries directory (for systems where
++                    libraries must be found in the PATH setting at runtime)
++  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
++  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
++  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
++  -export-symbols SYMFILE
++                    try to export only the symbols listed in SYMFILE
++  -export-symbols-regex REGEX
++                    try to export only the symbols matching REGEX
++  -LLIBDIR          search LIBDIR for required installed libraries
++  -lNAME            OUTPUT-FILE requires the installed library libNAME
++  -module           build a library that can dlopened
++  -no-fast-install  disable the fast-install mode
++  -no-install       link a not-installable executable
++  -no-undefined     declare that a library does not refer to external symbols
++  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
++  -objectlist FILE  Use a list of object files found in FILE to specify objects
++  -precious-files-regex REGEX
++                    don't remove output files matching REGEX
++  -release RELEASE  specify package release information
++  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
++  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
++  -shared           only do dynamic linking of libtool libraries
++  -shrext SUFFIX    override the standard shared library file extension
++  -static           do not do any dynamic linking of uninstalled libtool libraries
++  -static-libtool-libs
++                    do not do any dynamic linking of libtool libraries
++  -version-info CURRENT[:REVISION[:AGE]]
++                    specify library version info [each variable defaults to 0]
++  -weak LIBNAME     declare that the target provides the LIBNAME interface
++  -Wc,FLAG
++  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
++  -Wl,FLAG
++  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
++  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
++
++All other options (arguments beginning with \`-') are ignored.
++
++Every other argument is treated as a filename.  Files ending in \`.la' are
++treated as uninstalled libtool libraries, other files are standard or library
++object files.
++
++If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
++only library objects (\`.lo' files) may be specified, and \`-rpath' is
++required, except when creating a convenience library.
++
++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
++using \`ar' and \`ranlib', or on Windows using \`lib'.
++
++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
++is created, otherwise an executable program is created."
++        ;;
++
++      uninstall)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
++
++Remove libraries from an installation directory.
++
++RM is the name of the program to use to delete files associated with each FILE
++(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
++to RM.
++
++If FILE is a libtool library, all the files associated with it are deleted.
++Otherwise, only FILE itself is deleted using RM."
++        ;;
++
++      *)
++        func_fatal_help "invalid operation mode \`$opt_mode'"
++        ;;
      esac
 -    specialdeplibs=
  
@@ -22647,19 +22397,121 @@
 -	case "$libs " in
 -	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 -	esac
--      fi
++    echo
++    $ECHO "Try \`$progname --help' for more information about other modes."
++}
++
++# Now that we've collected a possible --mode arg, show help if necessary
++if $opt_help; then
++  if test "$opt_help" = :; then
++    func_mode_help
++  else
++    {
++      func_help noexit
++      for opt_mode in compile link execute install finish uninstall clean; do
++	func_mode_help
++      done
++    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
++    {
++      func_help noexit
++      for opt_mode in compile link execute install finish uninstall clean; do
++	echo
++	func_mode_help
++      done
++    } |
++    sed '1d
++      /^When reporting/,/^Report/{
++	H
++	d
++      }
++      $x
++      /information about other modes/d
++      /more detailed .*MODE/d
++      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
++  fi
++  exit $?
++fi
++
++
++# func_mode_execute arg...
++func_mode_execute ()
++{
++    $opt_debug
++    # The first argument is the command name.
++    cmd="$nonopt"
++    test -z "$cmd" && \
++      func_fatal_help "you must specify a COMMAND"
++
++    # Handle -dlopen flags immediately.
++    for file in $opt_dlopen; do
++      test -f "$file" \
++	|| func_fatal_help "\`$file' is not a file"
++
++      dir=
++      case $file in
++      *.la)
++	func_resolve_sysroot "$file"
++	file=$func_resolve_sysroot_result
++
++	# Check to see that this really is a libtool archive.
++	func_lalib_unsafe_p "$file" \
++	  || func_fatal_help "\`$lib' is not a valid libtool archive"
++
++	# Read the libtool library.
++	dlname=
++	library_names=
++	func_source "$file"
++
++	# Skip this library if it cannot be dlopened.
++	if test -z "$dlname"; then
++	  # Warn if it was a shared library.
++	  test -n "$library_names" && \
++	    func_warning "\`$file' was not linked with \`-export-dynamic'"
++	  continue
++	fi
++
++	func_dirname "$file" "" "."
++	dir="$func_dirname_result"
++
++	if test -f "$dir/$objdir/$dlname"; then
++	  func_append dir "/$objdir"
++	else
++	  if test ! -f "$dir/$dlname"; then
++	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
++	  fi
++	fi
++	;;
++
++      *.lo)
++	# Just add the directory containing the .lo file.
++	func_dirname "$file" "" "."
++	dir="$func_dirname_result"
++	;;
++
++      *)
++	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
++	continue
++	;;
++      esac
++
++      # Get the absolute pathname.
++      absdir=`cd "$dir" && pwd`
++      test -n "$absdir" && dir="$absdir"
++
++      # Now add the directory to shlibpath_var.
++      if eval "test -z \"\$$shlibpath_var\""; then
++	eval "$shlibpath_var=\"\$dir\""
++      else
++	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+       fi
 -      libs="$libs $deplib"
--    done
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
+     done
  
 -    if test "$linkmode" = lib; then
 -      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-+    staticlibs=
-+    future_libdirs=
-+    current_libdirs=
-+    for file in $files; do
++    # This variable tells wrapper scripts just to set shlibpath_var
++    # rather than running their programs.
++    libtool_execute_magic="$magic"
  
 -      # Compute libraries that are listed more than once in $predeps
 -      # $postdeps and mark them as special (i.e., whose duplicates are
@@ -22669,48 +22521,68 @@
 -	for pre_post_dep in $predeps $postdeps; do
 -	  case "$pre_post_deps " in
 -	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+      # Do each installation.
+-	  esac
+-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+-	done
++    # Check if any of the arguments is a wrapper script.
++    args=
++    for file
++    do
 +      case $file in
-+      *.$libext)
-+	# Do the static libraries later.
-+	staticlibs="$staticlibs $file"
++      -* | *.la | *.lo ) ;;
++      *)
++	# Do a test to see if this is really a libtool program.
++	if func_ltwrapper_script_p "$file"; then
++	  func_source "$file"
++	  # Transform arg to wrapped name.
++	  file="$progdir/$program"
++	elif func_ltwrapper_executable_p "$file"; then
++	  func_ltwrapper_scriptname "$file"
++	  func_source "$func_ltwrapper_scriptname_result"
++	  # Transform arg to wrapped name.
++	  file="$progdir/$program"
++	fi
 +	;;
++      esac
++      # Quote arguments (to preserve shell metacharacters).
++      func_append_quoted args "$file"
++    done
 +
-+      *.la)
-+	# Check to see that this really is a libtool archive.
-+	func_lalib_unsafe_p "$file" \
-+	  || func_fatal_help "\`$file' is not a valid libtool archive"
++    if test "X$opt_dry_run" = Xfalse; then
++      if test -n "$shlibpath_var"; then
++	# Export the shlibpath_var.
++	eval "export $shlibpath_var"
+       fi
+-      pre_post_deps=
 +
-+	library_names=
-+	old_library=
-+	relink_command=
-+	func_source "$file"
++      # Restore saved environment variables
++      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++      do
++	eval "if test \"\${save_$lt_var+set}\" = set; then
++                $lt_var=\$save_$lt_var; export $lt_var
++	      else
++		$lt_unset $lt_var
++	      fi"
++      done
 +
-+	# Add the libdir to current_libdirs if it is the destination.
-+	if test "X$destdir" = "X$libdir"; then
-+	  case "$current_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) current_libdirs="$current_libdirs $libdir" ;;
- 	  esac
--	  pre_post_deps="$pre_post_deps $pre_post_dep"
--	done
--      fi
--      pre_post_deps=
--    fi
-+	else
-+	  # Note the libdir as a future libdir.
-+	  case "$future_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) future_libdirs="$future_libdirs $libdir" ;;
-+	  esac
-+	fi
++      # Now prepare to actually exec the command.
++      exec_cmd="\$cmd$args"
++    else
++      # Display what would be done.
++      if test -n "$shlibpath_var"; then
++	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
++	echo "export $shlibpath_var"
++      fi
++      $ECHO "$cmd$args"
++      exit $EXIT_SUCCESS
+     fi
++}
  
 -    deplibs=
 -    newdependency_libs=
 -    newlib_search_path=
 -    need_relink=no # whether we're linking any uninstalled libtool libraries
 -    notinst_deplibs= # not-installed libtool libraries
--    notinst_path= # paths that contain not-installed libtool libraries
 -    case $linkmode in
 -    lib)
 -	passes="conv link"
@@ -22719,181 +22591,87 @@
 -	  *.la) ;;
 -	  *)
 -	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
--	    exit 1
-+	func_dirname "$file" "/" ""
-+	dir="$func_dirname_result"
-+	dir="$dir$objdir"
+-	    exit $EXIT_FAILURE
+-	    ;;
+-	  esac
+-	done
+-	;;
+-    prog)
+-	compile_deplibs=
+-	finalize_deplibs=
+-	alldeplibs=no
+-	newdlfiles=
+-	newdlprefiles=
+-	passes="conv scan dlopen dlpreopen link"
+-	;;
+-    *)  passes="conv"
+-	;;
+-    esac
+-    for pass in $passes; do
+-      if test "$linkmode,$pass" = "lib,link" ||
+-	 test "$linkmode,$pass" = "prog,scan"; then
+-	libs="$deplibs"
+-	deplibs=
++test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
 +
-+	if test -n "$relink_command"; then
-+	  # Determine the prefix the user has applied to our future dir.
-+	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
 +
-+	  # Don't allow the user to place us outside of our expected
-+	  # location b/c this prevents finding dependent libraries that
-+	  # are installed to the same prefix.
-+	  # At present, this check doesn't affect windows .dll's that
-+	  # are installed into $libdir/../bin (currently, that works fine)
-+	  # but it's something to keep an eye on.
-+	  test "$inst_prefix_dir" = "$destdir" && \
-+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++# func_mode_finish arg...
++func_mode_finish ()
++{
++    $opt_debug
++    libs=
++    libdirs=
++    admincmds=
 +
-+	  if test -n "$inst_prefix_dir"; then
-+	    # Stick the inst_prefix_dir data into the link command.
-+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	  else
-+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
-+	  fi
++    for opt in "$nonopt" ${1+"$@"}
++    do
++      if test -d "$opt"; then
++	func_append libdirs " $opt"
 +
-+	  func_warning "relinking \`$file'"
-+	  func_show_eval "$relink_command" \
-+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
++      elif test -f "$opt"; then
++	if func_lalib_unsafe_p "$opt"; then
++	  func_append libs " $opt"
++	else
++	  func_warning "\`$opt' is not a valid libtool archive"
 +	fi
 +
-+	# See the names of the shared library.
-+	set dummy $library_names; shift
-+	if test -n "$1"; then
-+	  realname="$1"
-+	  shift
-+
-+	  srcname="$realname"
-+	  test -n "$relink_command" && srcname="$realname"T
-+
-+	  # Install the shared library and build the symlinks.
-+	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
-+	      'exit $?'
-+	  tstripme="$stripme"
-+	  case $host_os in
-+	  cygwin* | mingw* | pw32* | cegcc*)
-+	    case $realname in
-+	    *.dll.a)
-+	      tstripme=""
-+	      ;;
-+	    esac
- 	    ;;
- 	  esac
--	done
--	;;
--    prog)
--	compile_deplibs=
--	finalize_deplibs=
--	alldeplibs=no
--	newdlfiles=
--	newdlprefiles=
--	passes="conv scan dlopen dlpreopen link"
-+	  if test -n "$tstripme" && test -n "$striplib"; then
-+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-+	  fi
-+
-+	  if test "$#" -gt 0; then
-+	    # Delete the old symlinks, and create new ones.
-+	    # Try `ln -sf' first, because the `ln' binary might depend on
-+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-+	    # so we also need to try rm && ln -s.
-+	    for linkname
-+	    do
-+	      test "$linkname" != "$realname" \
-+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-+	    done
-+	  fi
-+
-+	  # Do each command in the postinstall commands.
-+	  lib="$destdir/$realname"
-+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-+	fi
-+
-+	# Install the pseudo-library for information purposes.
-+	func_basename "$file"
-+	name="$func_basename_result"
-+	instname="$dir/$name"i
-+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-+
-+	# Maybe install the static library, too.
-+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
- 	;;
--    *)  passes="conv"
-+
-+      *.lo)
-+	# Install (i.e. copy) a libtool object.
-+
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
-+	else
-+	  func_basename "$file"
-+	  destfile="$func_basename_result"
-+	  destfile="$destdir/$destfile"
-+	fi
-+
-+	# Deduce the name of the destination old-style object file.
-+	case $destfile in
-+	*.lo)
-+	  func_lo2o "$destfile"
-+	  staticdest=$func_lo2o_result
-+	  ;;
-+	*.$objext)
-+	  staticdest="$destfile"
-+	  destfile=
-+	  ;;
-+	*)
-+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-+	  ;;
-+	esac
-+
-+	# Install the libtool object if requested.
-+	test -n "$destfile" && \
-+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-+
-+	# Install the old object if enabled.
-+	if test "$build_old_libs" = yes; then
-+	  # Deduce the name of the old-style object file.
-+	  func_lo2o "$file"
-+	  staticobj=$func_lo2o_result
-+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-+	fi
-+	exit $EXIT_SUCCESS
- 	;;
--    esac
--    for pass in $passes; do
--      if test "$linkmode,$pass" = "lib,link" ||
--	 test "$linkmode,$pass" = "prog,scan"; then
--	libs="$deplibs"
--	deplibs=
--      fi
++      else
++	func_fatal_error "invalid argument \`$opt'"
+       fi
 -      if test "$linkmode" = prog; then
 -	case $pass in
 -	dlopen) libs="$dlfiles" ;;
 -	dlpreopen) libs="$dlprefiles" ;;
 -	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+-	esac
++    done
 +
-+      *)
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
-+	else
-+	  func_basename "$file"
-+	  destfile="$func_basename_result"
-+	  destfile="$destdir/$destfile"
-+	fi
-+
-+	# If the file is missing, and there is a .exe on the end, strip it
-+	# because it is most likely a libtool script we actually want to
-+	# install
-+	stripped_ext=""
-+	case $file in
-+	  *.exe)
-+	    if test ! -f "$file"; then
-+	      func_stripname '' '.exe' "$file"
-+	      file=$func_stripname_result
-+	      stripped_ext=".exe"
-+	    fi
-+	    ;;
- 	esac
--      fi
++    if test -n "$libs"; then
++      if test -n "$lt_sysroot"; then
++        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
++        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
++      else
++        sysroot_cmd=
+       fi
 -      if test "$pass" = dlopen; then
 -	# Collect dlpreopened libraries
 -	save_deplibs="$deplibs"
 -	deplibs=
--      fi
++
++      # Remove sysroot references
++      if $opt_dry_run; then
++        for lib in $libs; do
++          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
++        done
++      else
++        tmpdir=`func_mktempdir`
++        for lib in $libs; do
++	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
++	    > $tmpdir/tmp-la
++	  mv -f $tmpdir/tmp-la $lib
++	done
++        ${RM}r "$tmpdir"
+       fi
 -      for deplib in $libs; do
 -	lib=
 -	found=no
@@ -22903,7 +22681,7 @@
 -	    compile_deplibs="$deplib $compile_deplibs"
 -	    finalize_deplibs="$deplib $finalize_deplibs"
 -	  else
--	    deplibs="$deplib $deplibs"
+-	    compiler_flags="$compiler_flags $deplib"
 -	  fi
 -	  continue
 -	  ;;
@@ -22912,13 +22690,9 @@
 -	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
 -	    continue
 -	  fi
--	  if test "$pass" = conv; then
--	    deplibs="$deplib $deplibs"
--	    continue
--	  fi
 -	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
 -	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
--	    for search_ext in .la $shrext .so .a; do
+-	    for search_ext in .la $std_shrext .so .a; do
 -	      # Search the libtool library
 -	      lib="$searchdir/lib${name}${search_ext}"
 -	      if test -f "$lib"; then
@@ -22994,21 +22768,12 @@
 -	    fi
 -	    if test "$pass" = scan; then
 -	      deplibs="$deplib $deplibs"
--	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-+
-+	# Do a test to see if this is really a libtool program.
-+	case $host in
-+	*cygwin* | *mingw*)
-+	    if func_ltwrapper_executable_p "$file"; then
-+	      func_ltwrapper_scriptname "$file"
-+	      wrapper=$func_ltwrapper_scriptname_result
- 	    else
+-	    else
 -	      compile_deplibs="$deplib $compile_deplibs"
 -	      finalize_deplibs="$deplib $finalize_deplibs"
-+	      func_stripname '' '.exe' "$file"
-+	      wrapper=$func_stripname_result
- 	    fi
- 	    ;;
+-	    fi
+-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+-	    ;;
 -	  *)
 -	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
 -	    ;;
@@ -23035,7 +22800,22 @@
 -	  fi
 -	  case $linkmode in
 -	  lib)
--	    if test "$deplibs_check_method" != pass_all; then
+-	    valid_a_lib=no
+-	    case $deplibs_check_method in
+-	      match_pattern*)
+-		set dummy $deplibs_check_method
+-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+-		if eval $echo \"$deplib\" 2>/dev/null \
+-		    | $SED 10q \
+-		    | $EGREP "$match_pattern_regex" > /dev/null; then
+-		  valid_a_lib=yes
+-		fi
+-		;;
+-	      pass_all)
+-		valid_a_lib=yes
+-		;;
+-            esac
+-	    if test "$valid_a_lib" != yes; then
 -	      $echo
 -	      $echo "*** Warning: Trying to link with static lib archive $deplib."
 -	      $echo "*** I have the capability to make that library automatically link in when"
@@ -23050,33 +22830,14 @@
 -	      deplibs="$deplib $deplibs"
 -	    fi
 -	    continue
-+	*)
-+	    wrapper=$file
- 	    ;;
+-	    ;;
 -	  prog)
 -	    if test "$pass" != link; then
 -	      deplibs="$deplib $deplibs"
 -	    else
 -	      compile_deplibs="$deplib $compile_deplibs"
 -	      finalize_deplibs="$deplib $finalize_deplibs"
-+	esac
-+	if func_ltwrapper_script_p "$wrapper"; then
-+	  notinst_deplibs=
-+	  relink_command=
-+
-+	  func_source "$wrapper"
-+
-+	  # Check the variables that should have been set.
-+	  test -z "$generated_by_libtool_version" && \
-+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-+
-+	  finalize=yes
-+	  for lib in $notinst_deplibs; do
-+	    # Check to see that each library is installed.
-+	    libdir=
-+	    if test -f "$lib"; then
-+	      func_source "$lib"
- 	    fi
+-	    fi
 -	    continue
 -	    ;;
 -	  esac # linkmode
@@ -23093,46 +22854,8 @@
 -	      finalize_deplibs="$deplib $finalize_deplibs"
 -	    else
 -	      newdlfiles="$newdlfiles $deplib"
-+	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+	    if test -n "$libdir" && test ! -f "$libfile"; then
-+	      func_warning "\`$lib' has not been installed in \`$libdir'"
-+	      finalize=no
- 	    fi
-+	  done
-+
-+	  relink_command=
-+	  func_source "$wrapper"
-+
-+	  outputname=
-+	  if test "$fast_install" = no && test -n "$relink_command"; then
-+	    $opt_dry_run || {
-+	      if test "$finalize" = yes; then
-+	        tmpdir=`func_mktempdir`
-+		func_basename "$file$stripped_ext"
-+		file="$func_basename_result"
-+	        outputname="$tmpdir/$file"
-+	        # Replace the output file specification.
-+	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+
-+	        $opt_silent || {
-+	          func_quote_for_expand "$relink_command"
-+		  eval "func_echo $func_quote_for_expand_result"
-+	        }
-+	        if eval "$relink_command"; then :
-+	          else
-+		  func_error "error: relink \`$file' with the above command before installing it"
-+		  $opt_dry_run || ${RM}r "$tmpdir"
-+		  continue
-+	        fi
-+	        file="$outputname"
-+	      else
-+	        func_warning "cannot relink \`$file'"
-+	      fi
-+	    }
-+	  else
-+	    # Install the binary that we compiled earlier.
-+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
- 	  fi
+-	    fi
+-	  fi
 -	  continue
 -	  ;;
 -	%DEPLIBS%)
@@ -23142,46 +22865,36 @@
 -	esac # case $deplib
 -	if test "$found" = yes || test -f "$lib"; then :
 -	else
--	  $echo "$modename: cannot find the library \`$lib'" 1>&2
--	  exit 1
- 	fi
+-	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
+-	  exit $EXIT_FAILURE
+-	fi
++    fi
  
 -	# Check to see that this really is a libtool archive.
 -	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
 -	else
 -	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--	  exit 1
-+	# remove .exe since cygwin /usr/bin/install will append another
-+	# one anyway
-+	case $install_prog,$host in
-+	*/usr/bin/install*,*cygwin*)
-+	  case $file:$destfile in
-+	  *.exe:*.exe)
-+	    # this is ok
-+	    ;;
-+	  *.exe:*)
-+	    destfile=$destfile.exe
-+	    ;;
-+	  *:*.exe)
-+	    func_stripname '' '.exe' "$destfile"
-+	    destfile=$func_stripname_result
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-+	$opt_dry_run || if test -n "$outputname"; then
-+	  ${RM}r "$tmpdir"
+-	  exit $EXIT_FAILURE
++    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
++      for libdir in $libdirs; do
++	if test -n "$finish_cmds"; then
++	  # Do each command in the finish commands.
++	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
++'"$cmd"'"'
++	fi
++	if test -n "$finish_eval"; then
++	  # Do the single finish_eval.
++	  eval cmds=\"$finish_eval\"
++	  $opt_dry_run || eval "$cmds" || func_append admincmds "
++       $cmds"
  	fi
-+	;;
-+      esac
-+    done
++      done
++    fi
  
 -	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
 -	test "X$ladir" = "X$lib" && ladir="."
-+    for file in $staticlibs; do
-+      func_basename "$file"
-+      name="$func_basename_result"
++    # Exit here if they wanted silent mode.
++    $opt_silent && exit $EXIT_SUCCESS
  
 -	dlname=
 -	dlopen=
@@ -23193,15 +22906,59 @@
 -	# it will not redefine variables installed, or shouldnotlink
 -	installed=yes
 -	shouldnotlink=no
-+      # Set up the ranlib parameters.
-+      oldlib="$destdir/$name"
+-	avoidtemprpath=
++    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
++      echo "----------------------------------------------------------------------"
++      echo "Libraries have been installed in:"
++      for libdir in $libdirs; do
++	$ECHO "   $libdir"
++      done
++      echo
++      echo "If you ever happen to want to link against installed libraries"
++      echo "in a given directory, LIBDIR, you must either use libtool, and"
++      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
++      echo "flag during linking and do at least one of the following:"
++      if test -n "$shlibpath_var"; then
++	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
++	echo "     during execution"
++      fi
++      if test -n "$runpath_var"; then
++	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
++	echo "     during linking"
++      fi
++      if test -n "$hardcode_libdir_flag_spec"; then
++	libdir=LIBDIR
++	eval flag=\"$hardcode_libdir_flag_spec\"
+ 
++	$ECHO "   - use the \`$flag' linker flag"
++      fi
++      if test -n "$admincmds"; then
++	$ECHO "   - have your system administrator run these commands:$admincmds"
++      fi
++      if test -f /etc/ld.so.conf; then
++	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++      fi
++      echo
  
 -	# Read the .la file
 -	case $lib in
 -	*/* | *\\*) . $lib ;;
 -	*) . ./$lib ;;
 -	esac
-+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
++      echo "See any operating system documentation about shared libraries for"
++      case $host in
++	solaris2.[6789]|solaris2.1[0-9])
++	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
++	  echo "pages."
++	  ;;
++	*)
++	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
++	  ;;
++      esac
++      echo "----------------------------------------------------------------------"
++    fi
++    exit $EXIT_SUCCESS
++}
  
 -	if test "$linkmode,$pass" = "lib,link" ||
 -	   test "$linkmode,$pass" = "prog,scan" ||
@@ -23209,9 +22966,7 @@
 -	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
 -	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
 -	fi
-+      if test -n "$stripme" && test -n "$old_striplib"; then
-+	func_show_eval "$old_striplib $oldlib" 'exit $?'
-+      fi
++test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
  
 -	if test "$pass" = conv; then
 -	  # Only check for convenience libraries
@@ -23219,7 +22974,7 @@
 -	  if test -z "$libdir"; then
 -	    if test -z "$old_library"; then
 -	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
--	      exit 1
+-	      exit $EXIT_FAILURE
 -	    fi
 -	    # It is a libtool convenience library, so add in its objects.
 -	    convenience="$convenience $ladir/$objdir/$old_library"
@@ -23236,15 +22991,30 @@
 -	    done
 -	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 -	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
--	    exit 1
+-	    exit $EXIT_FAILURE
 -	  fi
 -	  continue
 -	fi # $pass = conv
-+      # Do each command in the postinstall commands.
-+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-+    done
  
--    
++# func_mode_install arg...
++func_mode_install ()
++{
++    $opt_debug
++    # There may be an optional sh(1) argument at the beginning of
++    # install_prog (especially on Windows NT).
++    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
++       # Allow the use of GNU shtool's install command.
++       case $nonopt in *shtool*) :;; *) false;; esac; then
++      # Aesthetically quote it.
++      func_quote_for_eval "$nonopt"
++      install_prog="$func_quote_for_eval_result "
++      arg=$1
++      shift
++    else
++      install_prog=
++      arg=$nonopt
++    fi
+ 
 -	# Get the name of the library we link against.
 -	linklib=
 -	for l in $old_library $library_names; do
@@ -23252,18 +23022,27 @@
 -	done
 -	if test -z "$linklib"; then
 -	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	fi
-+    test -n "$future_libdirs" && \
-+      func_warning "remember to run \`$progname --finish$future_libdirs'"
++    # The real first argument should be the name of the installation program.
++    # Aesthetically quote it.
++    func_quote_for_eval "$arg"
++    func_append install_prog "$func_quote_for_eval_result"
++    install_shared_prog=$install_prog
++    case " $install_prog " in
++      *[\\\ /]cp\ *) install_cp=: ;;
++      *) install_cp=false ;;
++    esac
  
 -	# This library was specified with -dlopen.
 -	if test "$pass" = dlopen; then
 -	  if test -z "$libdir"; then
 -	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
--	    exit 1
+-	    exit $EXIT_FAILURE
 -	  fi
--	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+-	  if test -z "$dlname" ||
+-	     test "$dlopen_support" != yes ||
+-	     test "$build_libtool_libs" = no; then
 -	    # If there is no dlname, no dlopen support or we're linking
 -	    # statically, we need to preload.  We also need to preload any
 -	    # dependent libraries so libltdl's deplib preloader doesn't
@@ -23274,14 +23053,23 @@
 -	  fi
 -	  continue
 -	fi # $pass = dlopen
-+    if test -n "$current_libdirs"; then
-+      # Maybe just do a dry run.
-+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-+    else
-+      exit $EXIT_SUCCESS
-+    fi
-+}
++    # We need to accept at least all the BSD install flags.
++    dest=
++    files=
++    opts=
++    prev=
++    install_type=
++    isdir=no
++    stripme=
++    no_mode=:
++    for arg
++    do
++      arg2=
++      if test -n "$dest"; then
++	func_append files " $dest"
++	dest=$arg
++	continue
++      fi
  
 -	# We need an absolute path.
 -	case $ladir in
@@ -23292,11 +23080,100 @@
 -	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
 -	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
 -	    abs_ladir="$ladir"
--	  fi
--	  ;;
--	esac
++      case $arg in
++      -d) isdir=yes ;;
++      -f)
++	if $install_cp; then :; else
++	  prev=$arg
++	fi
++	;;
++      -g | -m | -o)
++	prev=$arg
++	;;
++      -s)
++	stripme=" -s"
++	continue
++	;;
++      -*)
++	;;
++      *)
++	# If the previous option needed an argument, then skip it.
++	if test -n "$prev"; then
++	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
++	    arg2=$install_override_mode
++	    no_mode=false
+ 	  fi
++	  prev=
++	else
++	  dest=$arg
++	  continue
++	fi
++	;;
++      esac
++
++      # Aesthetically quote the argument.
++      func_quote_for_eval "$arg"
++      func_append install_prog " $func_quote_for_eval_result"
++      if test -n "$arg2"; then
++	func_quote_for_eval "$arg2"
++      fi
++      func_append install_shared_prog " $func_quote_for_eval_result"
++    done
++
++    test -z "$install_prog" && \
++      func_fatal_help "you must specify an install program"
++
++    test -n "$prev" && \
++      func_fatal_help "the \`$prev' option requires an argument"
++
++    if test -n "$install_override_mode" && $no_mode; then
++      if $install_cp; then :; else
++	func_quote_for_eval "$install_override_mode"
++	func_append install_shared_prog " -m $func_quote_for_eval_result"
++      fi
++    fi
++
++    if test -z "$files"; then
++      if test -z "$dest"; then
++	func_fatal_help "no file or destination specified"
++      else
++	func_fatal_help "you must specify a destination"
++      fi
++    fi
++
++    # Strip any trailing slash from the destination.
++    func_stripname '' '/' "$dest"
++    dest=$func_stripname_result
++
++    # Check to see that the destination is a directory.
++    test -d "$dest" && isdir=yes
++    if test "$isdir" = yes; then
++      destdir="$dest"
++      destname=
++    else
++      func_dirname_and_basename "$dest" "" "."
++      destdir="$func_dirname_result"
++      destname="$func_basename_result"
++
++      # Not a directory, so check to see that there is only one file specified.
++      set dummy $files; shift
++      test "$#" -gt 1 && \
++	func_fatal_help "\`$dest' is not a directory"
++    fi
++    case $destdir in
++    [\\/]* | [A-Za-z]:[\\/]*) ;;
++    *)
++      for file in $files; do
++	case $file in
++	*.lo) ;;
++	*)
++	  func_fatal_help "\`$destdir' must be an absolute directory name"
+ 	  ;;
+ 	esac
 -	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+test "$mode" = install && func_mode_install ${1+"$@"}
++      done
++      ;;
++    esac
  
 -	# Find the relevant object directory and library name.
 -	if test "X$installed" = Xyes; then
@@ -23309,19 +23186,30 @@
 -	    dir="$libdir"
 -	    absdir="$libdir"
 -	  fi
+-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 -	else
--	  dir="$ladir/$objdir"
--	  absdir="$abs_ladir/$objdir"
--	  # Remove this search path later
--	  notinst_path="$notinst_path $abs_ladir"
+-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+-	    dir="$ladir"
+-	    absdir="$abs_ladir"
+-	    # Remove this search path later
+-	    notinst_path="$notinst_path $abs_ladir"
+-	  else
+-	    dir="$ladir/$objdir"
+-	    absdir="$abs_ladir/$objdir"
+-	    # Remove this search path later
+-	    notinst_path="$notinst_path $abs_ladir"
+-	  fi
 -	fi # $installed = yes
 -	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++    # This variable tells wrapper scripts just to set variables rather
++    # than running their programs.
++    libtool_install_magic="$magic"
  
 -	# This library was specified with -dlpreopen.
 -	if test "$pass" = dlpreopen; then
 -	  if test -z "$libdir"; then
 -	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
--	    exit 1
+-	    exit $EXIT_FAILURE
 -	  fi
 -	  # Prefer using a static library (so that no silly _DYNAMIC symbols
 -	  # are required to link).
@@ -23334,25 +23222,10 @@
 -	    newdlprefiles="$newdlprefiles $dir/$linklib"
 -	  fi
 -	fi # $pass = dlpreopen
-+# func_generate_dlsyms outputname originator pic_p
-+# Extract symbols from dlprefiles and create ${outputname}S.o with
-+# a dlpreopen symbol table.
-+func_generate_dlsyms ()
-+{
-+    $opt_debug
-+    my_outputname="$1"
-+    my_originator="$2"
-+    my_pic_p="${3-no}"
-+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-+    my_dlsyms=
-+
-+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-+	my_dlsyms="${my_outputname}S.c"
-+      else
-+	func_error "not configured to extract global symbols from dlpreopened files"
-+      fi
-+    fi
++    staticlibs=
++    future_libdirs=
++    current_libdirs=
++    for file in $files; do
  
 -	if test -z "$libdir"; then
 -	  # Link the convenience library
@@ -23365,33 +23238,76 @@
 -	    deplibs="$lib $deplibs" # used for prog,scan pass
 -	  fi
 -	  continue
--	fi
-+    if test -n "$my_dlsyms"; then
-+      case $my_dlsyms in
-+      "") ;;
-+      *.c)
-+	# Discover the nlist of each of the dlfiles.
-+	nlist="$output_objdir/${my_outputname}.nm"
++      # Do each installation.
++      case $file in
++      *.$libext)
++	# Do the static libraries later.
++	func_append staticlibs " $file"
++	;;
++
++      *.la)
++	func_resolve_sysroot "$file"
++	file=$func_resolve_sysroot_result
++
++	# Check to see that this really is a libtool archive.
++	func_lalib_unsafe_p "$file" \
++	  || func_fatal_help "\`$file' is not a valid libtool archive"
++
++	library_names=
++	old_library=
++	relink_command=
++	func_source "$file"
++
++	# Add the libdir to current_libdirs if it is the destination.
++	if test "X$destdir" = "X$libdir"; then
++	  case "$current_libdirs " in
++	  *" $libdir "*) ;;
++	  *) func_append current_libdirs " $libdir" ;;
++	  esac
++	else
++	  # Note the libdir as a future libdir.
++	  case "$future_libdirs " in
++	  *" $libdir "*) ;;
++	  *) func_append future_libdirs " $libdir" ;;
++	  esac
+ 	fi
+ 
++	func_dirname "$file" "/" ""
++	dir="$func_dirname_result"
++	func_append dir "$objdir"
  
--    
 -	if test "$linkmode" = prog && test "$pass" != link; then
 -	  newlib_search_path="$newlib_search_path $ladir"
 -	  deplibs="$lib $deplibs"
-+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
++	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
  
 -	  linkalldeplibs=no
 -	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
 -	     test "$build_libtool_libs" = no; then
 -	    linkalldeplibs=yes
--	  fi
-+	# Parse the name list into a source file.
-+	func_verbose "creating $output_objdir/$my_dlsyms"
- 
--	  tmp_libs=
--	  for deplib in $dependency_libs; do
--	    case $deplib in
--	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
--	    esac
++	  # Don't allow the user to place us outside of our expected
++	  # location b/c this prevents finding dependent libraries that
++	  # are installed to the same prefix.
++	  # At present, this check doesn't affect windows .dll's that
++	  # are installed into $libdir/../bin (currently, that works fine)
++	  # but it's something to keep an eye on.
++	  test "$inst_prefix_dir" = "$destdir" && \
++	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++
++	  if test -n "$inst_prefix_dir"; then
++	    # Stick the inst_prefix_dir data into the link command.
++	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	  else
++	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ 	  fi
+ 
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    case $deplib in
+-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+-	    esac
 -	    # Need to link against all dependency_libs?
 -	    if test "$linkalldeplibs" = yes; then
 -	      deplibs="$deplib $deplibs"
@@ -23409,25 +23325,30 @@
 -	  done # for deplib
 -	  continue
 -	fi # $linkmode = prog...
-+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
++	  func_warning "relinking \`$file'"
++	  func_show_eval "$relink_command" \
++	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
++	fi
  
 -	if test "$linkmode,$pass" = "prog,link"; then
 -	  if test -n "$library_names" &&
--	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+-         { { test "$prefer_static_libs" = no ||
+-             test "$prefer_static_libs,$installed" = "built,yes"; } ||
+-           test -z "$old_library"; }; then
 -	    # We need to hardcode the library path
--	    if test -n "$shlibpath_var"; then
+-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 -	      # Make sure the rpath contains only unique directories.
 -	      case "$temp_rpath " in
 -	      *" $dir "*) ;;
 -	      *" $absdir "*) ;;
--	      *) temp_rpath="$temp_rpath $dir" ;;
+-	      *) temp_rpath="$temp_rpath $absdir" ;;
 -	      esac
 -	    fi
-+#ifdef __cplusplus
-+extern \"C\" {
-+#endif
++	# See the names of the shared library.
++	set dummy $library_names; shift
++	if test -n "$1"; then
++	  realname="$1"
++	  shift
  
 -	    # Hardcode the library path.
 -	    # Skip directories that are in the system default run-time
@@ -23438,47 +23359,7 @@
 -	      case "$compile_rpath " in
 -	      *" $absdir "*) ;;
 -	      *) compile_rpath="$compile_rpath $absdir"
-+/* External symbol declarations for the compiler. */\
-+"
-+
-+	if test "$dlself" = yes; then
-+	  func_verbose "generating symbol list for \`$output'"
-+
-+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-+
-+	  # Add our own program objects to the symbol list.
-+	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	  for progfile in $progfiles; do
-+	    func_verbose "extracting global C symbols from \`$progfile'"
-+	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-+	  done
-+
-+	  if test -n "$exclude_expsyms"; then
-+	    $opt_dry_run || {
-+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-+	      eval '$MV "$nlist"T "$nlist"'
-+	    }
-+	  fi
-+
-+	  if test -n "$export_symbols_regex"; then
-+	    $opt_dry_run || {
-+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-+	      eval '$MV "$nlist"T "$nlist"'
-+	    }
-+	  fi
-+
-+	  # Prepare the list of exported symbols
-+	  if test -z "$export_symbols"; then
-+	    export_symbols="$output_objdir/$outputname.exp"
-+	    $opt_dry_run || {
-+	      $RM $export_symbols
-+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	      case $host in
-+	      *cygwin* | *mingw* | *cegcc* )
-+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-+	        ;;
- 	      esac
+-	      esac
 -	      ;;
 -	    esac
 -	    case " $sys_lib_dlsearch_path " in
@@ -23487,68 +23368,74 @@
 -	      case "$finalize_rpath " in
 -	      *" $libdir "*) ;;
 -	      *) finalize_rpath="$finalize_rpath $libdir"
-+	    }
-+	  else
-+	    $opt_dry_run || {
-+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-+	      eval '$MV "$nlist"T "$nlist"'
-+	      case $host in
-+	        *cygwin | *mingw* | *cegcc* )
-+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-+	          ;;
- 	      esac
--	      ;;
--	    esac
+-	      esac
++	  srcname="$realname"
++	  test -n "$relink_command" && srcname="$realname"T
++
++	  # Install the shared library and build the symlinks.
++	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
++	      'exit $?'
++	  tstripme="$stripme"
++	  case $host_os in
++	  cygwin* | mingw* | pw32* | cegcc*)
++	    case $realname in
++	    *.dll.a)
++	      tstripme=""
+ 	      ;;
+ 	    esac
 -	  fi # $linkmode,$pass = prog,link...
--
++	    ;;
++	  esac
++	  if test -n "$tstripme" && test -n "$striplib"; then
++	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
++	  fi
+ 
 -	  if test "$alldeplibs" = yes &&
 -	     { test "$deplibs_check_method" = pass_all ||
 -	       { test "$build_libtool_libs" = yes &&
 -		 test -n "$library_names"; }; }; then
 -	    # We only need to search for static libraries
 -	    continue
-+	    }
++	  if test "$#" -gt 0; then
++	    # Delete the old symlinks, and create new ones.
++	    # Try `ln -sf' first, because the `ln' binary might depend on
++	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
++	    # so we also need to try rm && ln -s.
++	    for linkname
++	    do
++	      test "$linkname" != "$realname" \
++		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
++	    done
  	  fi
- 	fi
+-	fi
  
 -	link_static=no # Whether the deplib will be linked statically
+-	use_static_libs=$prefer_static_libs
+-	if test "$use_static_libs" = built && test "$installed" = yes ; then
+-	  use_static_libs=no
++	  # Do each command in the postinstall commands.
++	  lib="$destdir/$realname"
++	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+ 	fi
 -	if test -n "$library_names" &&
--	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
 -	  if test "$installed" = no; then
 -	    notinst_deplibs="$notinst_deplibs $lib"
 -	    need_relink=yes
-+	for dlprefile in $dlprefiles; do
-+	  func_verbose "extracting global C symbols from \`$dlprefile'"
-+	  func_basename "$dlprefile"
-+	  name="$func_basename_result"
-+	  $opt_dry_run || {
-+	    eval '$ECHO ": $name " >> "$nlist"'
-+	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-+	  }
-+	done
-+
-+	$opt_dry_run || {
-+	  # Make sure we have at least an empty file.
-+	  test -f "$nlist" || : > "$nlist"
-+
-+	  if test -n "$exclude_expsyms"; then
-+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-+	    $MV "$nlist"T "$nlist"
- 	  fi
+-	  fi
 -	  # This is a shared library
--	
--      # Warn about portability, can't link against -module's on some systems (darwin)
--      if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ 
+-	  # Warn about portability, can't link against -module's on
+-	  # some systems (darwin)
+-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
 -	    $echo
 -	    if test "$linkmode" = prog; then
 -	      $echo "*** Warning: Linking the executable $output against the loadable module"
 -	    else
 -	      $echo "*** Warning: Linking the shared library $output against the loadable module"
 -	    fi
--	    $echo "*** $linklib is not portable!"    
--      fi	  
+-	    $echo "*** $linklib is not portable!"
+-	  fi
 -	  if test "$linkmode" = lib &&
 -	     test "$hardcode_into_libs" = yes; then
 -	    # Hardcode the library path.
@@ -23572,19 +23459,12 @@
 -	      esac
 -	      ;;
 -	    esac
-+
-+	  # Try sorting and uniquifying the output.
-+	  if $GREP -v "^: " < "$nlist" |
-+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-+		sort -k 3
-+	      else
-+		sort +2
-+	      fi |
-+	      uniq > "$nlist"S; then
-+	    :
-+	  else
-+	    $GREP -v "^: " < "$nlist" > "$nlist"S
- 	  fi
+-	  fi
++	# Install the pseudo-library for information purposes.
++	func_basename "$file"
++	name="$func_basename_result"
++	instname="$dir/$name"i
++	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
  
 -	  if test -n "$old_archive_from_expsyms_cmds"; then
 -	    # figure out the soname
@@ -23607,17 +23487,16 @@
 -	    else
 -	      soname="$realname"
 -	    fi
-+	  if test -f "$nlist"S; then
-+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-+	  else
-+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
-+	  fi
++	# Maybe install the static library, too.
++	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
++	;;
  
 -	    # Make a new name for the extract_expsyms_cmds to use
 -	    soroot="$soname"
 -	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
 -	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
++      *.lo)
++	# Install (i.e. copy) a libtool object.
  
 -	    # If the library has no export list, then create one now
 -	    if test -f "$output_objdir/$soname-def"; then :
@@ -23633,26 +23512,14 @@
 -	      done
 -	      IFS="$save_ifs"
 -	    fi
-+/* The mapping between symbol names and symbols.  */
-+typedef struct {
-+  const char *name;
-+  void *address;
-+} lt_dlsymlist;
-+"
-+	  case $host in
-+	  *cygwin* | *mingw* | *cegcc* )
-+	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-+/* DATA imports from DLLs on WIN32 con't be const, because
-+   runtime relocations are performed -- see ld's documentation
-+   on pseudo-relocs.  */"
-+	    lt_dlsym_const= ;;
-+	  *osf5*)
-+	    echo >> "$output_objdir/$my_dlsyms" "\
-+/* This system does not cope well with relocations in const data */"
-+	    lt_dlsym_const= ;;
-+	  *)
-+	    lt_dlsym_const=const ;;
-+	  esac
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  func_basename "$file"
++	  destfile="$func_basename_result"
++	  destfile="$destdir/$destfile"
++	fi
  
 -	    # Create $newlib
 -	    if test -f "$output_objdir/$newlib"; then :; else
@@ -23666,72 +23533,25 @@
 -		$run eval "$cmd" || exit $?
 -	      done
 -	      IFS="$save_ifs"
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+extern $lt_dlsym_const lt_dlsymlist
-+lt_${my_prefix}_LTX_preloaded_symbols[];
-+$lt_dlsym_const lt_dlsymlist
-+lt_${my_prefix}_LTX_preloaded_symbols[] =
-+{\
-+  { \"$my_originator\", (void *) 0 },"
-+
-+	  case $need_lib_prefix in
-+	  no)
-+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-+	    ;;
-+	  *)
-+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-+	    ;;
-+	  esac
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+  {0, (void *) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt_${my_prefix}_LTX_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif\
-+"
-+	} # !$opt_dry_run
-+
-+	pic_flag_for_symtable=
-+	case "$compile_command " in
-+	*" -static "*) ;;
-+	*)
-+	  case $host in
-+	  # compiling the symbol table file with pic_flag works around
-+	  # a FreeBSD bug that causes programs to crash when -lm is
-+	  # linked before any other PIC object.  But we must not use
-+	  # pic_flag when linking with -static.  The problem exists in
-+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-+	  *-*-hpux*)
-+	    pic_flag_for_symtable=" $pic_flag"  ;;
-+	  *)
-+	    if test "X$my_pic_p" != Xno; then
-+	      pic_flag_for_symtable=" $pic_flag"
- 	    fi
+-	    fi
 -	    # make sure the library variables are pointing to the new library
 -	    dir=$output_objdir
 -	    linklib=$newlib
 -	  fi # test -n "$old_archive_from_expsyms_cmds"
-+	    ;;
-+	  esac
++	# Deduce the name of the destination old-style object file.
++	case $destfile in
++	*.lo)
++	  func_lo2o "$destfile"
++	  staticdest=$func_lo2o_result
++	  ;;
++	*.$objext)
++	  staticdest="$destfile"
++	  destfile=
++	  ;;
++	*)
++	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
 +	  ;;
 +	esac
-+	symtab_cflags=
-+	for arg in $LTCFLAGS; do
-+	  case $arg in
-+	  -pie | -fpie | -fPIE) ;;
-+	  *) symtab_cflags="$symtab_cflags $arg" ;;
-+	  esac
-+	done
  
 -	  if test "$linkmode" = prog || test "$mode" != relink; then
 -	    add_shlibpath=
@@ -23743,11 +23563,15 @@
 -	      if test "$hardcode_direct" = no; then
 -		add="$dir/$linklib"
 -		case $host in
--		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+-		    *-*-unixware7*) add_dir="-L$dir" ;;
 -		  *-*-darwin* )
--		    # if the lib is a module then we can not link against it, someone
--		    # is ignoring the new warnings I added
--		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
+-		    # if the lib is a module then we can not link against
+-		    # it, someone is ignoring the new warnings I added
+-		    if /usr/bin/file -L $add 2> /dev/null |
+-                      $EGREP ": [^:]* bundle" >/dev/null ; then
 -		      $echo "** Warning, lib $linklib is a module, not a shared library"
 -		      if test -z "$old_library" ; then
 -		        $echo
@@ -23755,7 +23579,7 @@
 -		        $echo "** The link will probably fail, sorry"
 -		      else
 -		        add="$dir/$old_library"
--		      fi 
+-		      fi
 -		    fi
 -		esac
 -	      elif test "$hardcode_minus_L" = no; then
@@ -23778,7 +23602,7 @@
 -		add_dir="-L$dir"
 -		# Try looking first in the location we're being installed to.
 -		if test -n "$inst_prefix_dir"; then
--		  case "$libdir" in
+-		  case $libdir in
 -		    [\\/]*)
 -		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
 -		      ;;
@@ -23794,15 +23618,23 @@
 -	      ;;
 -	    *) lib_linked=no ;;
 -	    esac
-+	# Now compile the dynamic symbol file.
-+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
++	# Install the libtool object if requested.
++	test -n "$destfile" && \
++	  func_show_eval "$install_prog $file $destfile" 'exit $?'
  
 -	    if test "$lib_linked" != yes; then
 -	      $echo "$modename: configuration error: unsupported hardcode properties"
--	      exit 1
+-	      exit $EXIT_FAILURE
 -	    fi
-+	# Clean up the generated files.
-+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
++	# Install the old object if enabled.
++	if test "$build_old_libs" = yes; then
++	  # Deduce the name of the old-style object file.
++	  func_lo2o "$file"
++	  staticobj=$func_lo2o_result
++	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
++	fi
++	exit $EXIT_SUCCESS
++	;;
  
 -	    if test -n "$add_shlibpath"; then
 -	      case :$compile_shlibpath: in
@@ -23824,39 +23656,30 @@
 -		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
 -		esac
 -	      fi
--	    fi
-+	# Transform the symbol file into the correct name.
-+	symfileobj="$output_objdir/${my_outputname}S.$objext"
-+	case $host in
-+	*cygwin* | *mingw* | *cegcc* )
-+	  if test -f "$output_objdir/$my_outputname.def"; then
-+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	  else
-+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- 	  fi
-+	  ;;
-+	*)
-+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  ;;
-+	esac
-+	;;
 +      *)
-+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-+	;;
-+      esac
-+    else
-+      # We keep going just in case the user didn't refer to
-+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-+      # really was required.
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  func_basename "$file"
++	  destfile="$func_basename_result"
++	  destfile="$destdir/$destfile"
++	fi
 +
-+      # Nullify the symbol file.
-+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+    fi
-+}
++	# If the file is missing, and there is a .exe on the end, strip it
++	# because it is most likely a libtool script we actually want to
++	# install
++	stripped_ext=""
++	case $file in
++	  *.exe)
++	    if test ! -f "$file"; then
++	      func_stripname '' '.exe' "$file"
++	      file=$func_stripname_result
++	      stripped_ext=".exe"
+ 	    fi
+-	  fi
++	    ;;
++	esac
  
 -	  if test "$linkmode" = prog || test "$mode" = relink; then
 -	    add_shlibpath=
@@ -23875,70 +23698,41 @@
 -	      esac
 -	      add="-l$name"
 -	    elif test "$hardcode_automatic" = yes; then
--	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
+-	      if test -n "$inst_prefix_dir" &&
+-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
 -	        add="$inst_prefix_dir$libdir/$linklib"
 -	      else
 -	        add="$libdir/$linklib"
 -	      fi
--	    else
++	# Do a test to see if this is really a libtool program.
++	case $host in
++	*cygwin* | *mingw*)
++	    if func_ltwrapper_executable_p "$file"; then
++	      func_ltwrapper_scriptname "$file"
++	      wrapper=$func_ltwrapper_scriptname_result
+ 	    else
 -	      # We cannot seem to hardcode it, guess we'll fake it.
 -	      add_dir="-L$libdir"
 -	      # Try looking first in the location we're being installed to.
 -	      if test -n "$inst_prefix_dir"; then
--		case "$libdir" in
+-		case $libdir in
 -		  [\\/]*)
 -		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
 -		    ;;
 -		esac
 -	      fi
 -	      add="-l$name"
--	    fi
-+# func_win32_libid arg
-+# return the library type of file 'arg'
-+#
-+# Need a lot of goo to handle *both* DLLs and import libs
-+# Has to be a shell function in order to 'eat' the argument
-+# that is supplied when $file_magic_command is called.
-+func_win32_libid ()
-+{
-+  $opt_debug
-+  win32_libid_type="unknown"
-+  win32_fileres=`file -L $1 2>/dev/null`
-+  case $win32_fileres in
-+  *ar\ archive\ import\ library*) # definitely import
-+    win32_libid_type="x86 archive import"
-+    ;;
-+  *ar\ archive*) # could be an import, or static
-+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-+      win32_nmres=`eval $NM -f posix -A $1 |
-+	$SED -n -e '
-+	    1,100{
-+		/ I /{
-+		    s,.*,import,
-+		    p
-+		    q
-+		}
-+	    }'`
-+      case $win32_nmres in
-+      import*)  win32_libid_type="x86 archive import";;
-+      *)        win32_libid_type="x86 archive static";;
-+      esac
-+    fi
-+    ;;
-+  *DLL*)
-+    win32_libid_type="x86 DLL"
-+    ;;
-+  *executable*) # but shell scripts are "executable" too...
-+    case $win32_fileres in
-+    *MS\ Windows\ PE\ Intel*)
-+      win32_libid_type="x86 DLL"
-+      ;;
-+    esac
-+    ;;
-+  esac
-+  $ECHO "$win32_libid_type"
-+}
++	      func_stripname '' '.exe' "$file"
++	      wrapper=$func_stripname_result
+ 	    fi
++	    ;;
++	*)
++	    wrapper=$file
++	    ;;
++	esac
++	if func_ltwrapper_script_p "$wrapper"; then
++	  notinst_deplibs=
++	  relink_command=
  
 -	    if test "$linkmode" = prog; then
 -	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
@@ -23946,7 +23740,19 @@
 -	    else
 -	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 -	      test -n "$add" && deplibs="$add $deplibs"
--	    fi
++	  func_source "$wrapper"
++
++	  # Check the variables that should have been set.
++	  test -z "$generated_by_libtool_version" && \
++	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
++
++	  finalize=yes
++	  for lib in $notinst_deplibs; do
++	    # Check to see that each library is installed.
++	    libdir=
++	    if test -f "$lib"; then
++	      func_source "$lib"
+ 	    fi
 -	  fi
 -	elif test "$linkmode" = prog; then
 -	  # Here we assume that one of hardcode_direct or hardcode_minus_L
@@ -23965,6 +23771,12 @@
 -	  if test "$deplibs_check_method" != pass_all; then
 -	    # We're trying link a shared library against a static one
 -	    # but the system doesn't support it.
++	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
++	    if test -n "$libdir" && test ! -f "$libfile"; then
++	      func_warning "\`$lib' has not been installed in \`$libdir'"
++	      finalize=no
++	    fi
++	  done
  
 -	    # Just print a warning and add the library to dependency_libs so
 -	    # that the program can be linked against the static library.
@@ -23987,115 +23799,50 @@
 -	      if test "$build_old_libs" = no; then
 -		build_libtool_libs=module
 -		build_old_libs=yes
--	      else
--		build_libtool_libs=no
--	      fi
--	    fi
-+
-+# func_extract_an_archive dir oldlib
-+func_extract_an_archive ()
-+{
-+    $opt_debug
-+    f_ex_an_ar_dir="$1"; shift
-+    f_ex_an_ar_oldlib="$1"
-+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
-+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-+     :
-+    else
-+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-+    fi
-+}
-+
-+
-+# func_extract_archives gentop oldlib ...
-+func_extract_archives ()
-+{
-+    $opt_debug
-+    my_gentop="$1"; shift
-+    my_oldlibs=${1+"$@"}
-+    my_oldobjs=""
-+    my_xlib=""
-+    my_xabs=""
-+    my_xdir=""
-+
-+    for my_xlib in $my_oldlibs; do
-+      # Extract the objects.
-+      case $my_xlib in
-+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-+	*) my_xabs=`pwd`"/$my_xlib" ;;
-+      esac
-+      func_basename "$my_xlib"
-+      my_xlib="$func_basename_result"
-+      my_xlib_u=$my_xlib
-+      while :; do
-+        case " $extracted_archives " in
-+	*" $my_xlib_u "*)
-+	  func_arith $extracted_serial + 1
-+	  extracted_serial=$func_arith_result
-+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-+	*) break ;;
-+	esac
-+      done
-+      extracted_archives="$extracted_archives $my_xlib_u"
-+      my_xdir="$my_gentop/$my_xlib_u"
++	  relink_command=
++	  func_source "$wrapper"
 +
-+      func_mkdir_p "$my_xdir"
++	  outputname=
++	  if test "$fast_install" = no && test -n "$relink_command"; then
++	    $opt_dry_run || {
++	      if test "$finalize" = yes; then
++	        tmpdir=`func_mktempdir`
++		func_basename "$file$stripped_ext"
++		file="$func_basename_result"
++	        outputname="$tmpdir/$file"
++	        # Replace the output file specification.
++	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 +
-+      case $host in
-+      *-darwin*)
-+	func_verbose "Extracting $my_xabs"
-+	# Do not bother doing anything if just a dry run
-+	$opt_dry_run || {
-+	  darwin_orig_dir=`pwd`
-+	  cd $my_xdir || exit $?
-+	  darwin_archive=$my_xabs
-+	  darwin_curdir=`pwd`
-+	  darwin_base_archive=`basename "$darwin_archive"`
-+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-+	  if test -n "$darwin_arches"; then
-+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-+	    darwin_arch=
-+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-+	    for darwin_arch in  $darwin_arches ; do
-+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-+	      cd "$darwin_curdir"
-+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-+	    done # $darwin_arches
-+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-+	    darwin_file=
-+	    darwin_files=
-+	    for darwin_file in $darwin_filelist; do
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+	      $LIPO -create -output "$darwin_file" $darwin_files
-+	    done # $darwin_filelist
-+	    $RM -rf unfat-$$
-+	    cd "$darwin_orig_dir"
++	        $opt_silent || {
++	          func_quote_for_expand "$relink_command"
++		  eval "func_echo $func_quote_for_expand_result"
++	        }
++	        if eval "$relink_command"; then :
++	          else
++		  func_error "error: relink \`$file' with the above command before installing it"
++		  $opt_dry_run || ${RM}r "$tmpdir"
++		  continue
++	        fi
++	        file="$outputname"
+ 	      else
+-		build_libtool_libs=no
++	        func_warning "cannot relink \`$file'"
+ 	      fi
+-	    fi
++	    }
  	  else
--	    convenience="$convenience $dir/$old_library"
--	    old_convenience="$old_convenience $dir/$old_library"
 -	    deplibs="$dir/$old_library $deplibs"
 -	    link_static=yes
--	  fi
++	    # Install the binary that we compiled earlier.
++	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+ 	  fi
 -	fi # link shared/static library?
-+	    cd $darwin_orig_dir
-+	    func_extract_an_archive "$my_xdir" "$my_xabs"
-+	  fi # $darwin_arches
-+	} # !$opt_dry_run
-+	;;
-+      *)
-+        func_extract_an_archive "$my_xdir" "$my_xabs"
-+	;;
-+      esac
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+    done
++	fi
  
 -	if test "$linkmode" = lib; then
 -	  if test -n "$dependency_libs" &&
--	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+-	     { test "$hardcode_into_libs" != yes ||
+-	       test "$build_old_libs" = yes ||
 -	       test "$link_static" = yes; }; then
 -	    # Extract -R from dependency_libs
 -	    temp_deplibs=
@@ -24111,9 +23858,7 @@
 -	    done
 -	    dependency_libs="$temp_deplibs"
 -	  fi
-+    func_extract_archives_result="$my_oldobjs"
-+}
- 
+-
 -	  newlib_search_path="$newlib_search_path $absdir"
 -	  # Link against this library
 -	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
@@ -24128,7 +23873,7 @@
 -	    fi
 -	    tmp_libs="$tmp_libs $deplib"
 -	  done
- 
+-
 -	  if test "$link_all_deplibs" != no; then
 -	    # Add the search paths of all dependency libraries
 -	    for deplib in $dependency_libs; do
@@ -24154,7 +23899,7 @@
 -		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 -		  if test -z "$libdir"; then
 -		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
--		    exit 1
+-		    exit $EXIT_FAILURE
 -		  fi
 -		  if test "$absdir" != "$libdir"; then
 -		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
@@ -24164,7 +23909,8 @@
 -		depdepl=
 -		case $host in
 -		*-*-darwin*)
--		  # we do not want to link against static libs, but need to link against shared
+-		  # we do not want to link against static libs,
+-		  # but need to link against shared
 -		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
 -		  if test -n "$deplibrary_names" ; then
 -		    for tmp in $deplibrary_names ; do
@@ -24172,7 +23918,7 @@
 -		    done
 -		    if test -f "$path/$depdepl" ; then
 -		      depdepl="$path/$depdepl"
--		   fi
+-		    fi
 -		    # do not add paths which are already there
 -		    case " $newlib_search_path " in
 -		    *" $path "*) ;;
@@ -24182,36 +23928,35 @@
 -		  path=""
 -		  ;;
 -		*)
--		path="-L$path"
--		;;
--		esac 
--		
+-		  path="-L$path"
+-		  ;;
+-		esac
 -		;;
--		  -l*)
+-	      -l*)
 -		case $host in
 -		*-*-darwin*)
--		 # Again, we only want to link against shared libraries
--		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
--		 for tmp in $newlib_search_path ; do
--		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
--		       eval depdepl="$tmp/lib$tmp_libs.dylib"
--		       break
--		     fi  
--         done
--         path=""
+-		  # Again, we only want to link against shared libraries
+-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+-		  for tmp in $newlib_search_path ; do
+-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
+-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
+-		      break
+-		    fi
+-		  done
+-		  path=""
 -		  ;;
 -		*) continue ;;
--		esac  		  
+-		esac
 -		;;
 -	      *) continue ;;
 -	      esac
 -	      case " $deplibs " in
--	      *" $depdepl "*) ;;
--	      *) deplibs="$deplibs $depdepl" ;;
--	      esac	      
--	      case " $deplibs " in
 -	      *" $path "*) ;;
--	      *) deplibs="$deplibs $path" ;;
+-	      *) deplibs="$path $deplibs" ;;
+-	      esac
+-	      case " $deplibs " in
+-	      *" $depdepl "*) ;;
+-	      *) deplibs="$depdepl $deplibs" ;;
 -	      esac
 -	    done
 -	  fi # link_all_deplibs != no
@@ -24236,7 +23981,7 @@
 -	  done
 -	  newlib_search_path=
 -	fi
- 
+-
 -	if test "$linkmode,$pass" != "prog,link"; then
 -	  vars="deplibs"
 -	else
@@ -24298,26 +24043,36 @@
 -	  eval $var=\"$tmp_libs\"
 -	done # for var
 -      fi
--      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
+-      # Last step: remove runtime libs from dependency_libs
+-      # (they stay in deplibs)
 -      tmp_libs=
 -      for i in $dependency_libs ; do
 -	case " $predeps $postdeps $compiler_lib_search_path " in
 -	*" $i "*)
 -	  i=""
--	  ;;
--	esac
++	# remove .exe since cygwin /usr/bin/install will append another
++	# one anyway
++	case $install_prog,$host in
++	*/usr/bin/install*,*cygwin*)
++	  case $file:$destfile in
++	  *.exe:*.exe)
++	    # this is ok
++	    ;;
++	  *.exe:*)
++	    destfile=$destfile.exe
++	    ;;
++	  *:*.exe)
++	    func_stripname '' '.exe' "$destfile"
++	    destfile=$func_stripname_result
++	    ;;
++	  esac
+ 	  ;;
+ 	esac
 -	if test -n "$i" ; then
 -	  tmp_libs="$tmp_libs $i"
-+# func_emit_wrapper_part1 [arg=no]
-+#
-+# Emit the first part of a libtool wrapper script on stdout.
-+# For more information, see the description associated with
-+# func_emit_wrapper(), below.
-+func_emit_wrapper_part1 ()
-+{
-+	func_emit_wrapper_part1_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_part1_arg1=$1
++	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
++	$opt_dry_run || if test -n "$outputname"; then
++	  ${RM}r "$tmpdir"
  	fi
 -      done
 -      dependency_libs=$tmp_libs
@@ -24326,196 +24081,139 @@
 -      dlfiles="$newdlfiles"
 -      dlprefiles="$newdlprefiles"
 -    fi
++	;;
++      esac
++    done
  
 -    case $linkmode in
 -    oldlib)
 -      if test -n "$deplibs"; then
 -	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
 -      fi
-+	$ECHO "\
-+#! $SHELL
++    for file in $staticlibs; do
++      func_basename "$file"
++      name="$func_basename_result"
  
 -      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 -	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
 -      fi
-+# $output - temporary wrapper script for $objdir/$outputname
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+#
-+# The $output program cannot be directly executed until all the libtool
-+# libraries that it depends on are installed.
-+#
-+# This wrapper script should never be moved out of the build directory.
-+# If it is, it will not operate correctly.
++      # Set up the ranlib parameters.
++      oldlib="$destdir/$name"
  
 -      if test -n "$rpath"; then
 -	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
 -      fi
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='${SED} -e 1s/^X//'
-+sed_quote_subst='$sed_quote_subst'
++      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
  
 -      if test -n "$xrpath"; then
 -	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
--      fi
-+# Be Bourne compatible
-+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
++      if test -n "$stripme" && test -n "$old_striplib"; then
++	func_show_eval "$old_striplib $oldlib" 'exit $?'
+       fi
  
 -      if test -n "$vinfo"; then
 -	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
 -      fi
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++      # Do each command in the postinstall commands.
++      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
++    done
  
 -      if test -n "$release"; then
 -	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
 -      fi
-+relink_command=\"$relink_command\"
++    test -n "$future_libdirs" && \
++      func_warning "remember to run \`$progname --finish$future_libdirs'"
  
 -      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 -	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
 -      fi
-+# This environment variable determines our operation mode.
-+if test \"\$libtool_install_magic\" = \"$magic\"; then
-+  # install mode needs the following variables:
-+  generated_by_libtool_version='$macro_version'
-+  notinst_deplibs='$notinst_deplibs'
-+else
-+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+    ECHO=\"$qecho\"
-+    file=\"\$0\"
-+    # Make sure echo works.
-+    if test \"X\$1\" = X--no-reexec; then
-+      # Discard the --no-reexec flag, and continue.
-+      shift
-+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-+      # Yippee, \$ECHO works!
-+      :
++    if test -n "$current_libdirs"; then
++      # Maybe just do a dry run.
++      $opt_dry_run && current_libdirs=" -n$current_libdirs"
++      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
 +    else
-+      # Restart under the correct shell, and then maybe \$ECHO will work.
-+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
++      exit $EXIT_SUCCESS
 +    fi
-+  fi\
-+"
-+	$ECHO "\
++}
  
 -      # Now set the variables for building old libraries.
 -      build_libtool_libs=no
 -      oldlibs="$output"
 -      objs="$objs$old_deplibs"
 -      ;;
-+  # Find the directory that this script lives in.
-+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
++test "$opt_mode" = install && func_mode_install ${1+"$@"}
  
 -    lib)
 -      # Make sure we only generate libraries of the form `libNAME.la'.
 -      case $outputname in
 -      lib*)
 -	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
--	eval shared_ext=\"$shrext\"
+-	eval shared_ext=\"$shrext_cmds\"
 -	eval libname=\"$libname_spec\"
 -	;;
 -      *)
 -	if test "$module" = no; then
 -	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
 -	  $echo "$help" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	fi
 -	if test "$need_lib_prefix" != no; then
 -	  # Add the "lib" prefix for modules if required
 -	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
--	  eval shared_ext=\"$shrext\"
+-	  eval shared_ext=\"$shrext_cmds\"
 -	  eval libname=\"$libname_spec\"
 -	else
 -	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
 -	fi
 -	;;
-+  # Follow symbolic links until we get to the real thisdir.
-+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-+  while test -n \"\$file\"; do
-+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-+
-+    # If there was a directory component, then change thisdir.
-+    if test \"x\$destdir\" != \"x\$file\"; then
-+      case \"\$destdir\" in
-+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-+      *) thisdir=\"\$thisdir/\$destdir\" ;;
-       esac
-+    fi
+-      esac
  
 -      if test -n "$objs"; then
 -	if test "$deplibs_check_method" != pass_all; then
 -	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	else
 -	  $echo
 -	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
 -	  $echo "*** objects $objs is not portable!"
 -	  libobjs="$libobjs $objs"
 -	fi
--      fi
-+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-+  done
-+"
-+}
-+# end: func_emit_wrapper_part1
++# func_generate_dlsyms outputname originator pic_p
++# Extract symbols from dlprefiles and create ${outputname}S.o with
++# a dlpreopen symbol table.
++func_generate_dlsyms ()
++{
++    $opt_debug
++    my_outputname="$1"
++    my_originator="$2"
++    my_pic_p="${3-no}"
++    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
++    my_dlsyms=
++
++    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++      if test -n "$NM" && test -n "$global_symbol_pipe"; then
++	my_dlsyms="${my_outputname}S.c"
++      else
++	func_error "not configured to extract global symbols from dlpreopened files"
+       fi
++    fi
  
 -      if test "$dlself" != no; then
 -	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
 -      fi
-+# func_emit_wrapper_part2 [arg=no]
-+#
-+# Emit the second part of a libtool wrapper script on stdout.
-+# For more information, see the description associated with
-+# func_emit_wrapper(), below.
-+func_emit_wrapper_part2 ()
-+{
-+	func_emit_wrapper_part2_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_part2_arg1=$1
-+	fi
-+
-+	$ECHO "\
-+
-+  # Usually 'no', except on cygwin/mingw when embedded into
-+  # the cwrapper.
-+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
-+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-+    # special case for '.'
-+    if test \"\$thisdir\" = \".\"; then
-+      thisdir=\`pwd\`
-+    fi
-+    # remove .libs from thisdir
-+    case \"\$thisdir\" in
-+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-+    $objdir )   thisdir=. ;;
-+    esac
-+  fi
++    if test -n "$my_dlsyms"; then
++      case $my_dlsyms in
++      "") ;;
++      *.c)
++	# Discover the nlist of each of the dlfiles.
++	nlist="$output_objdir/${my_outputname}.nm"
  
 -      set dummy $rpath
 -      if test "$#" -gt 2; then
 -	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
 -      fi
 -      install_libdir="$2"
-+  # Try to get the absolute directory name.
-+  absdir=\`cd \"\$thisdir\" && pwd\`
-+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-+"
++	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
  
 -      oldlibs=
 -      if test -z "$rpath"; then
@@ -24528,66 +24226,55 @@
 -	  build_libtool_libs=convenience
 -	  build_old_libs=yes
 -	fi
-+	if test "$fast_install" = yes; then
-+	  $ECHO "\
-+  program=lt-'$outputname'$exeext
-+  progdir=\"\$thisdir/$objdir\"
++	# Parse the name list into a source file.
++	func_verbose "creating $output_objdir/$my_dlsyms"
  
 -	if test -n "$vinfo"; then
 -	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
 -	fi
-+  if test ! -f \"\$progdir/\$program\" ||
-+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
++	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
++/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
++/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
  
 -	if test -n "$release"; then
 -	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
 -	fi
 -      else
-+    file=\"\$\$-\$program\"
++#ifdef __cplusplus
++extern \"C\" {
++#endif
  
 -	# Parse the version information argument.
 -	save_ifs="$IFS"; IFS=':'
 -	set dummy $vinfo 0 0 0
 -	IFS="$save_ifs"
-+    if test ! -d \"\$progdir\"; then
-+      $MKDIR \"\$progdir\"
-+    else
-+      $RM \"\$progdir/\$file\"
-+    fi"
-+
-+	  $ECHO "\
-+
-+    # relink executable if necessary
-+    if test -n \"\$relink_command\"; then
-+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-+      else
-+	$ECHO \"\$relink_command_output\" >&2
-+	$RM \"\$progdir/\$file\"
-+	exit 1
-+      fi
-+    fi
++#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
++#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
++#endif
  
 -	if test -n "$8"; then
 -	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
 -	  $echo "$help" 1>&2
--	  exit 1
-+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-+    { $RM \"\$progdir/\$program\";
-+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-+    $RM \"\$progdir/\$file\"
-+  fi"
-+	else
-+	  $ECHO "\
-+  program='$outputname'
-+  progdir=\"\$thisdir/$objdir\"
-+"
- 	fi
+-	  exit $EXIT_FAILURE
+-	fi
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
++   relocations are performed -- see ld's documentation on pseudo-relocs.  */
++# define LT_DLSYM_CONST
++#elif defined(__osf__)
++/* This system does not cope well with relocations in const data.  */
++# define LT_DLSYM_CONST
++#else
++# define LT_DLSYM_CONST const
++#endif
  
 -	# convert absolute version numbers to libtool ages
 -	# this retains compatibility with .la files and attempts
 -	# to make the code below a bit more comprehensible
--	
++/* External symbol declarations for the compiler. */\
++"
+ 
 -	case $vinfo_number in
 -	yes)
 -	  number_major="$2"
@@ -24601,7 +24288,7 @@
 -	  # which has an extra 1 added just for fun
 -	  #
 -	  case $version_type in
--	  darwin|linux|osf|windows)
+-	  darwin|linux|osf|windows|none)
 -	    current=`expr $number_major + $number_minor`
 -	    age="$number_minor"
 -	    revision="$number_revision"
@@ -24624,51 +24311,88 @@
 -	  age="$4"
 -	  ;;
 -	esac
-+	$ECHO "\
++	if test "$dlself" = yes; then
++	  func_verbose "generating symbol list for \`$output'"
  
 -	# Check that each of the things are valid numbers.
 -	case $current in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 -	*)
--	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
 -	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	  ;;
 -	esac
-+  if test -f \"\$progdir/\$program\"; then"
++	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
  
 -	case $revision in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 -	*)
--	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
 -	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	  ;;
 -	esac
-+	# Export our shlibpath_var if we have one.
-+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+	  $ECHO "\
-+    # Add our own library path to $shlibpath_var
-+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
++	  # Add our own program objects to the symbol list.
++	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
++	  for progfile in $progfiles; do
++	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
++	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
++	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
++	  done
  
 -	case $age in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 -	*)
--	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
 -	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	  ;;
 -	esac
-+    # Some systems cannot cope with colon-terminated $shlibpath_var
-+    # The second colon is a workaround for a bug in BeOS R4 sed
-+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
++	  if test -n "$exclude_expsyms"; then
++	    $opt_dry_run || {
++	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
++	      eval '$MV "$nlist"T "$nlist"'
++	    }
++	  fi
  
 -	if test "$age" -gt "$current"; then
 -	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
 -	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
-+    export $shlibpath_var
-+"
+-	  exit $EXIT_FAILURE
++	  if test -n "$export_symbols_regex"; then
++	    $opt_dry_run || {
++	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
++	      eval '$MV "$nlist"T "$nlist"'
++	    }
++	  fi
++
++	  # Prepare the list of exported symbols
++	  if test -z "$export_symbols"; then
++	    export_symbols="$output_objdir/$outputname.exp"
++	    $opt_dry_run || {
++	      $RM $export_symbols
++	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      case $host in
++	      *cygwin* | *mingw* | *cegcc* )
++                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
++	        ;;
++	      esac
++	    }
++	  else
++	    $opt_dry_run || {
++	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
++	      eval '$MV "$nlist"T "$nlist"'
++	      case $host in
++	        *cygwin* | *mingw* | *cegcc* )
++	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
++	          ;;
++	      esac
++	    }
++	  fi
  	fi
  
 -	# Calculate the version variables.
@@ -24677,13 +24401,57 @@
 -	verstring=
 -	case $version_type in
 -	none) ;;
-+	# fixup the dll searchpath if we need to.
-+	if test -n "$dllsearchpath"; then
-+	  $ECHO "\
-+    # Add the dll search path components to the executable PATH
-+    PATH=$dllsearchpath:\$PATH
-+"
-+	fi
++	for dlprefile in $dlprefiles; do
++	  func_verbose "extracting global C symbols from \`$dlprefile'"
++	  func_basename "$dlprefile"
++	  name="$func_basename_result"
++          case $host in
++	    *cygwin* | *mingw* | *cegcc* )
++	      # if an import library, we need to obtain dlname
++	      if func_win32_import_lib_p "$dlprefile"; then
++	        func_tr_sh "$dlprefile"
++	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
++	        dlprefile_dlbasename=""
++	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
++	          # Use subshell, to avoid clobbering current variable values
++	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
++	          if test -n "$dlprefile_dlname" ; then
++	            func_basename "$dlprefile_dlname"
++	            dlprefile_dlbasename="$func_basename_result"
++	          else
++	            # no lafile. user explicitly requested -dlpreopen <import library>.
++	            $sharedlib_from_linklib_cmd "$dlprefile"
++	            dlprefile_dlbasename=$sharedlib_from_linklib_result
++	          fi
++	        fi
++	        $opt_dry_run || {
++	          if test -n "$dlprefile_dlbasename" ; then
++	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
++	          else
++	            func_warning "Could not compute DLL name from $name"
++	            eval '$ECHO ": $name " >> "$nlist"'
++	          fi
++	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
++	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
++	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
++	        }
++	      else # not an import lib
++	        $opt_dry_run || {
++	          eval '$ECHO ": $name " >> "$nlist"'
++	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
++	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
++	        }
++	      fi
++	    ;;
++	    *)
++	      $opt_dry_run || {
++	        eval '$ECHO ": $name " >> "$nlist"'
++	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
++	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
++	      }
++	    ;;
++          esac
++	done
  
 -	darwin)
 -	  # Like Linux, but with the current version available in
@@ -24692,82 +24460,75 @@
 -	  versuffix="$major.$age.$revision"
 -	  # Darwin ld doesn't like 0 for these options...
 -	  minor_current=`expr $current + 1`
--	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	$ECHO "\
-+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+      # Run the actual program with our arguments.
-+"
-+	case $host in
-+	# Backslashes separate directories on plain windows
-+	*-*-mingw | *-*-os2* | *-cegcc*)
-+	  $ECHO "\
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+"
- 	  ;;
+-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+-	  ;;
++	$opt_dry_run || {
++	  # Make sure we have at least an empty file.
++	  test -f "$nlist" || : > "$nlist"
++
++	  if test -n "$exclude_expsyms"; then
++	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
++	    $MV "$nlist"T "$nlist"
++	  fi
  
 -	freebsd-aout)
 -	  major=".$current"
 -	  versuffix=".$current.$revision";
-+	*)
-+	  $ECHO "\
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+"
- 	  ;;
-+	esac
-+	$ECHO "\
-+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-+      exit 1
-+    fi
-+  else
-+    # The program doesn't exist.
-+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-+    exit 1
-+  fi
-+fi\
-+"
-+}
-+# end: func_emit_wrapper_part2
+-	  ;;
++	  # Try sorting and uniquifying the output.
++	  if $GREP -v "^: " < "$nlist" |
++	      if sort -k 3 </dev/null >/dev/null 2>&1; then
++		sort -k 3
++	      else
++		sort +2
++	      fi |
++	      uniq > "$nlist"S; then
++	    :
++	  else
++	    $GREP -v "^: " < "$nlist" > "$nlist"S
++	  fi
  
 -	freebsd-elf)
 -	  major=".$current"
 -	  versuffix=".$current";
 -	  ;;
++	  if test -f "$nlist"S; then
++	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
++	  else
++	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
++	  fi
  
 -	irix | nonstopux)
 -	  major=`expr $current - $age + 1`
-+# func_emit_wrapper [arg=no]
-+#
-+# Emit a libtool wrapper script on stdout.
-+# Don't directly open a file because we may want to
-+# incorporate the script contents within a cygwin/mingw
-+# wrapper executable.  Must ONLY be called from within
-+# func_mode_link because it depends on a number of variables
-+# set therein.
-+#
-+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-+# variable will take.  If 'yes', then the emitted script
-+# will assume that the directory in which it is stored is
-+# the $objdir directory.  This is a cygwin/mingw-specific
-+# behavior.
-+func_emit_wrapper ()
-+{
-+	func_emit_wrapper_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_arg1=$1
-+	fi
++	  echo >> "$output_objdir/$my_dlsyms" "\
  
 -	  case $version_type in
 -	    nonstopux) verstring_prefix=nonstopux ;;
 -	    *)         verstring_prefix=sgi ;;
--	  esac
++/* The mapping between symbol names and symbols.  */
++typedef struct {
++  const char *name;
++  void *address;
++} lt_dlsymlist;
++extern LT_DLSYM_CONST lt_dlsymlist
++lt_${my_prefix}_LTX_preloaded_symbols[];
++LT_DLSYM_CONST lt_dlsymlist
++lt_${my_prefix}_LTX_preloaded_symbols[] =
++{\
++  { \"$my_originator\", (void *) 0 },"
++
++	  case $need_lib_prefix in
++	  no)
++	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
++	    ;;
++	  *)
++	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
++	    ;;
+ 	  esac
 -	  verstring="$verstring_prefix$major.$revision"
-+	# split this up so that func_emit_cwrapperexe_src
-+	# can call each part independently.
-+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-+}
++	  echo >> "$output_objdir/$my_dlsyms" "\
++  {0, (void *) 0}
++};
  
 -	  # Add in all the interfaces that we are compatible with.
 -	  loop=$revision
@@ -24776,198 +24537,61 @@
 -	    loop=`expr $loop - 1`
 -	    verstring="$verstring_prefix$major.$iface:$verstring"
 -	  done
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++  return lt_${my_prefix}_LTX_preloaded_symbols;
++}
++#endif
  
 -	  # Before this point, $major must not contain `.'.
 -	  major=.$major
 -	  versuffix="$major.$revision"
 -	  ;;
-+# func_to_host_path arg
-+#
-+# Convert paths to host format when used with build tools.
-+# Intended for use with "native" mingw (where libtool itself
-+# is running under the msys shell), or in the following cross-
-+# build environments:
-+#    $build          $host
-+#    mingw (msys)    mingw  [e.g. native]
-+#    cygwin          mingw
-+#    *nix + wine     mingw
-+# where wine is equipped with the `winepath' executable.
-+# In the native mingw case, the (msys) shell automatically
-+# converts paths for any non-msys applications it launches,
-+# but that facility isn't available from inside the cwrapper.
-+# Similar accommodations are necessary for $host mingw and
-+# $build cygwin.  Calling this function does no harm for other
-+# $host/$build combinations not listed above.
-+#
-+# ARG is the path (on $build) that should be converted to
-+# the proper representation for $host. The result is stored
-+# in $func_to_host_path_result.
-+func_to_host_path ()
-+{
-+  func_to_host_path_result="$1"
-+  if test -n "$1" ; then
-+    case $host in
-+      *mingw* )
-+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+        case $build in
-+          *mingw* ) # actually, msys
-+            # awkward: cmd appends spaces to result
-+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          *cygwin* )
-+            func_to_host_path_tmp1=`cygpath -w "$1"`
-+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          * )
-+            # Unfortunately, winepath does not exit with a non-zero
-+            # error code, so we are forced to check the contents of
-+            # stdout. On the other hand, if the command is not
-+            # found, the shell will set an exit code of 127 and print
-+            # *an error message* to stdout. So we must check for both
-+            # error code of zero AND non-empty stdout, which explains
-+            # the odd construction:
-+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+                $SED -e "$lt_sed_naive_backslashify"`
-+            else
-+              # Allow warning below.
-+              func_to_host_path_result=""
-+            fi
-+            ;;
-+        esac
-+        if test -z "$func_to_host_path_result" ; then
-+          func_error "Could not determine host path corresponding to"
-+          func_error "  '$1'"
-+          func_error "Continuing, but uninstalled executables may not work."
-+          # Fallback:
-+          func_to_host_path_result="$1"
-+        fi
-+        ;;
-+    esac
-+  fi
++#ifdef __cplusplus
 +}
-+# end: func_to_host_path
++#endif\
++"
++	} # !$opt_dry_run
  
 -	linux)
 -	  major=.`expr $current - $age`
 -	  versuffix="$major.$age.$revision"
--	  ;;
-+# func_to_host_pathlist arg
-+#
-+# Convert pathlists to host format when used with build tools.
-+# See func_to_host_path(), above. This function supports the
-+# following $build/$host combinations (but does no harm for
-+# combinations not listed here):
-+#    $build          $host
-+#    mingw (msys)    mingw  [e.g. native]
-+#    cygwin          mingw
-+#    *nix + wine     mingw
-+#
-+# Path separators are also converted from $build format to
-+# $host format. If ARG begins or ends with a path separator
-+# character, it is preserved (but converted to $host format)
-+# on output.
-+#
-+# ARG is a pathlist (on $build) that should be converted to
-+# the proper representation on $host. The result is stored
-+# in $func_to_host_pathlist_result.
-+func_to_host_pathlist ()
-+{
-+  func_to_host_pathlist_result="$1"
-+  if test -n "$1" ; then
-+    case $host in
-+      *mingw* )
-+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+        # Remove leading and trailing path separator characters from
-+        # ARG. msys behavior is inconsistent here, cygpath turns them
-+        # into '.;' and ';.', and winepath ignores them completely.
-+        func_to_host_pathlist_tmp2="$1"
-+        # Once set for this call, this variable should not be
-+        # reassigned. It is used in tha fallback case.
-+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-+          $SED -e 's|^:*||' -e 's|:*$||'`
-+        case $build in
-+          *mingw* ) # Actually, msys.
-+            # Awkward: cmd appends spaces to result.
-+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          *cygwin* )
-+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          * )
-+            # unfortunately, winepath doesn't convert pathlists
-+            func_to_host_pathlist_result=""
-+            func_to_host_pathlist_oldIFS=$IFS
-+            IFS=:
-+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-+              IFS=$func_to_host_pathlist_oldIFS
-+              if test -n "$func_to_host_pathlist_f" ; then
-+                func_to_host_path "$func_to_host_pathlist_f"
-+                if test -n "$func_to_host_path_result" ; then
-+                  if test -z "$func_to_host_pathlist_result" ; then
-+                    func_to_host_pathlist_result="$func_to_host_path_result"
-+                  else
-+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-+                  fi
-+                fi
-+              fi
-+              IFS=:
-+            done
-+            IFS=$func_to_host_pathlist_oldIFS
-+            ;;
-+        esac
-+        if test -z "$func_to_host_pathlist_result" ; then
-+          func_error "Could not determine the host path(s) corresponding to"
-+          func_error "  '$1'"
-+          func_error "Continuing, but uninstalled executables may not work."
-+          # Fallback. This may break if $1 contains DOS-style drive
-+          # specifications. The fix is not to complicate the expression
-+          # below, but for the user to provide a working wine installation
-+          # with winepath so that path translation in the cross-to-mingw
-+          # case works properly.
-+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-+        fi
-+        # Now, add the leading and trailing path separators back
-+        case "$1" in
-+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-+            ;;
-+        esac
-+        case "$1" in
-+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-+            ;;
-+        esac
-+        ;;
-+    esac
-+  fi
-+}
-+# end: func_to_host_pathlist
++	pic_flag_for_symtable=
++	case "$compile_command " in
++	*" -static "*) ;;
++	*)
++	  case $host in
++	  # compiling the symbol table file with pic_flag works around
++	  # a FreeBSD bug that causes programs to crash when -lm is
++	  # linked before any other PIC object.  But we must not use
++	  # pic_flag when linking with -static.  The problem exists in
++	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
++	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
++	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
++	  *-*-hpux*)
++	    pic_flag_for_symtable=" $pic_flag"  ;;
++	  *)
++	    if test "X$my_pic_p" != Xno; then
++	      pic_flag_for_symtable=" $pic_flag"
++	    fi
++	    ;;
++	  esac
+ 	  ;;
++	esac
++	symtab_cflags=
++	for arg in $LTCFLAGS; do
++	  case $arg in
++	  -pie | -fpie | -fPIE) ;;
++	  *) func_append symtab_cflags " $arg" ;;
++	  esac
++	done
  
 -	osf)
 -	  major=.`expr $current - $age`
 -	  versuffix=".$current.$age.$revision"
 -	  verstring="$current.$age.$revision"
-+# func_emit_cwrapperexe_src
-+# emit the source code for a wrapper executable on stdout
-+# Must ONLY be called from within func_mode_link because
-+# it depends on a number of variable set therein.
-+func_emit_cwrapperexe_src ()
-+{
-+	cat <<EOF
- 
+-
 -	  # Add in all the interfaces that we are compatible with.
 -	  loop=$age
 -	  while test "$loop" -ne 0; do
@@ -24975,76 +24599,61 @@
 -	    loop=`expr $loop - 1`
 -	    verstring="$verstring:${iface}.0"
 -	  done
-+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
- 
+-
 -	  # Make executables depend on our current version.
 -	  verstring="$verstring:${current}.0"
 -	  ;;
-+   The $output program cannot be directly executed until all the libtool
-+   libraries that it depends on are installed.
++	# Now compile the dynamic symbol file.
++	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
  
 -	sunos)
 -	  major=".$current"
 -	  versuffix=".$current.$revision"
 -	  ;;
-+   This wrapper executable should never be moved out of the build directory.
-+   If it is, it will not operate correctly.
++	# Clean up the generated files.
++	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
  
 -	windows)
 -	  # Use '-' rather than '.', since we only want one
 -	  # extension on DOS 8.3 filesystems.
 -	  major=`expr $current - $age`
 -	  versuffix="-$major"
--	  ;;
-+   Currently, it simply execs the wrapper *script* "$SHELL $output",
-+   but could eventually absorb all of the scripts functionality and
-+   exec $objdir/$outputname directly.
-+*/
-+EOF
-+	    cat <<"EOF"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#ifdef _MSC_VER
-+# include <direct.h>
-+# include <process.h>
-+# include <io.h>
-+# define setmode _setmode
-+#else
-+# include <unistd.h>
-+# include <stdint.h>
-+# ifdef __CYGWIN__
-+#  include <io.h>
-+#  define HAVE_SETENV
-+#  ifdef __STRICT_ANSI__
-+char *realpath (const char *, char *);
-+int putenv (char *);
-+int setenv (const char *, const char *, int);
-+#  endif
-+# endif
-+#endif
-+#include <malloc.h>
-+#include <stdarg.h>
-+#include <assert.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
- 
--	*)
++	# Transform the symbol file into the correct name.
++	symfileobj="$output_objdir/${my_outputname}S.$objext"
++	case $host in
++	*cygwin* | *mingw* | *cegcc* )
++	  if test -f "$output_objdir/$my_outputname.def"; then
++	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
++	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
++	  else
++	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
++	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
++	  fi
+ 	  ;;
+-
+ 	*)
 -	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
 -	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
--	  exit 1
--	  ;;
--	esac
-+#if defined(PATH_MAX)
-+# define LT_PATHMAX PATH_MAX
-+#elif defined(MAXPATHLEN)
-+# define LT_PATHMAX MAXPATHLEN
-+#else
-+# define LT_PATHMAX 1024
-+#endif
+-	  exit $EXIT_FAILURE
++	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
++	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ 	  ;;
+ 	esac
++	;;
++      *)
++	func_fatal_error "unknown suffix for \`$my_dlsyms'"
++	;;
++      esac
++    else
++      # We keep going just in case the user didn't refer to
++      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
++      # really was required.
++
++      # Nullify the symbol file.
++      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
++      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
++    fi
++}
  
 -	# Clear the version info if we defaulted, and they specified a release.
 -	if test -z "$vinfo" && test -n "$release"; then
@@ -25065,26 +24674,62 @@
 -	    versuffix=".0.0"
 -	  fi
 -	fi
-+#ifndef S_IXOTH
-+# define S_IXOTH 0
-+#endif
-+#ifndef S_IXGRP
-+# define S_IXGRP 0
-+#endif
- 
+-
 -	# Remove version info from name if versioning should be avoided
 -	if test "$avoid_version" = yes && test "$need_version" = no; then
 -	  major=
 -	  versuffix=
 -	  verstring=""
 -	fi
-+#ifdef _MSC_VER
-+# define S_IXUSR _S_IEXEC
-+# define stat _stat
-+# ifndef _INTPTR_T_DEFINED
-+#  define intptr_t int
-+# endif
-+#endif
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
++# Need a lot of goo to handle *both* DLLs and import libs
++# Has to be a shell function in order to 'eat' the argument
++# that is supplied when $file_magic_command is called.
++# Despite the name, also deal with 64 bit binaries.
++func_win32_libid ()
++{
++  $opt_debug
++  win32_libid_type="unknown"
++  win32_fileres=`file -L $1 2>/dev/null`
++  case $win32_fileres in
++  *ar\ archive\ import\ library*) # definitely import
++    win32_libid_type="x86 archive import"
++    ;;
++  *ar\ archive*) # could be an import, or static
++    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
++    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
++       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
++      func_to_tool_file "$1" func_convert_file_msys_to_w32
++      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
++	$SED -n -e '
++	    1,100{
++		/ I /{
++		    s,.*,import,
++		    p
++		    q
++		}
++	    }'`
++      case $win32_nmres in
++      import*)  win32_libid_type="x86 archive import";;
++      *)        win32_libid_type="x86 archive static";;
++      esac
++    fi
++    ;;
++  *DLL*)
++    win32_libid_type="x86 DLL"
++    ;;
++  *executable*) # but shell scripts are "executable" too...
++    case $win32_fileres in
++    *MS\ Windows\ PE\ Intel*)
++      win32_libid_type="x86 DLL"
++      ;;
++    esac
++    ;;
++  esac
++  $ECHO "$win32_libid_type"
++}
  
 -	# Check to see if the archive will have undefined symbols.
 -	if test "$allow_undefined" = yes; then
@@ -25098,10 +24743,20 @@
 -	  allow_undefined_flag="$no_undefined_flag"
 -	fi
 -      fi
-+#ifndef DIR_SEPARATOR
-+# define DIR_SEPARATOR '/'
-+# define PATH_SEPARATOR ':'
-+#endif
++# func_cygming_dll_for_implib ARG
++#
++# Platform-specific function to extract the
++# name of the DLL associated with the specified
++# import library ARG.
++# Invoked by eval'ing the libtool variable
++#    $sharedlib_from_linklib_cmd
++# Result is available in the variable
++#    $sharedlib_from_linklib_result
++func_cygming_dll_for_implib ()
++{
++  $opt_debug
++  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
++}
  
 -      if test "$mode" != relink; then
 -	# Remove our outputs, but don't remove object files since they
@@ -25113,9 +24768,11 @@
 -	    *.$objext)
 -	       ;;
 -	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
--	       if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
--	       then
--		 continue
+-	       if test "X$precious_files_regex" != "X"; then
+-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+-	         then
+-		   continue
+-		 fi
 -	       fi
 -	       removelist="$removelist $p"
 -	       ;;
@@ -25127,46 +24784,128 @@
 -	  $run ${rm}r $removelist
 -	fi
 -      fi
-+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-+  defined (__OS2__)
-+# define HAVE_DOS_BASED_FILE_SYSTEM
-+# define FOPEN_WB "wb"
-+# ifndef DIR_SEPARATOR_2
-+#  define DIR_SEPARATOR_2 '\\'
-+# endif
-+# ifndef PATH_SEPARATOR_2
-+#  define PATH_SEPARATOR_2 ';'
-+# endif
-+#endif
++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
++#
++# The is the core of a fallback implementation of a
++# platform-specific function to extract the name of the
++# DLL associated with the specified import library LIBNAME.
++#
++# SECTION_NAME is either .idata$6 or .idata$7, depending
++# on the platform and compiler that created the implib.
++#
++# Echos the name of the DLL associated with the
++# specified import library.
++func_cygming_dll_for_implib_fallback_core ()
++{
++  $opt_debug
++  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
++  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
++    $SED '/^Contents of section '"$match_literal"':/{
++      # Place marker at beginning of archive member dllname section
++      s/.*/====MARK====/
++      p
++      d
++    }
++    # These lines can sometimes be longer than 43 characters, but
++    # are always uninteresting
++    /:[	 ]*file format pe[i]\{,1\}-/d
++    /^In archive [^:]*:/d
++    # Ensure marker is printed
++    /^====MARK====/p
++    # Remove all lines with less than 43 characters
++    /^.\{43\}/!d
++    # From remaining lines, remove first 43 characters
++    s/^.\{43\}//' |
++    $SED -n '
++      # Join marker and all lines until next marker into a single line
++      /^====MARK====/ b para
++      H
++      $ b para
++      b
++      :para
++      x
++      s/\n//g
++      # Remove the marker
++      s/^====MARK====//
++      # Remove trailing dots and whitespace
++      s/[\. \t]*$//
++      # Print
++      /./p' |
++    # we now have a list, one entry per line, of the stringified
++    # contents of the appropriate section of all members of the
++    # archive which possess that section. Heuristic: eliminate
++    # all those which have a first or second character that is
++    # a '.' (that is, objdump's representation of an unprintable
++    # character.) This should work for all archives with less than
++    # 0x302f exports -- but will fail for DLLs whose name actually
++    # begins with a literal '.' or a single character followed by
++    # a '.'.
++    #
++    # Of those that remain, print the first one.
++    $SED -e '/^\./d;/^.\./d;q'
++}
  
 -      # Now set the variables for building old libraries.
 -      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
 -	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+#ifndef DIR_SEPARATOR_2
-+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-+#else /* DIR_SEPARATOR_2 */
-+# define IS_DIR_SEPARATOR(ch) \
-+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-+#endif /* DIR_SEPARATOR_2 */
++# func_cygming_gnu_implib_p ARG
++# This predicate returns with zero status (TRUE) if
++# ARG is a GNU/binutils-style import library. Returns
++# with nonzero status (FALSE) otherwise.
++func_cygming_gnu_implib_p ()
++{
++  $opt_debug
++  func_to_tool_file "$1" func_convert_file_msys_to_w32
++  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
++  test -n "$func_cygming_gnu_implib_tmp"
++}
  
 -	# Transform .lo files to .o files.
 -	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
 -      fi
-+#ifndef PATH_SEPARATOR_2
-+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-+#else /* PATH_SEPARATOR_2 */
-+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-+#endif /* PATH_SEPARATOR_2 */
++# func_cygming_ms_implib_p ARG
++# This predicate returns with zero status (TRUE) if
++# ARG is an MS-style import library. Returns
++# with nonzero status (FALSE) otherwise.
++func_cygming_ms_implib_p ()
++{
++  $opt_debug
++  func_to_tool_file "$1" func_convert_file_msys_to_w32
++  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
++  test -n "$func_cygming_ms_implib_tmp"
++}
  
 -      # Eliminate all temporary directories.
--      for path in $notinst_path; do
--	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
--	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
--	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
--      done
-+#ifdef __CYGWIN__
-+# define FOPEN_WB "wb"
-+#endif
+-#      for path in $notinst_path; do
+-#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+-#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+-#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+-#      done
++# func_cygming_dll_for_implib_fallback ARG
++# Platform-specific function to extract the
++# name of the DLL associated with the specified
++# import library ARG.
++#
++# This fallback implementation is for use when $DLLTOOL
++# does not support the --identify-strict option.
++# Invoked by eval'ing the libtool variable
++#    $sharedlib_from_linklib_cmd
++# Result is available in the variable
++#    $sharedlib_from_linklib_result
++func_cygming_dll_for_implib_fallback ()
++{
++  $opt_debug
++  if func_cygming_gnu_implib_p "$1" ; then
++    # binutils import library
++    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
++  elif func_cygming_ms_implib_p "$1" ; then
++    # ms-generated import library
++    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
++  else
++    # unknown
++    sharedlib_from_linklib_result=""
++  fi
++}
  
 -      if test -n "$xrpath"; then
 -	# If the user specified any rpath flags, then add them.
@@ -25182,12 +24921,6 @@
 -	  dependency_libs="$temp_xrpath $dependency_libs"
 -	fi
 -      fi
-+#ifndef FOPEN_WB
-+# define FOPEN_WB "w"
-+#endif
-+#ifndef _O_BINARY
-+# define _O_BINARY 0
-+#endif
  
 -      # Make sure dlfiles contains only unique files that won't be dlpreopened
 -      old_dlfiles="$dlfiles"
@@ -25197,11 +24930,30 @@
 -	*" $lib "*) ;;
 -	*) dlfiles="$dlfiles $lib" ;;
 -	esac
--      done
-+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-+#define XFREE(stale) do { \
-+  if (stale) { free ((void *) stale); stale = 0; } \
-+} while (0)
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++    $opt_debug
++    f_ex_an_ar_dir="$1"; shift
++    f_ex_an_ar_oldlib="$1"
++    if test "$lock_old_archive_extraction" = yes; then
++      lockfile=$f_ex_an_ar_oldlib.lock
++      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
++	func_echo "Waiting for $lockfile to be removed"
++	sleep 2
+       done
++    fi
++    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
++		   'stat=$?; rm -f "$lockfile"; exit $stat'
++    if test "$lock_old_archive_extraction" = yes; then
++      $opt_dry_run || rm -f "$lockfile"
++    fi
++    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++     :
++    else
++      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
++    fi
++}
  
 -      # Make sure dlprefiles contains only unique files
 -      old_dlprefiles="$dlprefiles"
@@ -25210,22 +24962,38 @@
 -	case "$dlprefiles " in
 -	*" $lib "*) ;;
 -	*) dlprefiles="$dlprefiles $lib" ;;
--	esac
--      done
-+#undef LTWRAPPER_DEBUGPRINTF
-+#if defined DEBUGWRAPPER
-+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-+static void
-+ltwrapper_debugprintf (const char *fmt, ...)
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
 +{
-+    va_list args;
-+    va_start (args, fmt);
-+    (void) vfprintf (stderr, fmt, args);
-+    va_end (args);
-+}
-+#else
-+# define LTWRAPPER_DEBUGPRINTF(args)
-+#endif
++    $opt_debug
++    my_gentop="$1"; shift
++    my_oldlibs=${1+"$@"}
++    my_oldobjs=""
++    my_xlib=""
++    my_xabs=""
++    my_xdir=""
++
++    for my_xlib in $my_oldlibs; do
++      # Extract the objects.
++      case $my_xlib in
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++	*) my_xabs=`pwd`"/$my_xlib" ;;
++      esac
++      func_basename "$my_xlib"
++      my_xlib="$func_basename_result"
++      my_xlib_u=$my_xlib
++      while :; do
++        case " $extracted_archives " in
++	*" $my_xlib_u "*)
++	  func_arith $extracted_serial + 1
++	  extracted_serial=$func_arith_result
++	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
++	*) break ;;
+ 	esac
+       done
++      extracted_archives="$extracted_archives $my_xlib_u"
++      my_xdir="$my_gentop/$my_xlib_u"
  
 -      if test "$build_libtool_libs" = yes; then
 -	if test -n "$rpath"; then
@@ -25240,9 +25008,14 @@
 -	  *-*-netbsd*)
 -	    # Don't link with libc until the a.out ld.so is fixed.
 -	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 -	    # Do not include libc due to us having libc/libc_r.
--	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  *-*-sco3.2v5* | *-*-sco5v6*)
+-	    # Causes problems with __ctype
+-	    ;;
+-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+-	    # Compiler inserts libc in the correct place for threads to work
 -	    ;;
 - 	  *)
 -	    # Add libc to deplibs on all other systems if necessary.
@@ -25252,7 +25025,7 @@
 -	    ;;
 -	  esac
 -	fi
-+const char *program_name = NULL;
++      func_mkdir_p "$my_xdir"
  
 -	# Transform deplibs into only deplibs that can be linked in shared.
 -	name_save=$name
@@ -25285,58 +25058,14 @@
 -	  $rm conftest.c
 -	  cat > conftest.c <<EOF
 -	  int main() { return 0; }
-+void *xmalloc (size_t num);
-+char *xstrdup (const char *string);
-+const char *base_name (const char *name);
-+char *find_executable (const char *wrapper);
-+char *chase_symlinks (const char *pathspec);
-+int make_executable (const char *path);
-+int check_executable (const char *path);
-+char *strendzap (char *str, const char *pat);
-+void lt_fatal (const char *message, ...);
-+void lt_setenv (const char *name, const char *value);
-+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-+void lt_opt_process_env_set (const char *arg);
-+void lt_opt_process_env_prepend (const char *arg);
-+void lt_opt_process_env_append (const char *arg);
-+int lt_split_name_value (const char *arg, char** name, char** value);
-+void lt_update_exe_path (const char *name, const char *value);
-+void lt_update_lib_path (const char *name, const char *value);
-+
-+static const char *script_text_part1 =
-+EOF
-+
-+	    func_emit_wrapper_part1 yes |
-+	        $SED -e 's/\([\\"]\)/\\\1/g' \
-+	             -e 's/^/  "/' -e 's/$/\\n"/'
-+	    echo ";"
-+	    cat <<EOF
-+
-+static const char *script_text_part2 =
-+EOF
-+	    func_emit_wrapper_part2 yes |
-+	        $SED -e 's/\([\\"]\)/\\\1/g' \
-+	             -e 's/^/  "/' -e 's/$/\\n"/'
-+	    echo ";"
-+
-+	    cat <<EOF
-+const char * MAGIC_EXE = "$magic_exe";
-+const char * LIB_PATH_VARNAME = "$shlibpath_var";
-+EOF
-+
-+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+              func_to_host_pathlist "$temp_rpath"
-+	      cat <<EOF
-+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
- EOF
+-EOF
 -	  $rm conftest
--	  $LTCC -o conftest conftest.c $deplibs
--	  if test "$?" -eq 0 ; then
+-      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 -	    ldd_output=`ldd conftest`
 -	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
+-	      name=`expr $i : '-l\(.*\)'`
 -	      # If $name is empty we are operating on a -L argument.
--              if test "$name" != "" && test "$name" -ne "0"; then
+-              if test "$name" != "" && test "$name" != "0"; then
 -		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 -		  case " $predeps $postdeps " in
 -		  *" $i "*)
@@ -25367,17 +25096,48 @@
 -		newdeplibs="$newdeplibs $i"
 -	      fi
 -	    done
--	  else
++      case $host in
++      *-darwin*)
++	func_verbose "Extracting $my_xabs"
++	# Do not bother doing anything if just a dry run
++	$opt_dry_run || {
++	  darwin_orig_dir=`pwd`
++	  cd $my_xdir || exit $?
++	  darwin_archive=$my_xabs
++	  darwin_curdir=`pwd`
++	  darwin_base_archive=`basename "$darwin_archive"`
++	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
++	  if test -n "$darwin_arches"; then
++	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
++	    darwin_arch=
++	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
++	    for darwin_arch in  $darwin_arches ; do
++	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++	      cd "$darwin_curdir"
++	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++	    done # $darwin_arches
++            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
++	    darwin_file=
++	    darwin_files=
++	    for darwin_file in $darwin_filelist; do
++	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
++	      $LIPO -create -output "$darwin_file" $darwin_files
++	    done # $darwin_filelist
++	    $RM -rf unfat-$$
++	    cd "$darwin_orig_dir"
+ 	  else
 -	    # Error occurred in the first compile.  Let's try to salvage
 -	    # the situation: Compile a separate program for each library.
 -	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
+-	      name=`expr $i : '-l\(.*\)'`
 -	      # If $name is empty we are operating on a -L argument.
 -              if test "$name" != "" && test "$name" != "0"; then
 -		$rm conftest
--		$LTCC -o conftest conftest.c $i
--		# Did it work?
--		if test "$?" -eq 0 ; then
+-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 -		  ldd_output=`ldd conftest`
 -		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 -		    case " $predeps $postdeps " in
@@ -25409,7 +25169,7 @@
 -		  droppeddeps=yes
 -		  $echo
 -		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
--		  $echo "***  make it link in!  You will probably need to install it or some"
+-		  $echo "*** make it link in!  You will probably need to install it or some"
 -		  $echo "*** library that it depends on before this library will be fully"
 -		  $echo "*** functional.  Installing it before continuing would be even better."
 -		fi
@@ -25423,7 +25183,7 @@
 -	  set dummy $deplibs_check_method
 -	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
 -	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
+-	    name=`expr $a_deplib : '-l\(.*\)'`
 -	    # If $name is empty we are operating on a -L argument.
 -            if test "$name" != "" && test  "$name" != "0"; then
 -	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -25482,20 +25242,17 @@
 -		  $echo "*** using a file magic. Last file checked: $potlib"
 -		fi
 -	      fi
- 	    else
+-	    else
 -	      # Add a -L argument.
 -	      newdeplibs="$newdeplibs $a_deplib"
-+	      cat <<"EOF"
-+const char * LIB_PATH_VALUE   = "";
-+EOF
- 	    fi
+-	    fi
 -	  done # Gone through all deplibs.
 -	  ;;
 -	match_pattern*)
 -	  set dummy $deplibs_check_method
 -	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
 -	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
+-	    name=`expr $a_deplib : '-l\(.*\)'`
 -	    # If $name is empty we are operating on a -L argument.
 -	    if test -n "$name" && test "$name" != "0"; then
 -	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -25537,21 +25294,10 @@
 -		  $echo "*** using a regex pattern. Last file checked: $potlib"
 -		fi
 -	      fi
-+
-+	    if test -n "$dllsearchpath"; then
-+              func_to_host_pathlist "$dllsearchpath:"
-+	      cat <<EOF
-+const char * EXE_PATH_VARNAME = "PATH";
-+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
-+EOF
- 	    else
+-	    else
 -	      # Add a -L argument.
 -	      newdeplibs="$newdeplibs $a_deplib"
-+	      cat <<"EOF"
-+const char * EXE_PATH_VARNAME = "";
-+const char * EXE_PATH_VALUE   = "";
-+EOF
- 	    fi
+-	    fi
 -	  done # Gone through all deplibs.
 -	  ;;
 -	none | unknown | *)
@@ -25569,17 +25315,9 @@
 -	    $echo
 -	    if test "X$deplibs_check_method" = "Xnone"; then
 -	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-+
-+	    if test "$fast_install" = yes; then
-+	      cat <<EOF
-+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-+EOF
- 	    else
+-	    else
 -	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-+	      cat <<EOF
-+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-+EOF
- 	    fi
+-	    fi
 -	    $echo "*** All declared inter-library dependencies are being dropped."
 -	    droppeddeps=yes
 -	  fi
@@ -25590,6 +25328,17 @@
 -	release=$release_save
 -	libname=$libname_save
 -	name=$name_save
++	    cd $darwin_orig_dir
++	    func_extract_an_archive "$my_xdir" "$my_xabs"
++	  fi # $darwin_arches
++	} # !$opt_dry_run
++	;;
++      *)
++        func_extract_an_archive "$my_xdir" "$my_xabs"
++	;;
++      esac
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
++    done
  
 -	case $host in
 -	*-*-rhapsody* | *-*-darwin1.[012])
@@ -25597,6 +25346,8 @@
 -	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
 -	  ;;
 -	esac
++    func_extract_archives_result="$my_oldobjs"
++}
  
 -	if test "$droppeddeps" = yes; then
 -	  if test "$module" = yes; then
@@ -25623,7 +25374,6 @@
 -	    $echo "*** The inter-library dependencies that have been dropped here will be"
 -	    $echo "*** automatically added whenever a program is linked with this library"
 -	    $echo "*** or is declared to -dlopen it."
-+	    cat <<"EOF"
  
 -	    if test "$allow_undefined" = no; then
 -	      $echo
@@ -25644,15 +25394,83 @@
 -	# Done checking deplibs!
 -	deplibs=$newdeplibs
 -      fi
-+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
++# func_emit_wrapper [arg=no]
++#
++# Emit a libtool wrapper script on stdout.
++# Don't directly open a file because we may want to
++# incorporate the script contents within a cygwin/mingw
++# wrapper executable.  Must ONLY be called from within
++# func_mode_link because it depends on a number of variables
++# set therein.
++#
++# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
++# variable will take.  If 'yes', then the emitted script
++# will assume that the directory in which it is stored is
++# the $objdir directory.  This is a cygwin/mingw-specific
++# behavior.
++func_emit_wrapper ()
++{
++	func_emit_wrapper_arg1=${1-no}
+ 
++	$ECHO "\
++#! $SHELL
+ 
+-      # move library search paths that coincide with paths to not yet
+-      # installed libraries to the beginning of the library search list
+-      new_libs=
+-      for path in $notinst_path; do
+-	case " $new_libs " in
+-	*" -L$path/$objdir "*) ;;
+-	*)
+-	  case " $deplibs " in
+-	  *" -L$path/$objdir "*)
+-	    new_libs="$new_libs -L$path/$objdir" ;;
+-	  esac
+-	  ;;
+-	esac
+-      done
+-      for deplib in $deplibs; do
+-	case $deplib in
+-	-L*)
+-	  case " $new_libs " in
+-	  *" $deplib "*) ;;
+-	  *) new_libs="$new_libs $deplib" ;;
+-	  esac
+-	  ;;
+-	*) new_libs="$new_libs $deplib" ;;
+-	esac
+-      done
+-      deplibs="$new_libs"
++# $output - temporary wrapper script for $objdir/$outputname
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
++#
++# The $output program cannot be directly executed until all the libtool
++# libraries that it depends on are installed.
++#
++# This wrapper script should never be moved out of the build directory.
++# If it is, it will not operate correctly.
+ 
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++sed_quote_subst='$sed_quote_subst'
  
 -      # All the library-specific variables (install_libdir is set above).
 -      library_names=
 -      old_library=
 -      dlname=
-+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
-+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
++# Be Bourne compatible
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
++else
++  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
  
 -      # Test again, we may have decided not to build it any more
 -      if test "$build_libtool_libs" = yes; then
@@ -25708,26 +25526,32 @@
 -	  fi
 -	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 -	fi
-+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
 -	shlibpath="$finalize_shlibpath"
 -	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 -	if test -n "$shlibpath"; then
 -	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 -	fi
-+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
++relink_command=\"$relink_command\"
  
 -	# Get the real and link names of the library.
--	eval shared_ext=\"$shrext\"
+-	eval shared_ext=\"$shrext_cmds\"
 -	eval library_names=\"$library_names_spec\"
 -	set dummy $library_names
 -	realname="$2"
 -	shift; shift
-+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
++# This environment variable determines our operation mode.
++if test \"\$libtool_install_magic\" = \"$magic\"; then
++  # install mode needs the following variables:
++  generated_by_libtool_version='$macro_version'
++  notinst_deplibs='$notinst_deplibs'
++else
++  # When we are sourced in execute mode, \$file and \$ECHO are already set.
++  if test \"\$libtool_execute_magic\" != \"$magic\"; then
++    file=\"\$0\""
  
 -	if test -n "$soname_spec"; then
 -	  eval soname=\"$soname_spec\"
@@ -25737,30 +25561,61 @@
 -	if test -z "$dlname"; then
 -	  dlname=$soname
 -	fi
-+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
++    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
++    $ECHO "\
  
 -	lib="$output_objdir/$realname"
+-	linknames=
 -	for link
 -	do
 -	  linknames="$linknames $link"
 -	done
-+int
-+main (int argc, char *argv[])
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
 +{
-+  char **newargz;
-+  int  newargc;
-+  char *tmp_pathspec;
-+  char *actual_cwrapper_path;
-+  char *actual_cwrapper_name;
-+  char *target_name;
-+  char *lt_argv_zero;
-+  intptr_t rval = 127;
++  eval 'cat <<_LTECHO_EOF
++\$1
++_LTECHO_EOF'
++}
++    ECHO=\"$qECHO\"
++  fi
  
 -	# Use standard objects if they are pic
 -	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+  int i;
++# Very basic option parsing. These options are (a) specific to
++# the libtool wrapper, (b) are identical between the wrapper
++# /script/ and the wrapper /executable/ which is used only on
++# windows platforms, and (c) all begin with the string "--lt-"
++# (application programs are unlikely to have options which match
++# this pattern).
++#
++# There are only two supported options: --lt-debug and
++# --lt-dump-script. There is, deliberately, no --lt-help.
++#
++# The first argument to this parsing function should be the
++# script's $0 value, followed by "$@".
++lt_option_debug=
++func_parse_lt_options ()
++{
++  lt_script_arg0=\$0
++  shift
++  for lt_opt
++  do
++    case \"\$lt_opt\" in
++    --lt-debug) lt_option_debug=1 ;;
++    --lt-dump-script)
++        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
++        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
++        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
++        cat \"\$lt_dump_D/\$lt_dump_F\"
++        exit 0
++      ;;
++    --lt-*)
++        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
++        exit 1
++      ;;
++    esac
++  done
  
 -	# Prepare the list of exported symbols
 -	if test -z "$export_symbols"; then
@@ -25782,6 +25637,9 @@
 -	        # The command line is too long to execute in one step.
 -	        $show "using reloadable object file for export list..."
 -	        skipped_export=:
+-		# Break out early, otherwise skipped_export may be
+-		# set to false by a later but shorter cmd.
+-		break
 -	      fi
 -	    done
 -	    IFS="$save_ifs"
@@ -25793,72 +25651,52 @@
 -	    fi
 -	  fi
 -	fi
-+  program_name = (char *) xstrdup (base_name (argv[0]));
-+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
++  # Print the debug banner immediately:
++  if test -n \"\$lt_option_debug\"; then
++    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
++  fi
++}
  
 -	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 -	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
 -	fi
-+  /* very simple arg parsing; don't want to rely on getopt */
-+  for (i = 1; i < argc; i++)
-+    {
-+      if (strcmp (argv[i], dumpscript_opt) == 0)
-+	{
-+EOF
-+	    case "$host" in
-+	      *mingw* | *cygwin* )
-+		# make stdout use "unix" line endings
-+		echo "          setmode(1,_O_BINARY);"
-+		;;
-+	      esac
++# Used when --lt-debug. Prints its arguments to stdout
++# (redirection is the responsibility of the caller)
++func_lt_dump_args ()
++{
++  lt_dump_args_N=1;
++  for lt_arg
++  do
++    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
++    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
++  done
++}
  
 -	tmp_deplibs=
 -	for test_deplib in $deplibs; do
 -		case " $convenience " in
 -		*" $test_deplib "*) ;;
--		*) 
+-		*)
 -			tmp_deplibs="$tmp_deplibs $test_deplib"
 -			;;
 -		esac
 -	done
--	deplibs="$tmp_deplibs" 
-+	    cat <<"EOF"
-+	  printf ("%s", script_text_part1);
-+	  printf ("%s", script_text_part2);
-+	  return 0;
-+	}
-+    }
-+
-+  newargz = XMALLOC (char *, argc + 1);
-+  tmp_pathspec = find_executable (argv[0]);
-+  if (tmp_pathspec == NULL)
-+    lt_fatal ("Couldn't find %s", argv[0]);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-+			  tmp_pathspec));
-+
-+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-+			  actual_cwrapper_path));
-+  XFREE (tmp_pathspec);
-+
-+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-+
-+  /* wrapper name transforms */
-+  strendzap (actual_cwrapper_name, ".exe");
-+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-+  XFREE (actual_cwrapper_name);
-+  actual_cwrapper_name = tmp_pathspec;
-+  tmp_pathspec = 0;
-+
-+  /* target_name transforms -- use actual target program name; might have lt- prefix */
-+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-+  strendzap (target_name, ".exe");
-+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-+  XFREE (target_name);
-+  target_name = tmp_pathspec;
-+  tmp_pathspec = 0;
+-	deplibs="$tmp_deplibs"
++# Core function for launching the target application
++func_exec_program_core ()
++{
++"
++  case $host in
++  # Backslashes separate directories on plain windows
++  *-*-mingw | *-*-os2* | *-cegcc*)
++    $ECHO "\
++      if test -n \"\$lt_option_debug\"; then
++        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
++        func_lt_dump_args \${1+\"\$@\"} 1>&2
++      fi
++      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
++"
++    ;;
  
 -	if test -n "$convenience"; then
 -	  if test -n "$whole_archive_flag_spec"; then
@@ -25866,197 +25704,53 @@
 -	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 -	  else
 -	    gentop="$output_objdir/${outputname}x"
--	    $show "${rm}r $gentop"
--	    $run ${rm}r "$gentop"
--	    $show "$mkdir $gentop"
--	    $run $mkdir "$gentop"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$gentop"; then
--	      exit $status
--	    fi
 -	    generated="$generated $gentop"
-+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-+			  target_name));
-+EOF
++  *)
++    $ECHO "\
++      if test -n \"\$lt_option_debug\"; then
++        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
++        func_lt_dump_args \${1+\"\$@\"} 1>&2
++      fi
++      exec \"\$progdir/\$program\" \${1+\"\$@\"}
++"
++    ;;
++  esac
++  $ECHO "\
++      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
++      exit 1
++}
  
--	    for xlib in $convenience; do
--	      # Extract the objects.
--	      case $xlib in
--	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	      *) xabs=`pwd`"/$xlib" ;;
--	      esac
--	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	      xdir="$gentop/$xlib"
-+	    cat <<EOF
-+  newargz[0] =
-+    XMALLOC (char, (strlen (actual_cwrapper_path) +
-+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-+  strcpy (newargz[0], actual_cwrapper_path);
-+  strcat (newargz[0], "$objdir");
-+  strcat (newargz[0], "/");
-+EOF
- 
--	      $show "${rm}r $xdir"
--	      $run ${rm}r "$xdir"
--	      $show "$mkdir $xdir"
--	      $run $mkdir "$xdir"
--	      status=$?
--	      if test "$status" -ne 0 && test ! -d "$xdir"; then
--		exit $status
--	      fi
--	      # We will extract separately just the conflicting names and we will no
--	      # longer touch any unique names. It is faster to leave these extract
--	      # automatically by $AR in one run.
--	      $show "(cd $xdir && $AR x $xabs)"
--	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--		:
--	      else
--		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--		$AR t "$xabs" | sort | uniq -cd | while read -r count name
--		do
--		  i=1
--		  while test "$i" -le "$count"
--		  do
--		   # Put our $i before any first dot (extension)
--		   # Never overwrite any file
--		   name_to="$name"
--		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		   do
--		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		   done
--		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		   i=`expr $i + 1`
--		  done
--		done
--	      fi
-+	    cat <<"EOF"
-+  /* stop here, and copy so we don't have to do this twice */
-+  tmp_pathspec = xstrdup (newargz[0]);
-+
-+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-+  strcat (newargz[0], actual_cwrapper_name);
-+
-+  /* DO want the lt- prefix here if it exists, so use target_name */
-+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-+  XFREE (tmp_pathspec);
-+  tmp_pathspec = NULL;
-+EOF
- 
--	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	    done
+-	    func_extract_archives $gentop $convenience
+-	    libobjs="$libobjs $func_extract_archives_result"
 -	  fi
 -	fi
-+	    case $host_os in
-+	      mingw*)
-+	    cat <<"EOF"
-+  {
-+    char* p;
-+    while ((p = strchr (newargz[0], '\\')) != NULL)
-+      {
-+	*p = '/';
-+      }
-+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-+      {
-+	*p = '/';
-+      }
-+  }
-+EOF
-+	    ;;
-+	    esac
- 
+-	
 -	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 -	  eval flag=\"$thread_safe_flag_spec\"
 -	  linker_flags="$linker_flags $flag"
 -	fi
-+	    cat <<"EOF"
-+  XFREE (target_name);
-+  XFREE (actual_cwrapper_path);
-+  XFREE (actual_cwrapper_name);
-+
-+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
++# A function to encapsulate launching the target application
++# Strips options in the --lt-* namespace from \$@ and
++# launches target application with the remaining arguments.
++func_exec_program ()
++{
++  for lt_wr_arg
++  do
++    case \$lt_wr_arg in
++    --lt-*) ;;
++    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
++    esac
++    shift
++  done
++  func_exec_program_core \${1+\"\$@\"}
++}
  
 -	# Make a backup of the uninstalled library when relinking
 -	if test "$mode" = relink; then
 -	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
 -	fi
-+  newargc=0;
-+  for (i = 1; i < argc; i++)
-+    {
-+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-+        {
-+          if (argv[i][env_set_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_set_opt_len + 1;
-+              lt_opt_process_env_set (p);
-+            }
-+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_set (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_set_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-+        {
-+          if (argv[i][env_prepend_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_prepend_opt_len + 1;
-+              lt_opt_process_env_prepend (p);
-+            }
-+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_prepend_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-+        {
-+          if (argv[i][env_append_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_append_opt_len + 1;
-+              lt_opt_process_env_append (p);
-+            }
-+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_append (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_append_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-+        {
-+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-+             namespace, but it is not one of the ones we know about and
-+             have already dealt with, above (inluding dump-script), then
-+             report an error. Otherwise, targets might begin to believe
-+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-+             namespace. The first time any user complains about this, we'll
-+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-+             or a configure.ac-settable value.
-+           */
-+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-+                    ltwrapper_option_prefix, argv[i]);
-+        }
-+      /* otherwise ... */
-+      newargz[++newargc] = xstrdup (argv[i]);
-+    }
-+  newargz[++newargc] = NULL;
-+
-+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-+  for (i = 0; i < newargc; i++)
-+    {
-+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-+    }
++  # Parse options
++  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
  
 -	# Do each of the archive commands.
 -	if test "$module" = yes && test -n "$module_cmds" ; then
@@ -26076,35 +25770,21 @@
 -	  cmds=$archive_cmds
 -	  fi
 -	fi
-+EOF
++  # Find the directory that this script lives in.
++  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
++  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
  
--	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+-	if test "X$skipped_export" != "X:" &&
+-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 -	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 -	  :
 -	else
 -	  # The command line is too long to link in one step, link piecewise.
 -	  $echo "creating reloadable object files..."
-+	    case $host_os in
-+	      mingw*)
-+		cat <<"EOF"
-+  /* execv doesn't actually work on mingw as expected on unix */
-+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-+  if (rval == -1)
-+    {
-+      /* failed to start process */
-+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-+      return 127;
-+    }
-+  return rval;
-+EOF
-+		;;
-+	      *)
-+		cat <<"EOF"
-+  execv (lt_argv_zero, newargz);
-+  return rval; /* =127, but avoids unused variable warning */
-+EOF
-+		;;
-+	    esac
++  # Follow symbolic links until we get to the real thisdir.
++  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
++  while test -n \"\$file\"; do
++    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
  
 -	  # Save the value of $output and $libobjs because we want to
 -	  # use them later.  If we have whole_archive_flag_spec, we
@@ -26118,8 +25798,14 @@
 -	    save_libobjs=$libobjs
 -	  fi
 -	  save_output=$output
-+	    cat <<"EOF"
-+}
+-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
++    # If there was a directory component, then change thisdir.
++    if test \"x\$destdir\" != \"x\$file\"; then
++      case \"\$destdir\" in
++      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
++      *) thisdir=\"\$thisdir/\$destdir\" ;;
++      esac
++    fi
  
 -	  # Clear the reloadable object creation command queue and
 -	  # initialize k to one.
@@ -26129,13 +25815,13 @@
 -	  delfiles=
 -	  last_robj=
 -	  k=1
--	  output=$output_objdir/$save_output-${k}.$objext
+-	  output=$output_objdir/$output_la-${k}.$objext
 -	  # Loop over the list of objects to be linked.
 -	  for obj in $save_libobjs
 -	  do
 -	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
 -	    if test "X$objlist" = X ||
--	       { len=`expr "X$test_cmds" : ".*"` &&
+-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 -		 test "$len" -le "$max_cmd_len"; }; then
 -	      objlist="$objlist $obj"
 -	    else
@@ -26149,9 +25835,9 @@
 -		# the last one created.
 -		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
 -	      fi
--	      last_robj=$output_objdir/$save_output-${k}.$objext
+-	      last_robj=$output_objdir/$output_la-${k}.$objext
 -	      k=`expr $k + 1`
--	      output=$output_objdir/$save_output-${k}.$objext
+-	      output=$output_objdir/$output_la-${k}.$objext
 -	      objlist=$obj
 -	      len=1
 -	    fi
@@ -26161,12 +25847,9 @@
 -	  # files will link in the last one created.
 -	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 -	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-+void *
-+xmalloc (size_t num)
-+{
-+  void *p = (void *) malloc (num);
-+  if (!p)
-+    lt_fatal ("Memory exhausted");
++    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
++    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
++  done
  
 -	  if ${skipped_export-false}; then
 -	    $show "generating symbol list for \`$libname.la'"
@@ -26177,58 +25860,61 @@
 -	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
 -          fi
 -
--	  # Set up a command to remove the reloadale object files
+-	  # Set up a command to remove the reloadable object files
 -	  # after they are used.
 -	  i=0
 -	  while test "$i" -lt "$k"
 -	  do
 -	    i=`expr $i + 1`
--	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
 -	  done
-+  return p;
-+}
++  # Usually 'no', except on cygwin/mingw when embedded into
++  # the cwrapper.
++  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
++  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
++    # special case for '.'
++    if test \"\$thisdir\" = \".\"; then
++      thisdir=\`pwd\`
++    fi
++    # remove .libs from thisdir
++    case \"\$thisdir\" in
++    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
++    $objdir )   thisdir=. ;;
++    esac
++  fi
  
 -	  $echo "creating a temporary reloadable object file: $output"
-+char *
-+xstrdup (const char *string)
-+{
-+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-+			  string) : NULL;
-+}
++  # Try to get the absolute directory name.
++  absdir=\`cd \"\$thisdir\" && pwd\`
++  test -n \"\$absdir\" && thisdir=\"\$absdir\"
++"
  
 -	  # Loop through the commands generated above and execute them.
 -	  save_ifs="$IFS"; IFS='~'
 -	  for cmd in $concat_cmds; do
 -	    IFS="$save_ifs"
--	    eval cmd=\"$cmd\"
 -	    $show "$cmd"
 -	    $run eval "$cmd" || exit $?
 -	  done
 -	  IFS="$save_ifs"
-+const char *
-+base_name (const char *name)
-+{
-+  const char *base;
++	if test "$fast_install" = yes; then
++	  $ECHO "\
++  program=lt-'$outputname'$exeext
++  progdir=\"\$thisdir/$objdir\"
  
 -	  libobjs=$output
 -	  # Restore the value of output.
 -	  output=$save_output
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+  /* Skip over the disk name in MSDOS pathnames. */
-+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-+    name += 2;
-+#endif
++  if test ! -f \"\$progdir/\$program\" ||
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
++       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
  
 -	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
 -	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 -	  fi
 -	  # Expand the library linking commands again to reset the
 -	  # value of $libobjs for piecewise linking.
-+  for (base = name; *name; name++)
-+    if (IS_DIR_SEPARATOR (*name))
-+      base = name + 1;
-+  return base;
-+}
++    file=\"\$\$-\$program\"
  
 -	  # Do each of the archive commands.
 -	  if test "$module" = yes && test -n "$module_cmds" ; then
@@ -26244,10 +25930,11 @@
 -	    cmds=$archive_cmds
 -	    fi
 -	  fi
-+int
-+check_executable (const char *path)
-+{
-+  struct stat st;
++    if test ! -d \"\$progdir\"; then
++      $MKDIR \"\$progdir\"
++    else
++      $RM \"\$progdir/\$file\"
++    fi"
  
 -	  # Append the command to remove the reloadable object files
 -	  # to the just-reset $cmds.
@@ -26258,31 +25945,65 @@
 -	  IFS="$save_ifs"
 -	  eval cmd=\"$cmd\"
 -	  $show "$cmd"
--	  $run eval "$cmd" || exit $?
+-	  $run eval "$cmd" || {
+-	    lt_exit=$?
++	  $ECHO "\
+ 
+-	    # Restore the uninstalled library and exit
+-	    if test "$mode" = relink; then
+-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+-	    fi
++    # relink executable if necessary
++    if test -n \"\$relink_command\"; then
++      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
++      else
++	$ECHO \"\$relink_command_output\" >&2
++	$RM \"\$progdir/\$file\"
++	exit 1
++      fi
++    fi
+ 
+-	    exit $lt_exit
+-	  }
 -	done
 -	IFS="$save_ifs"
-+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  if ((!path) || (!*path))
-+    return 0;
-+
-+  if ((stat (path, &st) >= 0)
-+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-+    return 1;
-+  else
-+    return 0;
-+}
++    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
++    { $RM \"\$progdir/\$program\";
++      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
++    $RM \"\$progdir/\$file\"
++  fi"
++	else
++	  $ECHO "\
++  program='$outputname'
++  progdir=\"\$thisdir/$objdir\"
++"
++	fi
  
 -	# Restore the uninstalled library and exit
 -	if test "$mode" = relink; then
 -	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
--	  exit 0
--	fi
-+int
-+make_executable (const char *path)
-+{
-+  int rval = 0;
-+  struct stat st;
++	$ECHO "\
+ 
+-	  if test -n "$convenience"; then
+-	    if test -z "$whole_archive_flag_spec"; then
+-	      $show "${rm}r $gentop"
+-	      $run ${rm}r "$gentop"
+-	    fi
+-	  fi
++  if test -f \"\$progdir/\$program\"; then"
+ 
+-	  exit $EXIT_SUCCESS
++	# fixup the dll searchpath if we need to.
++	#
++	# Fix the DLL searchpath if we need to.  Do this before prepending
++	# to shlibpath, because on Windows, both are PATH and uninstalled
++	# libraries must come first.
++	if test -n "$dllsearchpath"; then
++	  $ECHO "\
++    # Add the dll search path components to the executable PATH
++    PATH=$dllsearchpath:\$PATH
++"
+ 	fi
  
 -	# Create links to the real library.
 -	for linkname in $linknames; do
@@ -26291,17 +26012,11 @@
 -	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
 -	  fi
 -	done
-+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  if ((!path) || (!*path))
-+    return 0;
-+
-+  if (stat (path, &st) >= 0)
-+    {
-+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-+    }
-+  return rval;
-+}
++	# Export our shlibpath_var if we have one.
++	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	  $ECHO "\
++    # Add our own library path to $shlibpath_var
++    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
  
 -	# If -module or -export-dynamic was specified, set the dlname.
 -	if test "$module" = yes || test "$export_dynamic" = yes; then
@@ -26310,198 +26025,69 @@
 -	fi
 -      fi
 -      ;;
-+/* Searches for the full path of the wrapper.  Returns
-+   newly allocated full path name if found, NULL otherwise
-+   Does not chase symlinks, even on platforms that support them.
-+*/
-+char *
-+find_executable (const char *wrapper)
-+{
-+  int has_slash = 0;
-+  const char *p;
-+  const char *p_next;
-+  /* static buffer for getcwd */
-+  char tmp[LT_PATHMAX + 1];
-+  int tmp_len;
-+  char *concat_name;
++    # Some systems cannot cope with colon-terminated $shlibpath_var
++    # The second colon is a workaround for a bug in BeOS R4 sed
++    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
  
 -    obj)
 -      if test -n "$deplibs"; then
 -	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
 -      fi
-+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
++    export $shlibpath_var
++"
++	fi
  
 -      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 -	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
 -      fi
-+  if ((wrapper == NULL) || (*wrapper == '\0'))
-+    return NULL;
++	$ECHO "\
++    if test \"\$libtool_execute_magic\" != \"$magic\"; then
++      # Run the actual program with our arguments.
++      func_exec_program \${1+\"\$@\"}
++    fi
++  else
++    # The program doesn't exist.
++    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
++    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
++    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
++    exit 1
++  fi
++fi\
++"
++}
  
 -      if test -n "$rpath"; then
 -	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
 -      fi
-+  /* Absolute path? */
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-+    {
-+      concat_name = xstrdup (wrapper);
-+      if (check_executable (concat_name))
-+	return concat_name;
-+      XFREE (concat_name);
-+    }
-+  else
-+    {
-+#endif
-+      if (IS_DIR_SEPARATOR (wrapper[0]))
-+	{
-+	  concat_name = xstrdup (wrapper);
-+	  if (check_executable (concat_name))
-+	    return concat_name;
-+	  XFREE (concat_name);
-+	}
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+    }
-+#endif
  
 -      if test -n "$xrpath"; then
 -	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
 -      fi
-+  for (p = wrapper; *p; p++)
-+    if (*p == '/')
-+      {
-+	has_slash = 1;
-+	break;
-+      }
-+  if (!has_slash)
-+    {
-+      /* no slashes; search PATH */
-+      const char *path = getenv ("PATH");
-+      if (path != NULL)
-+	{
-+	  for (p = path; *p; p = p_next)
-+	    {
-+	      const char *q;
-+	      size_t p_len;
-+	      for (q = p; *q; q++)
-+		if (IS_PATH_SEPARATOR (*q))
-+		  break;
-+	      p_len = q - p;
-+	      p_next = (*q == '\0' ? q : q + 1);
-+	      if (p_len == 0)
-+		{
-+		  /* empty path: current directory */
-+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-+		    lt_fatal ("getcwd failed");
-+		  tmp_len = strlen (tmp);
-+		  concat_name =
-+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-+		  memcpy (concat_name, tmp, tmp_len);
-+		  concat_name[tmp_len] = '/';
-+		  strcpy (concat_name + tmp_len + 1, wrapper);
-+		}
-+	      else
-+		{
-+		  concat_name =
-+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-+		  memcpy (concat_name, p, p_len);
-+		  concat_name[p_len] = '/';
-+		  strcpy (concat_name + p_len + 1, wrapper);
-+		}
-+	      if (check_executable (concat_name))
-+		return concat_name;
-+	      XFREE (concat_name);
-+	    }
-+	}
-+      /* not found in PATH; assume curdir */
-+    }
-+  /* Relative path | not found in path: prepend cwd */
-+  if (getcwd (tmp, LT_PATHMAX) == NULL)
-+    lt_fatal ("getcwd failed");
-+  tmp_len = strlen (tmp);
-+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-+  memcpy (concat_name, tmp, tmp_len);
-+  concat_name[tmp_len] = '/';
-+  strcpy (concat_name + tmp_len + 1, wrapper);
-+
-+  if (check_executable (concat_name))
-+    return concat_name;
-+  XFREE (concat_name);
-+  return NULL;
-+}
++# func_emit_cwrapperexe_src
++# emit the source code for a wrapper executable on stdout
++# Must ONLY be called from within func_mode_link because
++# it depends on a number of variable set therein.
++func_emit_cwrapperexe_src ()
++{
++	cat <<EOF
  
 -      if test -n "$vinfo"; then
 -	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
 -      fi
-+char *
-+chase_symlinks (const char *pathspec)
-+{
-+#ifndef S_ISLNK
-+  return xstrdup (pathspec);
-+#else
-+  char buf[LT_PATHMAX];
-+  struct stat s;
-+  char *tmp_pathspec = xstrdup (pathspec);
-+  char *p;
-+  int has_symlinks = 0;
-+  while (strlen (tmp_pathspec) && !has_symlinks)
-+    {
-+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-+			      tmp_pathspec));
-+      if (lstat (tmp_pathspec, &s) == 0)
-+	{
-+	  if (S_ISLNK (s.st_mode) != 0)
-+	    {
-+	      has_symlinks = 1;
-+	      break;
-+	    }
-+
-+	  /* search backwards for last DIR_SEPARATOR */
-+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-+	    p--;
-+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-+	    {
-+	      /* no more DIR_SEPARATORS left */
-+	      break;
-+	    }
-+	  *p = '\0';
-+	}
-+      else
-+	{
-+	  char *errstr = strerror (errno);
-+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-+	}
-+    }
-+  XFREE (tmp_pathspec);
-+
-+  if (!has_symlinks)
-+    {
-+      return xstrdup (pathspec);
-+    }
-+
-+  tmp_pathspec = realpath (pathspec, buf);
-+  if (tmp_pathspec == 0)
-+    {
-+      lt_fatal ("Could not follow symlinks for %s", pathspec);
-+    }
-+  return xstrdup (tmp_pathspec);
-+#endif
-+}
++/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
++   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
  
 -      if test -n "$release"; then
 -	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
 -      fi
-+char *
-+strendzap (char *str, const char *pat)
-+{
-+  size_t len, patlen;
++   The $output program cannot be directly executed until all the libtool
++   libraries that it depends on are installed.
  
 -      case $output in
 -      *.lo)
 -	if test -n "$objs$old_deplibs"; then
 -	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	fi
 -	libobj="$output"
 -	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
@@ -26511,13 +26097,51 @@
 -	obj="$output"
 -	;;
 -      esac
-+  assert (str != NULL);
-+  assert (pat != NULL);
++   This wrapper executable should never be moved out of the build directory.
++   If it is, it will not operate correctly.
++*/
++EOF
++	    cat <<"EOF"
++#ifdef _MSC_VER
++# define _CRT_SECURE_NO_DEPRECATE 1
++#endif
++#include <stdio.h>
++#include <stdlib.h>
++#ifdef _MSC_VER
++# include <direct.h>
++# include <process.h>
++# include <io.h>
++#else
++# include <unistd.h>
++# include <stdint.h>
++# ifdef __CYGWIN__
++#  include <io.h>
++# endif
++#endif
++#include <malloc.h>
++#include <stdarg.h>
++#include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <sys/stat.h>
  
 -      # Delete the old objects.
 -      $run $rm $obj $libobj
-+  len = strlen (str);
-+  patlen = strlen (pat);
++/* declarations of non-ANSI functions */
++#if defined(__MINGW32__)
++# ifdef __STRICT_ANSI__
++int _putenv (const char *);
++# endif
++#elif defined(__CYGWIN__)
++# ifdef __STRICT_ANSI__
++char *realpath (const char *, char *);
++int putenv (char *);
++int setenv (const char *, const char *, int);
++# endif
++/* #elif defined (other platforms) ... */
++#endif
  
 -      # Objects from convenience libraries.  This assumes
 -      # single-version convenience libraries.  Whenever we create
@@ -26526,151 +26150,66 @@
 -      reload_conv_objs=
 -      gentop=
 -      # reload_cmds runs $LD directly, so let us get rid of
--      # -Wl from whole_archive_flag_spec
+-      # -Wl from whole_archive_flag_spec and hope we can get by with
+-      # turning comma into space..
 -      wl=
-+  if (patlen <= len)
-+    {
-+      str += len - patlen;
-+      if (strcmp (str, pat) == 0)
-+	*str = '\0';
-+    }
-+  return str;
-+}
++/* portability defines, excluding path handling macros */
++#if defined(_MSC_VER)
++# define setmode _setmode
++# define stat    _stat
++# define chmod   _chmod
++# define getcwd  _getcwd
++# define putenv  _putenv
++# define S_IXUSR _S_IEXEC
++# ifndef _INTPTR_T_DEFINED
++#  define _INTPTR_T_DEFINED
++#  define intptr_t int
++# endif
++#elif defined(__MINGW32__)
++# define setmode _setmode
++# define stat    _stat
++# define chmod   _chmod
++# define getcwd  _getcwd
++# define putenv  _putenv
++#elif defined(__CYGWIN__)
++# define HAVE_SETENV
++# define FOPEN_WB "wb"
++/* #elif defined (other platforms) ... */
++#endif
  
 -      if test -n "$convenience"; then
 -	if test -n "$whole_archive_flag_spec"; then
--	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+-      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 -	else
 -	  gentop="$output_objdir/${obj}x"
--	  $show "${rm}r $gentop"
--	  $run ${rm}r "$gentop"
--	  $show "$mkdir $gentop"
--	  $run $mkdir "$gentop"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$gentop"; then
--	    exit $status
--	  fi
 -	  generated="$generated $gentop"
-+static void
-+lt_error_core (int exit_status, const char *mode,
-+	       const char *message, va_list ap)
-+{
-+  fprintf (stderr, "%s: %s: ", program_name, mode);
-+  vfprintf (stderr, message, ap);
-+  fprintf (stderr, ".\n");
- 
--	  for xlib in $convenience; do
--	    # Extract the objects.
--	    case $xlib in
--	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	    *) xabs=`pwd`"/$xlib" ;;
--	    esac
--	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	    xdir="$gentop/$xlib"
-+  if (exit_status >= 0)
-+    exit (exit_status);
-+}
++#if defined(PATH_MAX)
++# define LT_PATHMAX PATH_MAX
++#elif defined(MAXPATHLEN)
++# define LT_PATHMAX MAXPATHLEN
++#else
++# define LT_PATHMAX 1024
++#endif
  
--	    $show "${rm}r $xdir"
--	    $run ${rm}r "$xdir"
--	    $show "$mkdir $xdir"
--	    $run $mkdir "$xdir"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$xdir"; then
--	      exit $status
--	    fi
--	    # We will extract separately just the conflicting names and we will no
--	    # longer touch any unique names. It is faster to leave these extract
--	    # automatically by $AR in one run.
--	    $show "(cd $xdir && $AR x $xabs)"
--	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	      :
--	    else
--	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	      do
--		i=1
--		while test "$i" -le "$count"
--		do
--		 # Put our $i before any first dot (extension)
--		 # Never overwrite any file
--		 name_to="$name"
--		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		 do
--		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		 done
--		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		 i=`expr $i + 1`
--		done
--	      done
--	    fi
-+void
-+lt_fatal (const char *message, ...)
-+{
-+  va_list ap;
-+  va_start (ap, message);
-+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-+  va_end (ap);
-+}
- 
--	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	  done
+-	  func_extract_archives $gentop $convenience
+-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 -	fi
 -      fi
-+void
-+lt_setenv (const char *name, const char *value)
-+{
-+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
-+  {
-+#ifdef HAVE_SETENV
-+    /* always make a copy, for consistency with !HAVE_SETENV */
-+    char *str = xstrdup (value);
-+    setenv (name, str, 1);
-+#else
-+    int len = strlen (name) + 1 + strlen (value) + 1;
-+    char *str = XMALLOC (char, len);
-+    sprintf (str, "%s=%s", name, value);
-+    if (putenv (str) != EXIT_SUCCESS)
-+      {
-+        XFREE (str);
-+      }
++#ifndef S_IXOTH
++# define S_IXOTH 0
++#endif
++#ifndef S_IXGRP
++# define S_IXGRP 0
 +#endif
-+  }
-+}
  
 -      # Create the old-style object.
 -      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+char *
-+lt_extend_str (const char *orig_value, const char *add, int to_end)
-+{
-+  char *new_value;
-+  if (orig_value && *orig_value)
-+    {
-+      int orig_value_len = strlen (orig_value);
-+      int add_len = strlen (add);
-+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-+      if (to_end)
-+        {
-+          strcpy (new_value, orig_value);
-+          strcpy (new_value + orig_value_len, add);
-+        }
-+      else
-+        {
-+          strcpy (new_value, add);
-+          strcpy (new_value + add_len, orig_value);
-+        }
-+    }
-+  else
-+    {
-+      new_value = xstrdup (add);
-+    }
-+  return new_value;
-+}
++/* path handling portability macros */
++#ifndef DIR_SEPARATOR
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
++#endif
  
 -      output="$obj"
 -      cmds=$reload_cmds
@@ -26682,13 +26221,17 @@
 -	$run eval "$cmd" || exit $?
 -      done
 -      IFS="$save_ifs"
-+int
-+lt_split_name_value (const char *arg, char** name, char** value)
-+{
-+  const char *p;
-+  int len;
-+  if (!arg || !*arg)
-+    return 1;
++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
++  defined (__OS2__)
++# define HAVE_DOS_BASED_FILE_SYSTEM
++# define FOPEN_WB "wb"
++# ifndef DIR_SEPARATOR_2
++#  define DIR_SEPARATOR_2 '\\'
++# endif
++# ifndef PATH_SEPARATOR_2
++#  define PATH_SEPARATOR_2 ';'
++# endif
++#endif
  
 -      # Exit if we aren't doing a library object file.
 -      if test -z "$libobj"; then
@@ -26696,30 +26239,43 @@
 -	  $show "${rm}r $gentop"
 -	  $run ${rm}r $gentop
 -	fi
-+  p = strchr (arg, (int)'=');
++#ifndef DIR_SEPARATOR_2
++# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
++#else /* DIR_SEPARATOR_2 */
++# define IS_DIR_SEPARATOR(ch) \
++	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
++#endif /* DIR_SEPARATOR_2 */
  
--	exit 0
+-	exit $EXIT_SUCCESS
 -      fi
-+  if (!p)
-+    return 1;
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
  
 -      if test "$build_libtool_libs" != yes; then
 -	if test -n "$gentop"; then
 -	  $show "${rm}r $gentop"
 -	  $run ${rm}r $gentop
 -	fi
-+  *value = xstrdup (++p);
++#ifndef FOPEN_WB
++# define FOPEN_WB "w"
++#endif
++#ifndef _O_BINARY
++# define _O_BINARY 0
++#endif
  
 -	# Create an invalid libtool object if no PIC, so that we don't
 -	# accidentally link it into a program.
 -	# $show "echo timestamp > $libobj"
 -	# $run eval "echo timestamp > $libobj" || exit $?
--	exit 0
+-	exit $EXIT_SUCCESS
 -      fi
-+  len = strlen (arg) - strlen (*value);
-+  *name = XMALLOC (char, len);
-+  strncpy (*name, arg, len-1);
-+  (*name)[len - 1] = '\0';
++#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
++#define XFREE(stale) do { \
++  if (stale) { free ((void *) stale); stale = 0; } \
++} while (0)
  
 -      if test -n "$pic_flag" || test "$pic_mode" != default; then
 -	# Only do commands if we really have different PIC objects.
@@ -26735,32 +26291,39 @@
 -	done
 -	IFS="$save_ifs"
 -      fi
-+  return 0;
-+}
++#if defined(LT_DEBUGWRAPPER)
++static int lt_debug = 1;
++#else
++static int lt_debug = 0;
++#endif
  
 -      if test -n "$gentop"; then
 -	$show "${rm}r $gentop"
 -	$run ${rm}r $gentop
 -      fi
-+void
-+lt_opt_process_env_set (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
  
--      exit 0
+-      exit $EXIT_SUCCESS
 -      ;;
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-+    }
-+
-+  lt_setenv (name, value);
-+  XFREE (name);
-+  XFREE (value);
-+}
++void *xmalloc (size_t num);
++char *xstrdup (const char *string);
++const char *base_name (const char *name);
++char *find_executable (const char *wrapper);
++char *chase_symlinks (const char *pathspec);
++int make_executable (const char *path);
++int check_executable (const char *path);
++char *strendzap (char *str, const char *pat);
++void lt_debugprintf (const char *file, int line, const char *fmt, ...);
++void lt_fatal (const char *file, int line, const char *message, ...);
++static const char *nonnull (const char *s);
++static const char *nonempty (const char *s);
++void lt_setenv (const char *name, const char *value);
++char *lt_extend_str (const char *orig_value, const char *add, int to_end);
++void lt_update_exe_path (const char *name, const char *value);
++void lt_update_lib_path (const char *name, const char *value);
++char **prepare_spawn (char **argv);
++void lt_dump_script (FILE *f);
++EOF
  
 -    prog)
 -      case $host in
@@ -26769,50 +26332,24 @@
 -      if test -n "$vinfo"; then
 -	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
 -      fi
-+void
-+lt_opt_process_env_prepend (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
-+  char *new_value = NULL;
-+
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-+    }
-+
-+  new_value = lt_extend_str (getenv (name), value, 0);
-+  lt_setenv (name, new_value);
-+  XFREE (new_value);
-+  XFREE (name);
-+  XFREE (value);
-+}
++	    cat <<EOF
++volatile const char * MAGIC_EXE = "$magic_exe";
++const char * LIB_PATH_VARNAME = "$shlibpath_var";
++EOF
  
 -      if test -n "$release"; then
 -	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
 -      fi
-+void
-+lt_opt_process_env_append (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
-+  char *new_value = NULL;
-+
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-+    }
-+
-+  new_value = lt_extend_str (getenv (name), value, 1);
-+  lt_setenv (name, new_value);
-+  XFREE (new_value);
-+  XFREE (name);
-+  XFREE (value);
-+}
++	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++              func_to_host_path "$temp_rpath"
++	      cat <<EOF
++const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
++EOF
++	    else
++	      cat <<"EOF"
++const char * LIB_PATH_VALUE   = "";
++EOF
++	    fi
  
 -      if test "$preload" = yes; then
 -	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
@@ -26820,26 +26357,18 @@
 -	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
 -	fi
 -      fi
-+void
-+lt_update_exe_path (const char *name, const char *value)
-+{
-+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
-+
-+  if (name && *name && value && *value)
-+    {
-+      char *new_value = lt_extend_str (getenv (name), value, 0);
-+      /* some systems can't cope with a ':'-terminated path #' */
-+      int len = strlen (new_value);
-+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-+        {
-+          new_value[len-1] = '\0';
-+        }
-+      lt_setenv (name, new_value);
-+      XFREE (new_value);
-+    }
-+}
++	    if test -n "$dllsearchpath"; then
++              func_to_host_path "$dllsearchpath:"
++	      cat <<EOF
++const char * EXE_PATH_VARNAME = "PATH";
++const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
++EOF
++	    else
++	      cat <<"EOF"
++const char * EXE_PATH_VARNAME = "";
++const char * EXE_PATH_VALUE   = "";
++EOF
++	    fi
  
 -      case $host in
 -      *-*-rhapsody* | *-*-darwin1.[012])
@@ -26848,20 +26377,15 @@
 -	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
 -	;;
 -      esac
-+void
-+lt_update_lib_path (const char *name, const char *value)
-+{
-+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
-+
-+  if (name && *name && value && *value)
-+    {
-+      char *new_value = lt_extend_str (getenv (name), value, 0);
-+      lt_setenv (name, new_value);
-+      XFREE (new_value);
-+    }
-+}
++	    if test "$fast_install" = yes; then
++	      cat <<EOF
++const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
++EOF
++	    else
++	      cat <<EOF
++const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
++EOF
++	    fi
  
 -      case $host in
 -      *darwin*)
@@ -26873,11 +26397,53 @@
 -        ;;
 -      esac
  
++	    cat <<"EOF"
+ 
+-      # move library search paths that coincide with paths to not yet
+-      # installed libraries to the beginning of the library search list
+-      new_libs=
+-      for path in $notinst_path; do
+-	case " $new_libs " in
+-	*" -L$path/$objdir "*) ;;
+-	*)
+-	  case " $compile_deplibs " in
+-	  *" -L$path/$objdir "*)
+-	    new_libs="$new_libs -L$path/$objdir" ;;
+-	  esac
+-	  ;;
+-	esac
+-      done
+-      for deplib in $compile_deplibs; do
+-	case $deplib in
+-	-L*)
+-	  case " $new_libs " in
+-	  *" $deplib "*) ;;
+-	  *) new_libs="$new_libs $deplib" ;;
+-	  esac
+-	  ;;
+-	*) new_libs="$new_libs $deplib" ;;
+-	esac
+-      done
+-      compile_deplibs="$new_libs"
++#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+ 
++static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
++static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
++static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+ 
 -      compile_command="$compile_command $compile_deplibs"
 -      finalize_command="$finalize_command $finalize_deplibs"
-+EOF
-+}
-+# end: func_emit_cwrapperexe_src
++int
++main (int argc, char *argv[])
++{
++  char **newargz;
++  int  newargc;
++  char *tmp_pathspec;
++  char *actual_cwrapper_path;
++  char *actual_cwrapper_name;
++  char *target_name;
++  char *lt_argv_zero;
++  intptr_t rval = 127;
  
 -      if test -n "$rpath$xrpath"; then
 -	# If the user specified any rpath flags, then add them.
@@ -26889,17 +26455,7 @@
 -	  esac
 -	done
 -      fi
-+# func_mode_link arg...
-+func_mode_link ()
-+{
-+    $opt_debug
-+    case $host in
-+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+      # It is impossible to link a dll without this setting, and
-+      # we shouldn't force the makefile maintainer to figure out
-+      # which system we are compiling for in order to pass an extra
-+      # flag for every libtool invocation.
-+      # allow_undefined=no
++  int i;
  
 -      # Now hardcode the library paths
 -      rpath=
@@ -26931,10 +26487,15 @@
 -	fi
 -	case $host in
 -	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+-	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
 -	  case :$dllsearchpath: in
 -	  *":$libdir:"*) ;;
 -	  *) dllsearchpath="$dllsearchpath:$libdir";;
 -	  esac
+-	  case :$dllsearchpath: in
+-	  *":$testbindir:"*) ;;
+-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+-	  esac
 -	  ;;
 -	esac
 -      done
@@ -26945,7 +26506,9 @@
 -	eval rpath=\" $hardcode_libdir_flag_spec\"
 -      fi
 -      compile_rpath="$rpath"
--
++  program_name = (char *) xstrdup (base_name (argv[0]));
++  newargz = XMALLOC (char *, argc + 1);
+ 
 -      rpath=
 -      hardcode_libdirs=
 -      for libdir in $finalize_rpath; do
@@ -26960,8 +26523,22 @@
 -		;;
 -	      *)
 -		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
--		;;
--	      esac
++  /* very simple arg parsing; don't want to rely on getopt
++   * also, copy all non cwrapper options to newargz, except
++   * argz[0], which is handled differently
++   */
++  newargc=0;
++  for (i = 1; i < argc; i++)
++    {
++      if (strcmp (argv[i], dumpscript_opt) == 0)
++	{
++EOF
++	    case "$host" in
++	      *mingw* | *cygwin* )
++		# make stdout use "unix" line endings
++		echo "          setmode(1,_O_BINARY);"
+ 		;;
+ 	      esac
 -	    fi
 -	  else
 -	    eval flag=\"$hardcode_libdir_flag_spec\"
@@ -26981,13 +26558,41 @@
 -	eval rpath=\" $hardcode_libdir_flag_spec\"
 -      fi
 -      finalize_rpath="$rpath"
--
+ 
 -      if test -n "$libobjs" && test "$build_old_libs" = yes; then
 -	# Transform all the library objects into standard objects.
 -	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 -	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 -      fi
--
++	    cat <<"EOF"
++	  lt_dump_script (stdout);
++	  return 0;
++	}
++      if (strcmp (argv[i], debug_opt) == 0)
++	{
++          lt_debug = 1;
++          continue;
++	}
++      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
++        {
++          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
++             namespace, but it is not one of the ones we know about and
++             have already dealt with, above (inluding dump-script), then
++             report an error. Otherwise, targets might begin to believe
++             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
++             namespace. The first time any user complains about this, we'll
++             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
++             or a configure.ac-settable value.
++           */
++          lt_fatal (__FILE__, __LINE__,
++		    "unrecognized %s option: '%s'",
++                    ltwrapper_option_prefix, argv[i]);
++        }
++      /* otherwise ... */
++      newargz[++newargc] = xstrdup (argv[i]);
++    }
++  newargz[++newargc] = NULL;
+ 
 -      dlsyms=
 -      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 -	if test -n "$NM" && test -n "$global_symbol_pipe"; then
@@ -26996,137 +26601,175 @@
 -	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
 -	fi
 -      fi
--
++EOF
++	    cat <<EOF
++  /* The GNU banner must be the first non-error debug message */
++  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
++EOF
++	    cat <<"EOF"
++  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
++  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
++
++  tmp_pathspec = find_executable (argv[0]);
++  if (tmp_pathspec == NULL)
++    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
++  lt_debugprintf (__FILE__, __LINE__,
++                  "(main) found exe (before symlink chase) at: %s\n",
++		  tmp_pathspec);
++
++  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
++  lt_debugprintf (__FILE__, __LINE__,
++                  "(main) found exe (after symlink chase) at: %s\n",
++		  actual_cwrapper_path);
++  XFREE (tmp_pathspec);
++
++  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
++  strendzap (actual_cwrapper_path, actual_cwrapper_name);
++
++  /* wrapper name transforms */
++  strendzap (actual_cwrapper_name, ".exe");
++  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
++  XFREE (actual_cwrapper_name);
++  actual_cwrapper_name = tmp_pathspec;
++  tmp_pathspec = 0;
++
++  /* target_name transforms -- use actual target program name; might have lt- prefix */
++  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
++  strendzap (target_name, ".exe");
++  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
++  XFREE (target_name);
++  target_name = tmp_pathspec;
++  tmp_pathspec = 0;
++
++  lt_debugprintf (__FILE__, __LINE__,
++		  "(main) libtool target name: %s\n",
++		  target_name);
++EOF
+ 
 -      if test -n "$dlsyms"; then
 -	case $dlsyms in
 -	"") ;;
 -	*.c)
 -	  # Discover the nlist of each of the dlfiles.
 -	  nlist="$output_objdir/${outputname}.nm"
--
++	    cat <<EOF
++  newargz[0] =
++    XMALLOC (char, (strlen (actual_cwrapper_path) +
++		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
++  strcpy (newargz[0], actual_cwrapper_path);
++  strcat (newargz[0], "$objdir");
++  strcat (newargz[0], "/");
++EOF
+ 
 -	  $show "$rm $nlist ${nlist}S ${nlist}T"
 -	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
--
++	    cat <<"EOF"
++  /* stop here, and copy so we don't have to do this twice */
++  tmp_pathspec = xstrdup (newargz[0]);
++
++  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
++  strcat (newargz[0], actual_cwrapper_name);
++
++  /* DO want the lt- prefix here if it exists, so use target_name */
++  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
++  XFREE (tmp_pathspec);
++  tmp_pathspec = NULL;
++EOF
+ 
 -	  # Parse the name list into a source file.
 -	  $show "creating $output_objdir/$dlsyms"
--
++	    case $host_os in
++	      mingw*)
++	    cat <<"EOF"
++  {
++    char* p;
++    while ((p = strchr (newargz[0], '\\')) != NULL)
++      {
++	*p = '/';
++      }
++    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
++      {
++	*p = '/';
++      }
++  }
++EOF
++	    ;;
++	    esac
+ 
 -	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
 -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
 -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
--
++	    cat <<"EOF"
++  XFREE (target_name);
++  XFREE (actual_cwrapper_path);
++  XFREE (actual_cwrapper_name);
++
++  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
++  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
++  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
++     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
++     because on Windows, both *_VARNAMEs are PATH but uninstalled
++     libraries must come first. */
++  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
++  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
++
++  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
++		  nonnull (lt_argv_zero));
++  for (i = 0; i < newargc; i++)
++    {
++      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
++		      i, nonnull (newargz[i]));
++    }
+ 
 -#ifdef __cplusplus
 -extern \"C\" {
 -#endif
--
++EOF
+ 
 -/* Prevent the only kind of declaration conflicts we can make. */
 -#define lt_preloaded_symbols some_other_symbol
-+      # FIXME: Unfortunately, there are problems with the above when trying
-+      # to make a dll which has undefined symbols, in which case not
-+      # even a static library is built.  For now, we need to specify
-+      # -no-undefined on the libtool link line when we can be certain
-+      # that all symbols are satisfied, otherwise we get a static library.
-+      allow_undefined=yes
-+      ;;
-+    *)
-+      allow_undefined=yes
-+      ;;
-+    esac
-+    libtool_args=$nonopt
-+    base_compile="$nonopt $@"
-+    compile_command=$nonopt
-+    finalize_command=$nonopt
++	    case $host_os in
++	      mingw*)
++		cat <<"EOF"
++  /* execv doesn't actually work on mingw as expected on unix */
++  newargz = prepare_spawn (newargz);
++  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
++  if (rval == -1)
++    {
++      /* failed to start process */
++      lt_debugprintf (__FILE__, __LINE__,
++		      "(main) failed to launch target \"%s\": %s\n",
++		      lt_argv_zero, nonnull (strerror (errno)));
++      return 127;
++    }
++  return rval;
++EOF
++		;;
++	      *)
++		cat <<"EOF"
++  execv (lt_argv_zero, newargz);
++  return rval; /* =127, but avoids unused variable warning */
++EOF
++		;;
++	    esac
  
 -/* External symbol declarations for the compiler. */\
 -"
-+    compile_rpath=
-+    finalize_rpath=
-+    compile_shlibpath=
-+    finalize_shlibpath=
-+    convenience=
-+    old_convenience=
-+    deplibs=
-+    old_deplibs=
-+    compiler_flags=
-+    linker_flags=
-+    dllsearchpath=
-+    lib_search_path=`pwd`
-+    inst_prefix_dir=
-+    new_inherited_linker_flags=
++	    cat <<"EOF"
++}
  
 -	  if test "$dlself" = yes; then
 -	    $show "generating symbol list for \`$output'"
-+    avoid_version=no
-+    dlfiles=
-+    dlprefiles=
-+    dlself=no
-+    export_dynamic=no
-+    export_symbols=
-+    export_symbols_regex=
-+    generated=
-+    libobjs=
-+    ltlibs=
-+    module=no
-+    no_install=no
-+    objs=
-+    non_pic_objects=
-+    precious_files_regex=
-+    prefer_static_libs=no
-+    preload=no
-+    prev=
-+    prevarg=
-+    release=
-+    rpath=
-+    xrpath=
-+    perm_rpath=
-+    temp_rpath=
-+    thread_safe=no
-+    vinfo=
-+    vinfo_number=no
-+    weak_libs=
-+    single_module="${wl}-single_module"
-+    func_infer_tag $base_compile
++void *
++xmalloc (size_t num)
++{
++  void *p = (void *) malloc (num);
++  if (!p)
++    lt_fatal (__FILE__, __LINE__, "memory exhausted");
  
 -	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-+    # We need to know -static, to get the right output filenames.
-+    for arg
-+    do
-+      case $arg in
-+      -shared)
-+	test "$build_libtool_libs" != yes && \
-+	  func_fatal_configuration "can not build a shared library"
-+	build_old_libs=no
-+	break
-+	;;
-+      -all-static | -static | -static-libtool-libs)
-+	case $arg in
-+	-all-static)
-+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-+	    func_warning "complete static linking is impossible in this configuration"
-+	  fi
-+	  if test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	  prefer_static_libs=yes
-+	  ;;
-+	-static)
-+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	  prefer_static_libs=built
-+	  ;;
-+	-static-libtool-libs)
-+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	  prefer_static_libs=yes
-+	  ;;
-+	esac
-+	build_libtool_libs=no
-+	build_old_libs=yes
-+	break
-+	;;
-+      esac
-+    done
++  return p;
++}
  
 -	    # Add our own program objects to the symbol list.
 -	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
@@ -27134,60 +26777,63 @@
 -	      $show "extracting global C symbols from \`$arg'"
 -	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
 -	    done
-+    # See if our shared archives depend on static archives.
-+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
++char *
++xstrdup (const char *string)
++{
++  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
++			  string) : NULL;
++}
  
 -	    if test -n "$exclude_expsyms"; then
 -	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
 -	      $run eval '$mv "$nlist"T "$nlist"'
 -	    fi
-+    # Go through the arguments, transforming them on the way.
-+    while test "$#" -gt 0; do
-+      arg="$1"
-+      shift
-+      func_quote_for_eval "$arg"
-+      qarg=$func_quote_for_eval_unquoted_result
-+      func_append libtool_args " $func_quote_for_eval_result"
- 
+-
 -	    if test -n "$export_symbols_regex"; then
 -	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
 -	      $run eval '$mv "$nlist"T "$nlist"'
 -	    fi
-+      # If the previous option needs an argument, assign it.
-+      if test -n "$prev"; then
-+	case $prev in
-+	output)
-+	  func_append compile_command " @OUTPUT@"
-+	  func_append finalize_command " @OUTPUT@"
-+	  ;;
-+	esac
- 
+-
 -	    # Prepare the list of exported symbols
 -	    if test -z "$export_symbols"; then
--	      export_symbols="$output_objdir/$output.exp"
+-	      export_symbols="$output_objdir/$outputname.exp"
 -	      $run $rm $export_symbols
--	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+-              case $host in
+-              *cygwin* | *mingw* )
+-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+-		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+-                ;;
+-              esac
 -	    else
--	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
--	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+-	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 -	      $run eval 'mv "$nlist"T "$nlist"'
+-              case $host in
+-              *cygwin* | *mingw* )
+-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+-		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+-                ;;
+-              esac
 -	    fi
-+	case $prev in
-+	dlfiles|dlprefiles)
-+	  if test "$preload" = no; then
-+	    # Add the symbol object into the linking commands.
-+	    func_append compile_command " @SYMFILE@"
-+	    func_append finalize_command " @SYMFILE@"
-+	    preload=yes
- 	  fi
--
+-	  fi
++const char *
++base_name (const char *name)
++{
++  const char *base;
+ 
 -	  for arg in $dlprefiles; do
 -	    $show "extracting global C symbols from \`$arg'"
 -	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
 -	    $run eval '$echo ": $name " >> "$nlist"'
 -	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
 -	  done
--
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++  /* Skip over the disk name in MSDOS pathnames. */
++  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
++    name += 2;
++#endif
+ 
 -	  if test -z "$run"; then
 -	    # Make sure we have at least an empty file.
 -	    test -f "$nlist" || : > "$nlist"
@@ -27195,14 +26841,13 @@
 -	    if test -n "$exclude_expsyms"; then
 -	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
 -	      $mv "$nlist"T "$nlist"
-+	  case $arg in
-+	  *.la | *.lo) ;;  # We handle these cases below.
-+	  force)
-+	    if test "$dlself" = no; then
-+	      dlself=needless
-+	      export_dynamic=yes
- 	    fi
--
+-	    fi
++  for (base = name; *name; name++)
++    if (IS_DIR_SEPARATOR (*name))
++      base = name + 1;
++  return base;
++}
+ 
 -	    # Try sorting and uniquifying the output.
 -	    if grep -v "^: " < "$nlist" |
 -		if sort -k 3 </dev/null >/dev/null 2>&1; then
@@ -27212,149 +26857,313 @@
 -		fi |
 -		uniq > "$nlist"S; then
 -	      :
-+	    prev=
-+	    continue
-+	    ;;
-+	  self)
-+	    if test "$prev" = dlprefiles; then
-+	      dlself=yes
-+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-+	      dlself=yes
- 	    else
+-	    else
 -	      grep -v "^: " < "$nlist" > "$nlist"S
-+	      dlself=needless
-+	      export_dynamic=yes
- 	    fi
--
+-	    fi
++int
++check_executable (const char *path)
++{
++  struct stat st;
+ 
 -	    if test -f "$nlist"S; then
 -	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-+	    prev=
-+	    continue
-+	    ;;
-+	  *)
-+	    if test "$prev" = dlfiles; then
-+	      dlfiles="$dlfiles $arg"
- 	    else
+-	    else
 -	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-+	      dlprefiles="$dlprefiles $arg"
- 	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  esac
-+	  ;;
-+	expsyms)
-+	  export_symbols="$arg"
-+	  test -f "$arg" \
-+	    || func_fatal_error "symbol file \`$arg' does not exist"
-+	  prev=
-+	  continue
-+	  ;;
-+	expsyms_regex)
-+	  export_symbols_regex="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	framework)
-+	  case $host in
-+	    *-*-darwin*)
-+	      case "$deplibs " in
-+		*" $qarg.ltframework "*) ;;
-+		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-+		   ;;
-+	      esac
-+	      ;;
-+	  esac
-+	  prev=
-+	  continue
-+	  ;;
-+	inst_prefix)
-+	  inst_prefix_dir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	objectlist)
-+	  if test -f "$arg"; then
-+	    save_arg=$arg
-+	    moreargs=
-+	    for fil in `cat "$save_arg"`
-+	    do
-+#	      moreargs="$moreargs $fil"
-+	      arg=$fil
-+	      # A libtool-controlled object.
+-	    fi
++  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
++                  nonempty (path));
++  if ((!path) || (!*path))
++    return 0;
++
++  if ((stat (path, &st) >= 0)
++      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
++    return 1;
++  else
++    return 0;
++}
++
++int
++make_executable (const char *path)
++{
++  int rval = 0;
++  struct stat st;
++
++  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
++                  nonempty (path));
++  if ((!path) || (!*path))
++    return 0;
++
++  if (stat (path, &st) >= 0)
++    {
++      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
++    }
++  return rval;
++}
++
++/* Searches for the full path of the wrapper.  Returns
++   newly allocated full path name if found, NULL otherwise
++   Does not chase symlinks, even on platforms that support them.
++*/
++char *
++find_executable (const char *wrapper)
++{
++  int has_slash = 0;
++  const char *p;
++  const char *p_next;
++  /* static buffer for getcwd */
++  char tmp[LT_PATHMAX + 1];
++  int tmp_len;
++  char *concat_name;
++
++  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
++                  nonempty (wrapper));
++
++  if ((wrapper == NULL) || (*wrapper == '\0'))
++    return NULL;
  
 -	    $echo >> "$output_objdir/$dlsyms" "\
--
++  /* Absolute path? */
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
++    {
++      concat_name = xstrdup (wrapper);
++      if (check_executable (concat_name))
++	return concat_name;
++      XFREE (concat_name);
++    }
++  else
++    {
++#endif
++      if (IS_DIR_SEPARATOR (wrapper[0]))
++	{
++	  concat_name = xstrdup (wrapper);
++	  if (check_executable (concat_name))
++	    return concat_name;
++	  XFREE (concat_name);
++	}
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++    }
++#endif
++
++  for (p = wrapper; *p; p++)
++    if (*p == '/')
++      {
++	has_slash = 1;
++	break;
++      }
++  if (!has_slash)
++    {
++      /* no slashes; search PATH */
++      const char *path = getenv ("PATH");
++      if (path != NULL)
++	{
++	  for (p = path; *p; p = p_next)
++	    {
++	      const char *q;
++	      size_t p_len;
++	      for (q = p; *q; q++)
++		if (IS_PATH_SEPARATOR (*q))
++		  break;
++	      p_len = q - p;
++	      p_next = (*q == '\0' ? q : q + 1);
++	      if (p_len == 0)
++		{
++		  /* empty path: current directory */
++		  if (getcwd (tmp, LT_PATHMAX) == NULL)
++		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
++                              nonnull (strerror (errno)));
++		  tmp_len = strlen (tmp);
++		  concat_name =
++		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
++		  memcpy (concat_name, tmp, tmp_len);
++		  concat_name[tmp_len] = '/';
++		  strcpy (concat_name + tmp_len + 1, wrapper);
++		}
++	      else
++		{
++		  concat_name =
++		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
++		  memcpy (concat_name, p, p_len);
++		  concat_name[p_len] = '/';
++		  strcpy (concat_name + p_len + 1, wrapper);
++		}
++	      if (check_executable (concat_name))
++		return concat_name;
++	      XFREE (concat_name);
++	    }
++	}
++      /* not found in PATH; assume curdir */
++    }
++  /* Relative path | not found in path: prepend cwd */
++  if (getcwd (tmp, LT_PATHMAX) == NULL)
++    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
++              nonnull (strerror (errno)));
++  tmp_len = strlen (tmp);
++  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
++  memcpy (concat_name, tmp, tmp_len);
++  concat_name[tmp_len] = '/';
++  strcpy (concat_name + tmp_len + 1, wrapper);
+ 
 -#undef lt_preloaded_symbols
-+	      # Check to see that this really is a libtool object.
-+	      if func_lalib_unsafe_p "$arg"; then
-+		pic_object=
-+		non_pic_object=
++  if (check_executable (concat_name))
++    return concat_name;
++  XFREE (concat_name);
++  return NULL;
++}
  
 -#if defined (__STDC__) && __STDC__
 -# define lt_ptr void *
--#else
++char *
++chase_symlinks (const char *pathspec)
++{
++#ifndef S_ISLNK
++  return xstrdup (pathspec);
+ #else
 -# define lt_ptr char *
 -# define const
--#endif
-+		# Read the .lo file
-+		func_source "$arg"
++  char buf[LT_PATHMAX];
++  struct stat s;
++  char *tmp_pathspec = xstrdup (pathspec);
++  char *p;
++  int has_symlinks = 0;
++  while (strlen (tmp_pathspec) && !has_symlinks)
++    {
++      lt_debugprintf (__FILE__, __LINE__,
++		      "checking path component for symlinks: %s\n",
++		      tmp_pathspec);
++      if (lstat (tmp_pathspec, &s) == 0)
++	{
++	  if (S_ISLNK (s.st_mode) != 0)
++	    {
++	      has_symlinks = 1;
++	      break;
++	    }
++
++	  /* search backwards for last DIR_SEPARATOR */
++	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
++	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
++	    p--;
++	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
++	    {
++	      /* no more DIR_SEPARATORS left */
++	      break;
++	    }
++	  *p = '\0';
++	}
++      else
++	{
++	  lt_fatal (__FILE__, __LINE__,
++		    "error accessing file \"%s\": %s",
++		    tmp_pathspec, nonnull (strerror (errno)));
++	}
++    }
++  XFREE (tmp_pathspec);
++
++  if (!has_symlinks)
++    {
++      return xstrdup (pathspec);
++    }
++
++  tmp_pathspec = realpath (pathspec, buf);
++  if (tmp_pathspec == 0)
++    {
++      lt_fatal (__FILE__, __LINE__,
++		"could not follow symlinks for %s", pathspec);
++    }
++  return xstrdup (tmp_pathspec);
+ #endif
++}
  
 -/* The mapping between symbol names and symbols. */
+-"
++char *
++strendzap (char *str, const char *pat)
++{
++  size_t len, patlen;
+ 
+-	    case $host in
+-	    *cygwin* | *mingw* )
+-	  $echo >> "$output_objdir/$dlsyms" "\
+-/* DATA imports from DLLs on WIN32 can't be const, because
+-   runtime relocations are performed -- see ld's documentation
+-   on pseudo-relocs */
+-struct {
+-"
+-	      ;;
+-	    * )
+-	  $echo >> "$output_objdir/$dlsyms" "\
 -const struct {
+-"
+-	      ;;
+-	    esac
++  assert (str != NULL);
++  assert (pat != NULL);
+ 
++  len = strlen (str);
++  patlen = strlen (pat);
+ 
+-	  $echo >> "$output_objdir/$dlsyms" "\
 -  const char *name;
 -  lt_ptr address;
--}
++  if (patlen <= len)
++    {
++      str += len - patlen;
++      if (strcmp (str, pat) == 0)
++	*str = '\0';
++    }
++  return str;
+ }
 -lt_preloaded_symbols[] =
 -{\
 -"
-+		if test -z "$pic_object" ||
-+		   test -z "$non_pic_object" ||
-+		   test "$pic_object" = none &&
-+		   test "$non_pic_object" = none; then
-+		  func_fatal_error "cannot find name of object for \`$arg'"
-+		fi
  
 -	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-+		# Extract subdirectory from the argument.
-+		func_dirname "$arg" "/" ""
-+		xdir="$func_dirname_result"
++void
++lt_debugprintf (const char *file, int line, const char *fmt, ...)
++{
++  va_list args;
++  if (lt_debug)
++    {
++      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
++      va_start (args, fmt);
++      (void) vfprintf (stderr, fmt, args);
++      va_end (args);
++    }
++}
  
 -	    $echo >> "$output_objdir/$dlsyms" "\
 -  {0, (lt_ptr) 0}
 -};
-+		if test "$pic_object" != none; then
-+		  # Prepend the subdirectory the object is found in.
-+		  pic_object="$xdir$pic_object"
++static void
++lt_error_core (int exit_status, const char *file,
++	       int line, const char *mode,
++	       const char *message, va_list ap)
++{
++  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
++  vfprintf (stderr, message, ap);
++  fprintf (stderr, ".\n");
  
 -/* This works around a problem in FreeBSD linker */
 -#ifdef FREEBSD_WORKAROUND
 -static const void *lt_preloaded_setup() {
 -  return lt_preloaded_symbols;
--}
++  if (exit_status >= 0)
++    exit (exit_status);
+ }
 -#endif
-+		  if test "$prev" = dlfiles; then
-+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+		      dlfiles="$dlfiles $pic_object"
-+		      prev=
-+		      continue
-+		    else
-+		      # If libtool objects are unsupported, then we need to preload.
-+		      prev=dlprefiles
-+		    fi
-+		  fi
  
 -#ifdef __cplusplus
--}
++void
++lt_fatal (const char *file, int line, const char *message, ...)
++{
++  va_list ap;
++  va_start (ap, message);
++  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
++  va_end (ap);
+ }
 -#endif\
 -"
 -	  fi
-+		  # CHECK ME:  I think I busted this.  -Ossama
-+		  if test "$prev" = dlprefiles; then
-+		    # Preload the old-style object.
-+		    dlprefiles="$dlprefiles $pic_object"
-+		    prev=
-+		  fi
  
 -	  pic_flag_for_symtable=
 -	  case $host in
@@ -27374,174 +27183,192 @@
 -	    *) pic_flag_for_symtable=" $pic_flag";;
 -	    esac
 -	  esac
-+		  # A PIC object.
-+		  func_append libobjs " $pic_object"
-+		  arg="$pic_object"
-+		fi
-+
-+		# Non-PIC object.
-+		if test "$non_pic_object" != none; then
-+		  # Prepend the subdirectory the object is found in.
-+		  non_pic_object="$xdir$non_pic_object"
-+
-+		  # A standard non-PIC object
-+		  func_append non_pic_objects " $non_pic_object"
-+		  if test -z "$pic_object" || test "$pic_object" = none ; then
-+		    arg="$non_pic_object"
-+		  fi
-+		else
-+		  # If the PIC object exists, use it instead.
-+		  # $xdir was prepended to $pic_object above.
-+		  non_pic_object="$pic_object"
-+		  func_append non_pic_objects " $non_pic_object"
-+		fi
-+	      else
-+		# Only an error if not doing a dry-run.
-+		if $opt_dry_run; then
-+		  # Extract subdirectory from the argument.
-+		  func_dirname "$arg" "/" ""
-+		  xdir="$func_dirname_result"
++static const char *
++nonnull (const char *s)
++{
++  return s ? s : "(null)";
++}
  
 -	  # Now compile the dynamic symbol file.
--	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
--	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+-	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+-	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
 -
 -	  # Clean up the generated files.
 -	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
 -	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
--
++static const char *
++nonempty (const char *s)
++{
++  return (s && !*s) ? "(empty)" : nonnull (s);
++}
+ 
 -	  # Transform the symbol file into the correct name.
--	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
--	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+		  func_lo2o "$arg"
-+		  pic_object=$xdir$objdir/$func_lo2o_result
-+		  non_pic_object=$xdir$func_lo2o_result
-+		  func_append libobjs " $pic_object"
-+		  func_append non_pic_objects " $non_pic_object"
-+	        else
-+		  func_fatal_error "\`$arg' is not a valid libtool object"
-+		fi
-+	      fi
-+	    done
-+	  else
-+	    func_fatal_error "link input file \`$arg' does not exist"
-+	  fi
-+	  arg=$save_arg
-+	  prev=
-+	  continue
-+	  ;;
-+	precious_regex)
-+	  precious_files_regex="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	release)
-+	  release="-$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	rpath | xrpath)
-+	  # We need an absolute path.
-+	  case $arg in
-+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-+	  *)
-+	    func_fatal_error "only absolute run-paths are allowed"
-+	    ;;
-+	  esac
-+	  if test "$prev" = rpath; then
-+	    case "$rpath " in
-+	    *" $arg "*) ;;
-+	    *) rpath="$rpath $arg" ;;
-+	    esac
-+	  else
-+	    case "$xrpath " in
-+	    *" $arg "*) ;;
-+	    *) xrpath="$xrpath $arg" ;;
-+	    esac
-+	  fi
-+	  prev=
-+	  continue
-+	  ;;
-+	shrext)
-+	  shrext_cmds="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	weak)
-+	  weak_libs="$weak_libs $arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	xcclinker)
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $qarg"
-+	  prev=
-+	  func_append compile_command " $qarg"
-+	  func_append finalize_command " $qarg"
-+	  continue
-+	  ;;
-+	xcompiler)
-+	  compiler_flags="$compiler_flags $qarg"
-+	  prev=
-+	  func_append compile_command " $qarg"
-+	  func_append finalize_command " $qarg"
-+	  continue
-+	  ;;
-+	xlinker)
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $wl$qarg"
-+	  prev=
-+	  func_append compile_command " $wl$qarg"
-+	  func_append finalize_command " $wl$qarg"
-+	  continue
- 	  ;;
- 	*)
+-          case $host in
+-          *cygwin* | *mingw* )
+-            if test -f "$output_objdir/${outputname}.def" ; then
+-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+-            else
+-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+-             fi
+-            ;;
+-          * )
+-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+-            ;;
+-          esac
+-	  ;;
+-	*)
 -	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
--	  exit 1
-+	  eval "$prev=\"\$arg\""
-+	  prev=
-+	  continue
- 	  ;;
- 	esac
--      else
+-	  exit $EXIT_FAILURE
+-	  ;;
+-	esac
++void
++lt_setenv (const char *name, const char *value)
++{
++  lt_debugprintf (__FILE__, __LINE__,
++		  "(lt_setenv) setting '%s' to '%s'\n",
++                  nonnull (name), nonnull (value));
++  {
++#ifdef HAVE_SETENV
++    /* always make a copy, for consistency with !HAVE_SETENV */
++    char *str = xstrdup (value);
++    setenv (name, str, 1);
++#else
++    int len = strlen (name) + 1 + strlen (value) + 1;
++    char *str = XMALLOC (char, len);
++    sprintf (str, "%s=%s", name, value);
++    if (putenv (str) != EXIT_SUCCESS)
++      {
++        XFREE (str);
++      }
++#endif
++  }
++}
++
++char *
++lt_extend_str (const char *orig_value, const char *add, int to_end)
++{
++  char *new_value;
++  if (orig_value && *orig_value)
++    {
++      int orig_value_len = strlen (orig_value);
++      int add_len = strlen (add);
++      new_value = XMALLOC (char, add_len + orig_value_len + 1);
++      if (to_end)
++        {
++          strcpy (new_value, orig_value);
++          strcpy (new_value + orig_value_len, add);
++        }
+       else
 -	# We keep going just in case the user didn't refer to
 -	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
 -	# really was required.
--
++        {
++          strcpy (new_value, add);
++          strcpy (new_value + add_len, orig_value);
++        }
++    }
++  else
++    {
++      new_value = xstrdup (add);
++    }
++  return new_value;
++}
+ 
 -	# Nullify the symbol file.
--	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
--	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
 -      fi
--
++void
++lt_update_exe_path (const char *name, const char *value)
++{
++  lt_debugprintf (__FILE__, __LINE__,
++		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
++                  nonnull (name), nonnull (value));
+ 
 -      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 -	# Replace the output file specification.
--	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 -	link_command="$compile_command$compile_rpath"
-+      fi # test -n "$prev"
++  if (name && *name && value && *value)
++    {
++      char *new_value = lt_extend_str (getenv (name), value, 0);
++      /* some systems can't cope with a ':'-terminated path #' */
++      int len = strlen (new_value);
++      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
++        {
++          new_value[len-1] = '\0';
++        }
++      lt_setenv (name, new_value);
++      XFREE (new_value);
++    }
++}
  
 -	# We have no uninstalled library dependencies, so finalize right now.
 -	$show "$link_command"
 -	$run eval "$link_command"
--	status=$?
-+      prevarg="$arg"
+-	exit_status=$?
++void
++lt_update_lib_path (const char *name, const char *value)
++{
++  lt_debugprintf (__FILE__, __LINE__,
++		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
++                  nonnull (name), nonnull (value));
  
 -	# Delete the generated files.
 -	if test -n "$dlsyms"; then
 -	  $show "$rm $output_objdir/${outputname}S.${objext}"
 -	  $run $rm "$output_objdir/${outputname}S.${objext}"
-+      case $arg in
-+      -all-static)
-+	if test -n "$link_static_flag"; then
-+	  # See comment for -static flag below, for more details.
-+	  func_append compile_command " $link_static_flag"
-+	  func_append finalize_command " $link_static_flag"
- 	fi
-+	continue
-+	;;
+-	fi
++  if (name && *name && value && *value)
++    {
++      char *new_value = lt_extend_str (getenv (name), value, 0);
++      lt_setenv (name, new_value);
++      XFREE (new_value);
++    }
++}
  
--	exit $status
+-	exit $exit_status
 -      fi
--
++EOF
++	    case $host_os in
++	      mingw*)
++		cat <<"EOF"
++
++/* Prepares an argument vector before calling spawn().
++   Note that spawn() does not by itself call the command interpreter
++     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
++      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
++         GetVersionEx(&v);
++         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
++      }) ? "cmd.exe" : "command.com").
++   Instead it simply concatenates the arguments, separated by ' ', and calls
++   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
++   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
++   special way:
++   - Space and tab are interpreted as delimiters. They are not treated as
++     delimiters if they are surrounded by double quotes: "...".
++   - Unescaped double quotes are removed from the input. Their only effect is
++     that within double quotes, space and tab are treated like normal
++     characters.
++   - Backslashes not followed by double quotes are not special.
++   - But 2*n+1 backslashes followed by a double quote become
++     n backslashes followed by a double quote (n >= 0):
++       \" -> "
++       \\\" -> \"
++       \\\\\" -> \\"
++ */
++#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
++#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
++char **
++prepare_spawn (char **argv)
++{
++  size_t argc;
++  char **new_argv;
++  size_t i;
+ 
 -      if test -n "$shlibpath_var"; then
 -	# We should set the shlibpath_var
 -	rpath=
@@ -27559,10 +27386,9 @@
 -	done
 -	temp_rpath="$rpath"
 -      fi
-+      -allow-undefined)
-+	# FIXME: remove this flag sometime in the future.
-+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-+	;;
++  /* Count number of arguments.  */
++  for (argc = 0; argv[argc] != NULL; argc++)
++    ;
  
 -      if test -n "$compile_shlibpath$finalize_shlibpath"; then
 -	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -27570,10 +27396,8 @@
 -      if test -n "$finalize_shlibpath"; then
 -	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
 -      fi
-+      -avoid-version)
-+	avoid_version=yes
-+	continue
-+	;;
++  /* Allocate new argument vector.  */
++  new_argv = XMALLOC (char *, argc + 1);
  
 -      compile_var=
 -      finalize_var=
@@ -27595,11 +27419,7 @@
 -	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 -	fi
 -      fi
-+      -dlopen)
-+	prev=dlfiles
-+	continue
-+	;;
- 
+-
 -      if test "$no_install" = yes; then
 -	# We don't need to create a wrapper script.
 -	link_command="$compile_var$compile_command$compile_rpath"
@@ -27610,78 +27430,75 @@
 -	# Link the executable and exit
 -	$show "$link_command"
 -	$run eval "$link_command" || exit $?
--	exit 0
+-	exit $EXIT_SUCCESS
 -      fi
-+      -dlpreopen)
-+	prev=dlprefiles
-+	continue
-+	;;
- 
+-
 -      if test "$hardcode_action" = relink; then
 -	# Fast installation is not supported
 -	link_command="$compile_var$compile_command$compile_rpath"
 -	relink_command="$finalize_var$finalize_command$finalize_rpath"
-+      -export-dynamic)
-+	export_dynamic=yes
-+	continue
-+	;;
- 
+-
 -	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
 -	$echo "$modename: \`$output' will be relinked during installation" 1>&2
 -      else
 -	if test "$fast_install" != no; then
 -	  link_command="$finalize_var$compile_command$finalize_rpath"
 -	  if test "$fast_install" = yes; then
--	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 -	  else
 -	    # fast_install is set to needless
 -	    relink_command=
 -	  fi
-+      -export-symbols | -export-symbols-regex)
-+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-+	fi
-+	if test "X$arg" = "X-export-symbols"; then
-+	  prev=expsyms
- 	else
+-	else
 -	  link_command="$compile_var$compile_command$compile_rpath"
 -	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-+	  prev=expsyms_regex
- 	fi
+-	fi
 -      fi
 -
 -      # Replace the output file specification.
 -      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+	continue
-+	;;
- 
+-
 -      # Delete the old output files.
 -      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-+      -framework)
-+	prev=framework
-+	continue
-+	;;
++  /* Put quoted arguments into the new argument vector.  */
++  for (i = 0; i < argc; i++)
++    {
++      const char *string = argv[i];
  
 -      $show "$link_command"
 -      $run eval "$link_command" || exit $?
-+      -inst-prefix-dir)
-+	prev=inst_prefix
-+	continue
-+	;;
++      if (string[0] == '\0')
++	new_argv[i] = xstrdup ("\"\"");
++      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
++	{
++	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
++	  size_t length;
++	  unsigned int backslashes;
++	  const char *s;
++	  char *quoted_string;
++	  char *p;
++
++	  length = 0;
++	  backslashes = 0;
++	  if (quote_around)
++	    length++;
++	  for (s = string; *s != '\0'; s++)
++	    {
++	      char c = *s;
++	      if (c == '"')
++		length += backslashes + 1;
++	      length++;
++	      if (c == '\\')
++		backslashes++;
++	      else
++		backslashes = 0;
++	    }
++	  if (quote_around)
++	    length += backslashes + 1;
  
 -      # Now create the wrapper script.
 -      $show "creating $output"
-+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-+      # so, if we see these flags be careful not to treat them like -L
-+      -L[A-Z][A-Z]*:*)
-+	case $with_gcc/$host in
-+	no/*-*-irix* | /*-*-irix*)
-+	  func_append compile_command " $arg"
-+	  func_append finalize_command " $arg"
-+	  ;;
-+	esac
-+	continue
-+	;;
++	  quoted_string = XMALLOC (char, length + 1);
  
 -      # Quote the relink command for shipping.
 -      if test -n "$relink_command"; then
@@ -27691,30 +27508,52 @@
 -	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
 -	  elif eval var_value=\$$var; test -z "$var_value"; then
 -	    relink_command="$var=; export $var; $relink_command"
-+      -L*)
-+	func_stripname '-L' '' "$arg"
-+	dir=$func_stripname_result
-+	if test -z "$dir"; then
-+	  if test "$#" -gt 0; then
-+	    func_fatal_error "require no space between \`-L' and \`$1'"
- 	  else
+-	  else
 -	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
 -	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	    func_fatal_error "need path for \`-L' option"
- 	  fi
+-	  fi
 -	done
 -	relink_command="(cd `pwd`; $relink_command)"
--	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
 -      fi
--
++	  p = quoted_string;
++	  backslashes = 0;
++	  if (quote_around)
++	    *p++ = '"';
++	  for (s = string; *s != '\0'; s++)
++	    {
++	      char c = *s;
++	      if (c == '"')
++		{
++		  unsigned int j;
++		  for (j = backslashes + 1; j > 0; j--)
++		    *p++ = '\\';
++		}
++	      *p++ = c;
++	      if (c == '\\')
++		backslashes++;
++	      else
++		backslashes = 0;
++	    }
++	  if (quote_around)
++	    {
++	      unsigned int j;
++	      for (j = backslashes; j > 0; j--)
++		*p++ = '\\';
++	      *p++ = '"';
++	    }
++	  *p = '\0';
+ 
 -      # Quote $echo for shipping.
--      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
--	case $0 in
--	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
--	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+-	case $progpath in
+-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
 -	esac
 -	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
--      else
++	  new_argv[i] = quoted_string;
++	}
+       else
 -	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
 -      fi
 -
@@ -27724,113 +27563,44 @@
 -	# a .exe suffix, so we strip it off here.
 -	case $output in
 -	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-+	fi
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	*)
-+	  absdir=`cd "$dir" && pwd`
-+	  test -z "$absdir" && \
-+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-+	  dir="$absdir"
-+	  ;;
- 	esac
+-	esac
 -	# test for cygwin because mv fails w/o .exe extensions
 -	case $host in
 -	  *cygwin*)
 -	    exeext=.exe
 -	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
 -	  *) exeext= ;;
-+	case "$deplibs " in
-+	*" -L$dir "*) ;;
-+	*)
-+	  deplibs="$deplibs -L$dir"
-+	  lib_search_path="$lib_search_path $dir"
-+	  ;;
- 	esac
- 	case $host in
+-	esac
+-	case $host in
 -	  *cygwin* | *mingw* )
--	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
--	    cwrapper=`$echo ${output}.exe`
--	    $rm $cwrappersource $cwrapper
--	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
+-            output_name=`basename $output`
+-            output_path=`dirname $output`
+-            cwrappersource="$output_path/$objdir/lt-$output_name.c"
+-            cwrapper="$output_path/$output_name.exe"
+-            $rm $cwrappersource $cwrapper
+-            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 -
 -	    cat > $cwrappersource <<EOF
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-+	  case :$dllsearchpath: in
-+	  *":$dir:"*) ;;
-+	  ::) dllsearchpath=$dir;;
-+	  *) dllsearchpath="$dllsearchpath:$dir";;
-+	  esac
-+	  case :$dllsearchpath: in
-+	  *":$testbindir:"*) ;;
-+	  ::) dllsearchpath=$testbindir;;
-+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-+	  esac
-+	  ;;
-+	esac
-+	continue
-+	;;
- 
+-
 -/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
 -   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+      -l*)
-+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
-+	    # These systems don't actually have a C or math library (as such)
-+	    continue
-+	    ;;
-+	  *-*-os2*)
-+	    # These systems don't actually have a C library (as such)
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-rhapsody* | *-*-darwin1.[012])
-+	    # Rhapsody C and math libraries are in the System framework
-+	    deplibs="$deplibs System.ltframework"
-+	    continue
-+	    ;;
-+	  *-*-sco3.2v5* | *-*-sco5v6*)
-+	    # Causes problems with __ctype
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-+	    # Compiler inserts libc in the correct place for threads to work
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  esac
-+	elif test "X$arg" = "X-lc_r"; then
-+	 case $host in
-+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+	   # Do not include libc_r directly, use -pthread flag.
-+	   continue
-+	   ;;
-+	 esac
-+	fi
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
- 
+-
 -   The $output program cannot be directly executed until all the libtool
 -   libraries that it depends on are installed.
--   
+-
 -   This wrapper executable should never be moved out of the build directory.
 -   If it is, it will not operate correctly.
-+      -module)
-+	module=yes
-+	continue
-+	;;
++	new_argv[i] = (char *) string;
++    }
++  new_argv[argc] = NULL;
  
 -   Currently, it simply execs the wrapper *script* "/bin/sh $output",
 -   but could eventually absorb all of the scripts functionality and
 -   exec $objdir/$outputname directly.
 -*/
--EOF
++  return new_argv;
++}
+ EOF
 -	    cat >> $cwrappersource<<"EOF"
 -#include <stdio.h>
 -#include <stdlib.h>
@@ -27838,17 +27608,10 @@
 -#include <malloc.h>
 -#include <stdarg.h>
 -#include <assert.h>
-+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-+      # classes, name mangling, and exception handling.
-+      # Darwin uses the -arch flag to determine output architecture.
-+      -model|-arch|-isysroot)
-+	compiler_flags="$compiler_flags $arg"
-+	func_append compile_command " $arg"
-+	func_append finalize_command " $arg"
-+	prev=xcompiler
-+	continue
-+	;;
- 
+-#include <string.h>
+-#include <ctype.h>
+-#include <sys/stat.h>
+-
 -#if defined(PATH_MAX)
 -# define LT_PATHMAX PATH_MAX
 -#elif defined(MAXPATHLEN)
@@ -27856,1944 +27619,2866 @@
 -#else
 -# define LT_PATHMAX 1024
 -#endif
-+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+	compiler_flags="$compiler_flags $arg"
-+	func_append compile_command " $arg"
-+	func_append finalize_command " $arg"
-+	case "$new_inherited_linker_flags " in
-+	    *" $arg "*) ;;
-+	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-+	esac
-+	continue
-+	;;
- 
+-
 -#ifndef DIR_SEPARATOR
--#define DIR_SEPARATOR '/'
+-# define DIR_SEPARATOR '/'
+-# define PATH_SEPARATOR ':'
 -#endif
-+      -multi_module)
-+	single_module="${wl}-multi_module"
-+	continue
-+	;;
- 
+-
 -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
 -  defined (__OS2__)
--#define HAVE_DOS_BASED_FILE_SYSTEM
--#ifndef DIR_SEPARATOR_2 
--#define DIR_SEPARATOR_2 '\\'
--#endif
+-# define HAVE_DOS_BASED_FILE_SYSTEM
+-# ifndef DIR_SEPARATOR_2
+-#  define DIR_SEPARATOR_2 '\\'
+-# endif
+-# ifndef PATH_SEPARATOR_2
+-#  define PATH_SEPARATOR_2 ';'
+-# endif
 -#endif
-+      -no-fast-install)
-+	fast_install=no
-+	continue
-+	;;
- 
+-
 -#ifndef DIR_SEPARATOR_2
 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
 -#else /* DIR_SEPARATOR_2 */
 -# define IS_DIR_SEPARATOR(ch) \
 -        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
 -#endif /* DIR_SEPARATOR_2 */
-+      -no-install)
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-+	  # The PATH hackery in wrapper scripts is required on Windows
-+	  # and Darwin in order for the loader to find any dlls it needs.
-+	  func_warning "\`-no-install' is ignored for $host"
-+	  func_warning "assuming \`-no-fast-install' instead"
-+	  fast_install=no
-+	  ;;
-+	*) no_install=yes ;;
-+	esac
-+	continue
-+	;;
- 
+-
+-#ifndef PATH_SEPARATOR_2
+-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+-#else /* PATH_SEPARATOR_2 */
+-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+-#endif /* PATH_SEPARATOR_2 */
+-
 -#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 -#define XFREE(stale) do { \
 -  if (stale) { free ((void *) stale); stale = 0; } \
 -} while (0)
-+      -no-undefined)
-+	allow_undefined=no
-+	continue
-+	;;
- 
+-
+-/* -DDEBUG is fairly common in CFLAGS.  */
+-#undef DEBUG
+-#if defined DEBUGWRAPPER
+-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
+-#else
+-# define DEBUG(format, ...)
+-#endif
+-
 -const char *program_name = NULL;
-+      -objectlist)
-+	prev=objectlist
-+	continue
-+	;;
- 
+-
 -void * xmalloc (size_t num);
 -char * xstrdup (const char *string);
--char * basename (const char *name);
--char * fnqualify(const char *path);
+-const char * base_name (const char *name);
+-char * find_executable(const char *wrapper);
+-int    check_executable(const char *path);
 -char * strendzap(char *str, const char *pat);
 -void lt_fatal (const char *message, ...);
-+      -o) prev=output ;;
++		;;
++	    esac
  
 -int
 -main (int argc, char *argv[])
--{
++            cat <<"EOF"
++void lt_dump_script (FILE* f)
+ {
 -  char **newargz;
 -  int i;
--  
--  program_name = (char *) xstrdup ((char *) basename (argv[0]));
+-
+-  program_name = (char *) xstrdup (base_name (argv[0]));
+-  DEBUG("(main) argv[0]      : %s\n",argv[0]);
+-  DEBUG("(main) program_name : %s\n",program_name);
 -  newargz = XMALLOC(char *, argc+2);
 -EOF
-+      -precious-files-regex)
-+	prev=precious_regex
-+	continue
-+	;;
- 
--	    cat >> $cwrappersource <<EOF
--  newargz[0] = "$SHELL";
+-
+-            cat >> $cwrappersource <<EOF
+-  newargz[0] = (char *) xstrdup("$SHELL");
 -EOF
-+      -release)
-+	prev=release
-+	continue
-+	;;
- 
--	    cat >> $cwrappersource <<"EOF"
--  newargz[1] = fnqualify(argv[0]);
+-
+-            cat >> $cwrappersource <<"EOF"
+-  newargz[1] = find_executable(argv[0]);
+-  if (newargz[1] == NULL)
+-    lt_fatal("Couldn't find %s", argv[0]);
+-  DEBUG("(main) found exe at : %s\n",newargz[1]);
 -  /* we know the script has the same name, without the .exe */
 -  /* so make sure newargz[1] doesn't end in .exe */
--  strendzap(newargz[1],".exe"); 
+-  strendzap(newargz[1],".exe");
 -  for (i = 1; i < argc; i++)
 -    newargz[i+1] = xstrdup(argv[i]);
 -  newargz[argc+1] = NULL;
+-
+-  for (i=0; i<argc+1; i++)
+-  {
+-    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
+-    ;
+-  }
+-
 -EOF
-+      -rpath)
-+	prev=rpath
-+	continue
-+	;;
- 
--	    cat >> $cwrappersource <<EOF
--  execv("$SHELL",newargz);
+-
+-            case $host_os in
+-              mingw*)
+-                cat >> $cwrappersource <<EOF
+-  execv("$SHELL",(char const **)newargz);
 -EOF
-+      -R)
-+	prev=xrpath
-+	continue
-+	;;
- 
--	    cat >> $cwrappersource <<"EOF"
--}
-+      -R*)
-+	func_stripname '-R' '' "$arg"
-+	dir=$func_stripname_result
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	*)
-+	  func_fatal_error "only absolute run-paths are allowed"
-+	  ;;
-+	esac
-+	case "$xrpath " in
-+	*" $dir "*) ;;
-+	*) xrpath="$xrpath $dir" ;;
-+	esac
-+	continue
-+	;;
- 
+-              ;;
+-              *)
+-                cat >> $cwrappersource <<EOF
+-  execv("$SHELL",newargz);
+ EOF
+-              ;;
+-            esac
++	    func_emit_wrapper yes |
++              $SED -e 's/\([\\"]\)/\\\1/g' \
++	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
+ 
+-            cat >> $cwrappersource <<"EOF"
+-  return 127;
++            cat <<"EOF"
+ }
+-
 -void *
 -xmalloc (size_t num)
 -{
 -  void * p = (void *) malloc (num);
 -  if (!p)
 -    lt_fatal ("Memory exhausted");
-+      -shared)
-+	# The effects of -shared are defined in a previous loop.
-+	continue
-+	;;
- 
+-
 -  return p;
--}
-+      -shrext)
-+	prev=shrext
-+	continue
-+	;;
++EOF
+ }
++# end: func_emit_cwrapperexe_src
  
--char * 
+-char *
 -xstrdup (const char *string)
--{
++# func_win32_import_lib_p ARG
++# True if ARG is an import lib, as indicated by $file_magic_cmd
++func_win32_import_lib_p ()
+ {
 -  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
 -;
--}
-+      -static | -static-libtool-libs)
-+	# The effects of -static are defined in a previous loop.
-+	# We used to do the same as -all-static on platforms that
-+	# didn't have a PIC flag, but the assumption that the effects
-+	# would be equivalent was wrong.  It would break on at least
-+	# Digital Unix and AIX.
-+	continue
-+	;;
++    $opt_debug
++    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
++    *import*) : ;;
++    *) false ;;
++    esac
+ }
  
--char *
--basename (const char *name)
--{
+-const char *
+-base_name (const char *name)
++# func_mode_link arg...
++func_mode_link ()
+ {
 -  const char *base;
-+      -thread-safe)
-+	thread_safe=yes
-+	continue
-+	;;
- 
+-
 -#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
 -  /* Skip over the disk name in MSDOS pathnames. */
--  if (isalpha (name[0]) && name[1] == ':') 
+-  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
 -    name += 2;
 -#endif
-+      -version-info)
-+	prev=vinfo
-+	continue
-+	;;
- 
+-
 -  for (base = name; *name; name++)
 -    if (IS_DIR_SEPARATOR (*name))
 -      base = name + 1;
--  return (char *) base;
+-  return base;
 -}
-+      -version-number)
-+	prev=vinfo
-+	vinfo_number=yes
-+	continue
-+	;;
++    $opt_debug
++    case $host in
++    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++      # It is impossible to link a dll without this setting, and
++      # we shouldn't force the makefile maintainer to figure out
++      # which system we are compiling for in order to pass an extra
++      # flag for every libtool invocation.
++      # allow_undefined=no
  
--char * 
--fnqualify(const char *path)
+-int
+-check_executable(const char * path)
 -{
--  size_t size;
--  char *p;
--  char tmp[LT_PATHMAX + 1];
-+      -weak)
-+        prev=weak
-+	continue
-+	;;
+-  struct stat st;
++      # FIXME: Unfortunately, there are problems with the above when trying
++      # to make a dll which has undefined symbols, in which case not
++      # even a static library is built.  For now, we need to specify
++      # -no-undefined on the libtool link line when we can be certain
++      # that all symbols are satisfied, otherwise we get a static library.
++      allow_undefined=yes
++      ;;
++    *)
++      allow_undefined=yes
++      ;;
++    esac
++    libtool_args=$nonopt
++    base_compile="$nonopt $@"
++    compile_command=$nonopt
++    finalize_command=$nonopt
  
--  assert(path != NULL);
-+      -Wc,*)
-+	func_stripname '-Wc,' '' "$arg"
-+	args=$func_stripname_result
-+	arg=
-+	save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+          func_quote_for_eval "$flag"
-+	  arg="$arg $wl$func_quote_for_eval_result"
-+	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
-+	done
-+	IFS="$save_ifs"
-+	func_stripname ' ' '' "$arg"
-+	arg=$func_stripname_result
-+	;;
+-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
+-  if ((!path) || (!*path))
+-    return 0;
++    compile_rpath=
++    finalize_rpath=
++    compile_shlibpath=
++    finalize_shlibpath=
++    convenience=
++    old_convenience=
++    deplibs=
++    old_deplibs=
++    compiler_flags=
++    linker_flags=
++    dllsearchpath=
++    lib_search_path=`pwd`
++    inst_prefix_dir=
++    new_inherited_linker_flags=
  
--  /* Is it qualified already? */
--#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
--  if (isalpha (path[0]) && path[1] == ':')
--    return xstrdup (path);
+-  if ((stat (path, &st) >= 0) &&
+-      (
+-        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
+-#if defined (S_IXOTH)
+-       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
 -#endif
--  if (IS_DIR_SEPARATOR (path[0]))
--    return xstrdup (path);
-+      -Wl,*)
-+	func_stripname '-Wl,' '' "$arg"
-+	args=$func_stripname_result
-+	arg=
-+	save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+          func_quote_for_eval "$flag"
-+	  arg="$arg $wl$func_quote_for_eval_result"
-+	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-+	  linker_flags="$linker_flags $func_quote_for_eval_result"
-+	done
-+	IFS="$save_ifs"
-+	func_stripname ' ' '' "$arg"
-+	arg=$func_stripname_result
-+	;;
- 
--  /* prepend the current directory */
--  /* doesn't handle '~' */
--  if (getcwd (tmp, LT_PATHMAX) == NULL)
--    lt_fatal ("getcwd failed");
--  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
--  p = XMALLOC(char, size);
--  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
--  return p;
+-#if defined (S_IXGRP)
+-       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
+-#endif
+-       ((st.st_mode & S_IXUSR) == S_IXUSR))
+-      )
+-    return 1;
+-  else
+-    return 0;
 -}
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
++    avoid_version=no
++    bindir=
++    dlfiles=
++    dlprefiles=
++    dlself=no
++    export_dynamic=no
++    export_symbols=
++    export_symbols_regex=
++    generated=
++    libobjs=
++    ltlibs=
++    module=no
++    no_install=no
++    objs=
++    non_pic_objects=
++    precious_files_regex=
++    prefer_static_libs=no
++    preload=no
++    prev=
++    prevarg=
++    release=
++    rpath=
++    xrpath=
++    perm_rpath=
++    temp_rpath=
++    thread_safe=no
++    vinfo=
++    vinfo_number=no
++    weak_libs=
++    single_module="${wl}-single_module"
++    func_infer_tag $base_compile
  
+-/* Searches for the full path of the wrapper.  Returns
+-   newly allocated full path name if found, NULL otherwise */
 -char *
--strendzap(char *str, const char *pat) 
+-find_executable (const char* wrapper)
 -{
--  size_t len, patlen;
-+      -Xlinker)
-+	prev=xlinker
-+	continue
-+	;;
-+
-+      -XCClinker)
-+	prev=xcclinker
-+	continue
-+	;;
-+
-+      # -msg_* for osf cc
-+      -msg_*)
-+	func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+	;;
-+
-+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # +DA*, +DD* enable 64-bit mode on the HP compiler
-+      # -q* pass through compiler args for the IBM compiler
-+      # -m*, -t[45]*, -txscale* pass through architecture-specific
-+      # compiler args for GCC
-+      # -F/path gives path to uninstalled frameworks, gcc on darwin
-+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+      # @file GCC response files
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+        func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+        func_append compile_command " $arg"
-+        func_append finalize_command " $arg"
-+        compiler_flags="$compiler_flags $arg"
-+        continue
-+        ;;
-+
-+      # Some other compiler flag.
-+      -* | +*)
-+        func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+	;;
-+
-+      *.$objext)
-+	# A standard object.
-+	objs="$objs $arg"
+-  int has_slash = 0;
+-  const char* p;
+-  const char* p_next;
+-  /* static buffer for getcwd */
+-  char tmp[LT_PATHMAX + 1];
+-  int tmp_len;
+-  char* concat_name;
+-
+-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+-
+-  if ((wrapper == NULL) || (*wrapper == '\0'))
+-    return NULL;
+-
+-  /* Absolute path? */
+-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
+-  {
+-    concat_name = xstrdup (wrapper);
+-    if (check_executable(concat_name))
+-      return concat_name;
+-    XFREE(concat_name);
+-  }
+-  else
+-  {
+-#endif
+-    if (IS_DIR_SEPARATOR (wrapper[0]))
+-    {
+-      concat_name = xstrdup (wrapper);
+-      if (check_executable(concat_name))
+-        return concat_name;
+-      XFREE(concat_name);
+-    }
+-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  }
+-#endif
+-
+-  for (p = wrapper; *p; p++)
+-    if (*p == '/')
+-    {
+-      has_slash = 1;
+-      break;
+-    }
+-  if (!has_slash)
+-  {
+-    /* no slashes; search PATH */
+-    const char* path = getenv ("PATH");
+-    if (path != NULL)
+-    {
+-      for (p = path; *p; p = p_next)
+-      {
+-        const char* q;
+-        size_t p_len;
+-        for (q = p; *q; q++)
+-          if (IS_PATH_SEPARATOR(*q))
+-            break;
+-        p_len = q - p;
+-        p_next = (*q == '\0' ? q : q + 1);
+-        if (p_len == 0)
+-        {
+-          /* empty path: current directory */
+-          if (getcwd (tmp, LT_PATHMAX) == NULL)
+-            lt_fatal ("getcwd failed");
+-          tmp_len = strlen(tmp);
+-          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+-          memcpy (concat_name, tmp, tmp_len);
+-          concat_name[tmp_len] = '/';
+-          strcpy (concat_name + tmp_len + 1, wrapper);
+-        }
+-        else
+-        {
+-          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
+-          memcpy (concat_name, p, p_len);
+-          concat_name[p_len] = '/';
+-          strcpy (concat_name + p_len + 1, wrapper);
+-        }
+-        if (check_executable(concat_name))
+-          return concat_name;
+-        XFREE(concat_name);
+-      }
+-    }
+-    /* not found in PATH; assume curdir */
+-  }
+-  /* Relative path | not found in path: prepend cwd */
+-  if (getcwd (tmp, LT_PATHMAX) == NULL)
+-    lt_fatal ("getcwd failed");
+-  tmp_len = strlen(tmp);
+-  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+-  memcpy (concat_name, tmp, tmp_len);
+-  concat_name[tmp_len] = '/';
+-  strcpy (concat_name + tmp_len + 1, wrapper);
++    # We need to know -static, to get the right output filenames.
++    for arg
++    do
++      case $arg in
++      -shared)
++	test "$build_libtool_libs" != yes && \
++	  func_fatal_configuration "can not build a shared library"
++	build_old_libs=no
++	break
 +	;;
-+
-+      *.lo)
-+	# A libtool-controlled object.
-+
-+	# Check to see that this really is a libtool object.
-+	if func_lalib_unsafe_p "$arg"; then
-+	  pic_object=
-+	  non_pic_object=
-+
-+	  # Read the .lo file
-+	  func_source "$arg"
-+
-+	  if test -z "$pic_object" ||
-+	     test -z "$non_pic_object" ||
-+	     test "$pic_object" = none &&
-+	     test "$non_pic_object" = none; then
-+	    func_fatal_error "cannot find name of object for \`$arg'"
++      -all-static | -static | -static-libtool-libs)
++	case $arg in
++	-all-static)
++	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
++	    func_warning "complete static linking is impossible in this configuration"
 +	  fi
-+
-+	  # Extract subdirectory from the argument.
-+	  func_dirname "$arg" "/" ""
-+	  xdir="$func_dirname_result"
-+
-+	  if test "$pic_object" != none; then
-+	    # Prepend the subdirectory the object is found in.
-+	    pic_object="$xdir$pic_object"
-+
-+	    if test "$prev" = dlfiles; then
-+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+		dlfiles="$dlfiles $pic_object"
-+		prev=
-+		continue
-+	      else
-+		# If libtool objects are unsupported, then we need to preload.
-+		prev=dlprefiles
-+	      fi
-+	    fi
-+
-+	    # CHECK ME:  I think I busted this.  -Ossama
-+	    if test "$prev" = dlprefiles; then
-+	      # Preload the old-style object.
-+	      dlprefiles="$dlprefiles $pic_object"
-+	      prev=
-+	    fi
-+
-+	    # A PIC object.
-+	    func_append libobjs " $pic_object"
-+	    arg="$pic_object"
++	  if test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
 +	  fi
-+
-+	  # Non-PIC object.
-+	  if test "$non_pic_object" != none; then
-+	    # Prepend the subdirectory the object is found in.
-+	    non_pic_object="$xdir$non_pic_object"
-+
-+	    # A standard non-PIC object
-+	    func_append non_pic_objects " $non_pic_object"
-+	    if test -z "$pic_object" || test "$pic_object" = none ; then
-+	      arg="$non_pic_object"
-+	    fi
-+	  else
-+	    # If the PIC object exists, use it instead.
-+	    # $xdir was prepended to $pic_object above.
-+	    non_pic_object="$pic_object"
-+	    func_append non_pic_objects " $non_pic_object"
++	  prefer_static_libs=yes
++	  ;;
++	-static)
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
 +	  fi
-+	else
-+	  # Only an error if not doing a dry-run.
-+	  if $opt_dry_run; then
-+	    # Extract subdirectory from the argument.
-+	    func_dirname "$arg" "/" ""
-+	    xdir="$func_dirname_result"
-+
-+	    func_lo2o "$arg"
-+	    pic_object=$xdir$objdir/$func_lo2o_result
-+	    non_pic_object=$xdir$func_lo2o_result
-+	    func_append libobjs " $pic_object"
-+	    func_append non_pic_objects " $non_pic_object"
-+	  else
-+	    func_fatal_error "\`$arg' is not a valid libtool object"
++	  prefer_static_libs=built
++	  ;;
++	-static-libtool-libs)
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
 +	  fi
-+	fi
-+	;;
-+
-+      *.$libext)
-+	# An archive.
-+	deplibs="$deplibs $arg"
-+	old_deplibs="$old_deplibs $arg"
-+	continue
-+	;;
-+
-+      *.la)
-+	# A libtool-controlled library.
-+
-+	if test "$prev" = dlfiles; then
-+	  # This library was specified with -dlopen.
-+	  dlfiles="$dlfiles $arg"
-+	  prev=
-+	elif test "$prev" = dlprefiles; then
-+	  # The library was specified with -dlpreopen.
-+	  dlprefiles="$dlprefiles $arg"
-+	  prev=
-+	else
-+	  deplibs="$deplibs $arg"
-+	fi
-+	continue
-+	;;
-+
-+      # Some other compiler argument.
-+      *)
-+	# Unknown arguments in both finalize_command and compile_command need
-+	# to be aesthetically quoted because they are evaled later.
-+	func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+	;;
-+      esac # arg
-+
-+      # Now actually substitute the argument into the commands.
-+      if test -n "$arg"; then
-+	func_append compile_command " $arg"
-+	func_append finalize_command " $arg"
-+      fi
-+    done # argument parsing loop
-+
-+    test -n "$prev" && \
-+      func_fatal_help "the \`$prevarg' option requires an argument"
-+
-+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-+      eval arg=\"$export_dynamic_flag_spec\"
-+      func_append compile_command " $arg"
-+      func_append finalize_command " $arg"
-+    fi
-+
-+    oldlibs=
-+    # calculate the name of the file, without its directory
-+    func_basename "$output"
-+    outputname="$func_basename_result"
-+    libobjs_save="$libobjs"
-+
-+    if test -n "$shlibpath_var"; then
-+      # get the directories listed in $shlibpath_var
-+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+    else
-+      shlib_search_path=
-+    fi
-+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-+
-+    func_dirname "$output" "/" ""
-+    output_objdir="$func_dirname_result$objdir"
-+    # Create the object directory.
-+    func_mkdir_p "$output_objdir"
-+
-+    # Determine the type of output
-+    case $output in
-+    "")
-+      func_fatal_help "you must specify an output file"
-+      ;;
-+    *.$libext) linkmode=oldlib ;;
-+    *.lo | *.$objext) linkmode=obj ;;
-+    *.la) linkmode=lib ;;
-+    *) linkmode=prog ;; # Anything else should be a program.
-+    esac
-+
-+    specialdeplibs=
-+
-+    libs=
-+    # Find all interdependent deplibs by searching for libraries
-+    # that are linked more than once (e.g. -la -lb -la)
-+    for deplib in $deplibs; do
-+      if $opt_duplicate_deps ; then
-+	case "$libs " in
-+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	  prefer_static_libs=yes
++	  ;;
 +	esac
-+      fi
-+      libs="$libs $deplib"
-+    done
-+
-+    if test "$linkmode" = lib; then
-+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-+
-+      # Compute libraries that are listed more than once in $predeps
-+      # $postdeps and mark them as special (i.e., whose duplicates are
-+      # not to be eliminated).
-+      pre_post_deps=
-+      if $opt_duplicate_compiler_generated_deps; then
-+	for pre_post_dep in $predeps $postdeps; do
-+	  case "$pre_post_deps " in
-+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+	  esac
-+	  pre_post_deps="$pre_post_deps $pre_post_dep"
-+	done
-+      fi
-+      pre_post_deps=
-+    fi
-+
-+    deplibs=
-+    newdependency_libs=
-+    newlib_search_path=
-+    need_relink=no # whether we're linking any uninstalled libtool libraries
-+    notinst_deplibs= # not-installed libtool libraries
-+    notinst_path= # paths that contain not-installed libtool libraries
-+
-+    case $linkmode in
-+    lib)
-+	passes="conv dlpreopen link"
-+	for file in $dlfiles $dlprefiles; do
-+	  case $file in
-+	  *.la) ;;
-+	  *)
-+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-+	    ;;
-+	  esac
-+	done
-+	;;
-+    prog)
-+	compile_deplibs=
-+	finalize_deplibs=
-+	alldeplibs=no
-+	newdlfiles=
-+	newdlprefiles=
-+	passes="conv scan dlopen dlpreopen link"
-+	;;
-+    *)  passes="conv"
++	build_libtool_libs=no
++	build_old_libs=yes
++	break
 +	;;
-+    esac
-+
-+    for pass in $passes; do
-+      # The preopen pass in lib mode reverses $deplibs; put it back here
-+      # so that -L comes before libs that need it for instance...
-+      if test "$linkmode,$pass" = "lib,link"; then
-+	## FIXME: Find the place where the list is rebuilt in the wrong
-+	##        order, and fix it there properly
-+        tmp_deplibs=
-+	for deplib in $deplibs; do
-+	  tmp_deplibs="$deplib $tmp_deplibs"
-+	done
-+	deplibs="$tmp_deplibs"
-+      fi
-+
-+      if test "$linkmode,$pass" = "lib,link" ||
-+	 test "$linkmode,$pass" = "prog,scan"; then
-+	libs="$deplibs"
-+	deplibs=
-+      fi
-+      if test "$linkmode" = prog; then
-+	case $pass in
-+	dlopen) libs="$dlfiles" ;;
-+	dlpreopen) libs="$dlprefiles" ;;
-+	link)
-+	  libs="$deplibs %DEPLIBS%"
-+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++      esac
++    done
+ 
+-  if (check_executable(concat_name))
+-    return concat_name;
+-  XFREE(concat_name);
+-  return NULL;
+-}
++    # See if our shared archives depend on static archives.
++    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+ 
+-char *
+-strendzap(char *str, const char *pat)
+-{
+-  size_t len, patlen;
++    # Go through the arguments, transforming them on the way.
++    while test "$#" -gt 0; do
++      arg="$1"
++      shift
++      func_quote_for_eval "$arg"
++      qarg=$func_quote_for_eval_unquoted_result
++      func_append libtool_args " $func_quote_for_eval_result"
+ 
+-  assert(str != NULL);
+-  assert(pat != NULL);
++      # If the previous option needs an argument, assign it.
++      if test -n "$prev"; then
++	case $prev in
++	output)
++	  func_append compile_command " @OUTPUT@"
++	  func_append finalize_command " @OUTPUT@"
 +	  ;;
 +	esac
-+      fi
-+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-+	# Collect and forward deplibs of preopened libtool libs
-+	for lib in $dlprefiles; do
-+	  # Ignore non-libtool-libs
-+	  dependency_libs=
-+	  case $lib in
-+	  *.la)	func_source "$lib" ;;
-+	  esac
-+
-+	  # Collect preopened libtool deplibs, except any this library
-+	  # has declared as weak libs
-+	  for deplib in $dependency_libs; do
-+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-+	    case " $weak_libs " in
-+	    *" $deplib_base "*) ;;
-+	    *) deplibs="$deplibs $deplib" ;;
-+	    esac
-+	  done
-+	done
-+	libs="$dlprefiles"
-+      fi
-+      if test "$pass" = dlopen; then
-+	# Collect dlpreopened libraries
-+	save_deplibs="$deplibs"
-+	deplibs=
-+      fi
-+
-+      for deplib in $libs; do
-+	lib=
-+	found=no
-+	case $deplib in
-+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    compiler_flags="$compiler_flags $deplib"
-+	    if test "$linkmode" = lib ; then
-+		case "$new_inherited_linker_flags " in
-+		    *" $deplib "*) ;;
-+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+		esac
-+	    fi
-+	  fi
+ 
+-  len = strlen(str);
+-  patlen = strlen(pat);
++	case $prev in
++	bindir)
++	  bindir="$arg"
++	  prev=
 +	  continue
 +	  ;;
-+	-l*)
-+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-+	    func_warning "\`-l' is ignored for archives/objects"
-+	    continue
-+	  fi
-+	  func_stripname '-l' '' "$deplib"
-+	  name=$func_stripname_result
-+	  if test "$linkmode" = lib; then
-+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-+	  else
-+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
++	dlfiles|dlprefiles)
++	  if test "$preload" = no; then
++	    # Add the symbol object into the linking commands.
++	    func_append compile_command " @SYMFILE@"
++	    func_append finalize_command " @SYMFILE@"
++	    preload=yes
 +	  fi
-+	  for searchdir in $searchdirs; do
-+	    for search_ext in .la $std_shrext .so .a; do
-+	      # Search the libtool library
-+	      lib="$searchdir/lib${name}${search_ext}"
-+	      if test -f "$lib"; then
-+		if test "$search_ext" = ".la"; then
-+		  found=yes
-+		else
-+		  found=no
-+		fi
-+		break 2
-+	      fi
-+	    done
-+	  done
-+	  if test "$found" != yes; then
-+	    # deplib doesn't seem to be a libtool library
-+	    if test "$linkmode,$pass" = "prog,link"; then
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
++	  case $arg in
++	  *.la | *.lo) ;;  # We handle these cases below.
++	  force)
++	    if test "$dlself" = no; then
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  self)
++	    if test "$prev" = dlprefiles; then
++	      dlself=yes
++	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
++	      dlself=yes
 +	    else
-+	      deplibs="$deplib $deplibs"
-+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++	      dlself=needless
++	      export_dynamic=yes
 +	    fi
++	    prev=
 +	    continue
-+	  else # deplib is a libtool library
-+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-+	    # We need to do some special things here, and not later.
-+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+	      case " $predeps $postdeps " in
-+	      *" $deplib "*)
-+		if func_lalib_p "$lib"; then
-+		  library_names=
-+		  old_library=
-+		  func_source "$lib"
-+		  for l in $old_library $library_names; do
-+		    ll="$l"
-+		  done
-+		  if test "X$ll" = "X$old_library" ; then # only static version available
-+		    found=no
-+		    func_dirname "$lib" "" "."
-+		    ladir="$func_dirname_result"
-+		    lib=$ladir/$old_library
-+		    if test "$linkmode,$pass" = "prog,link"; then
-+		      compile_deplibs="$deplib $compile_deplibs"
-+		      finalize_deplibs="$deplib $finalize_deplibs"
-+		    else
-+		      deplibs="$deplib $deplibs"
-+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++	    ;;
++	  *)
++	    if test "$prev" = dlfiles; then
++	      func_append dlfiles " $arg"
++	    else
++	      func_append dlprefiles " $arg"
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  esac
++	  ;;
++	expsyms)
++	  export_symbols="$arg"
++	  test -f "$arg" \
++	    || func_fatal_error "symbol file \`$arg' does not exist"
++	  prev=
++	  continue
++	  ;;
++	expsyms_regex)
++	  export_symbols_regex="$arg"
++	  prev=
++	  continue
++	  ;;
++	framework)
++	  case $host in
++	    *-*-darwin*)
++	      case "$deplibs " in
++		*" $qarg.ltframework "*) ;;
++		*) func_append deplibs " $qarg.ltframework" # this is fixed later
++		   ;;
++	      esac
++	      ;;
++	  esac
++	  prev=
++	  continue
++	  ;;
++	inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
++	objectlist)
++	  if test -f "$arg"; then
++	    save_arg=$arg
++	    moreargs=
++	    for fil in `cat "$save_arg"`
++	    do
++#	      func_append moreargs " $fil"
++	      arg=$fil
++	      # A libtool-controlled object.
+ 
+-  if (patlen <= len)
+-  {
+-    str += len - patlen;
+-    if (strcmp(str, pat) == 0)
+-      *str = '\0';
+-  }
+-  return str;
+-}
++	      # Check to see that this really is a libtool object.
++	      if func_lalib_unsafe_p "$arg"; then
++		pic_object=
++		non_pic_object=
+ 
+-static void
+-lt_error_core (int exit_status, const char * mode,
+-          const char * message, va_list ap)
+-{
+-  fprintf (stderr, "%s: %s: ", program_name, mode);
+-  vfprintf (stderr, message, ap);
+-  fprintf (stderr, ".\n");
++		# Read the .lo file
++		func_source "$arg"
+ 
+-  if (exit_status >= 0)
+-    exit (exit_status);
+-}
++		if test -z "$pic_object" ||
++		   test -z "$non_pic_object" ||
++		   test "$pic_object" = none &&
++		   test "$non_pic_object" = none; then
++		  func_fatal_error "cannot find name of object for \`$arg'"
++		fi
+ 
+-void
+-lt_fatal (const char *message, ...)
+-{
+-  va_list ap;
+-  va_start (ap, message);
+-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+-  va_end (ap);
+-}
+-EOF
+-          # we should really use a build-platform specific compiler
+-          # here, but OTOH, the wrappers (shell script and this C one)
+-          # are only useful if you want to execute the "real" binary.
+-          # Since the "real" binary is built for $host, then this
+-          # wrapper might as well be built for $host, too.
+-          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
+-          ;;
+-        esac
+-        $rm $output
+-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
++		# Extract subdirectory from the argument.
++		func_dirname "$arg" "/" ""
++		xdir="$func_dirname_result"
+ 
+-	$echo > $output "\
+-#! $SHELL
++		if test "$pic_object" != none; then
++		  # Prepend the subdirectory the object is found in.
++		  pic_object="$xdir$pic_object"
+ 
+-# $output - temporary wrapper script for $objdir/$outputname
+-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+-#
+-# The $output program cannot be directly executed until all the libtool
+-# libraries that it depends on are installed.
+-#
+-# This wrapper script should never be moved out of the build directory.
+-# If it is, it will not operate correctly.
++		  if test "$prev" = dlfiles; then
++		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++		      func_append dlfiles " $pic_object"
++		      prev=
++		      continue
++		    else
++		      # If libtool objects are unsupported, then we need to preload.
++		      prev=dlprefiles
 +		    fi
-+		    continue
 +		  fi
+ 
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='${SED} -e 1s/^X//'
+-sed_quote_subst='$sed_quote_subst'
++		  # CHECK ME:  I think I busted this.  -Ossama
++		  if test "$prev" = dlprefiles; then
++		    # Preload the old-style object.
++		    func_append dlprefiles " $pic_object"
++		    prev=
++		  fi
+ 
+-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+-fi
++		  # A PIC object.
++		  func_append libobjs " $pic_object"
++		  arg="$pic_object"
 +		fi
-+		;;
-+	      *) ;;
-+	      esac
-+	    fi
-+	  fi
-+	  ;; # -l
-+	*.ltframework)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
+ 
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++		# Non-PIC object.
++		if test "$non_pic_object" != none; then
++		  # Prepend the subdirectory the object is found in.
++		  non_pic_object="$xdir$non_pic_object"
+ 
+-relink_command=\"$relink_command\"
++		  # A standard non-PIC object
++		  func_append non_pic_objects " $non_pic_object"
++		  if test -z "$pic_object" || test "$pic_object" = none ; then
++		    arg="$non_pic_object"
++		  fi
++		else
++		  # If the PIC object exists, use it instead.
++		  # $xdir was prepended to $pic_object above.
++		  non_pic_object="$pic_object"
++		  func_append non_pic_objects " $non_pic_object"
++		fi
++	      else
++		# Only an error if not doing a dry-run.
++		if $opt_dry_run; then
++		  # Extract subdirectory from the argument.
++		  func_dirname "$arg" "/" ""
++		  xdir="$func_dirname_result"
+ 
+-# This environment variable determines our operation mode.
+-if test \"\$libtool_install_magic\" = \"$magic\"; then
+-  # install mode needs the following variable:
+-  notinst_deplibs='$notinst_deplibs'
+-else
+-  # When we are sourced in execute mode, \$file and \$echo are already set.
+-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+-    echo=\"$qecho\"
+-    file=\"\$0\"
+-    # Make sure echo works.
+-    if test \"X\$1\" = X--no-reexec; then
+-      # Discard the --no-reexec flag, and continue.
+-      shift
+-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+-      # Yippee, \$echo works!
+-      :
+-    else
+-      # Restart under the correct shell, and then maybe \$echo will work.
+-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+-    fi
+-  fi\
+-"
+-	$echo >> $output "\
++		  func_lo2o "$arg"
++		  pic_object=$xdir$objdir/$func_lo2o_result
++		  non_pic_object=$xdir$func_lo2o_result
++		  func_append libobjs " $pic_object"
++		  func_append non_pic_objects " $non_pic_object"
++	        else
++		  func_fatal_error "\`$arg' is not a valid libtool object"
++		fi
++	      fi
++	    done
 +	  else
-+	    deplibs="$deplib $deplibs"
-+	    if test "$linkmode" = lib ; then
-+		case "$new_inherited_linker_flags " in
-+		    *" $deplib "*) ;;
-+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+		esac
-+	    fi
++	    func_fatal_error "link input file \`$arg' does not exist"
 +	  fi
++	  arg=$save_arg
++	  prev=
 +	  continue
 +	  ;;
-+	-L*)
-+	  case $linkmode in
-+	  lib)
-+	    deplibs="$deplib $deplibs"
-+	    test "$pass" = conv && continue
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    func_stripname '-L' '' "$deplib"
-+	    newlib_search_path="$newlib_search_path $func_stripname_result"
-+	    ;;
-+	  prog)
-+	    if test "$pass" = conv; then
-+	      deplibs="$deplib $deplibs"
-+	      continue
-+	    fi
-+	    if test "$pass" = scan; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    func_stripname '-L' '' "$deplib"
-+	    newlib_search_path="$newlib_search_path $func_stripname_result"
-+	    ;;
++	precious_regex)
++	  precious_files_regex="$arg"
++	  prev=
++	  continue
++	  ;;
++	release)
++	  release="-$arg"
++	  prev=
++	  continue
++	  ;;
++	rpath | xrpath)
++	  # We need an absolute path.
++	  case $arg in
++	  [\\/]* | [A-Za-z]:[\\/]*) ;;
 +	  *)
-+	    func_warning "\`-L' is ignored for archives/objects"
++	    func_fatal_error "only absolute run-paths are allowed"
 +	    ;;
-+	  esac # linkmode
-+	  continue
-+	  ;; # -L
-+	-R*)
-+	  if test "$pass" = link; then
-+	    func_stripname '-R' '' "$deplib"
-+	    dir=$func_stripname_result
-+	    # Make sure the xrpath contains only unique directories.
++	  esac
++	  if test "$prev" = rpath; then
++	    case "$rpath " in
++	    *" $arg "*) ;;
++	    *) func_append rpath " $arg" ;;
++	    esac
++	  else
 +	    case "$xrpath " in
-+	    *" $dir "*) ;;
-+	    *) xrpath="$xrpath $dir" ;;
++	    *" $arg "*) ;;
++	    *) func_append xrpath " $arg" ;;
 +	    esac
 +	  fi
-+	  deplibs="$deplib $deplibs"
++	  prev=
 +	  continue
 +	  ;;
-+	*.la) lib="$deplib" ;;
-+	*.$libext)
-+	  if test "$pass" = conv; then
-+	    deplibs="$deplib $deplibs"
-+	    continue
-+	  fi
-+	  case $linkmode in
-+	  lib)
-+	    # Linking convenience modules into shared libraries is allowed,
-+	    # but linking other static libraries is non-portable.
-+	    case " $dlpreconveniencelibs " in
-+	    *" $deplib "*) ;;
-+	    *)
-+	      valid_a_lib=no
-+	      case $deplibs_check_method in
-+		match_pattern*)
-+		  set dummy $deplibs_check_method; shift
-+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-+		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-+		    | $EGREP "$match_pattern_regex" > /dev/null; then
-+		    valid_a_lib=yes
-+		  fi
-+		;;
-+		pass_all)
-+		  valid_a_lib=yes
-+		;;
-+	      esac
-+	      if test "$valid_a_lib" != yes; then
-+		$ECHO
-+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-+		$ECHO "*** that it is just a static archive that I should not use here."
-+	      else
-+		$ECHO
-+		$ECHO "*** Warning: Linking the shared library $output against the"
-+		$ECHO "*** static library $deplib is not portable!"
-+		deplibs="$deplib $deplibs"
-+	      fi
-+	      ;;
-+	    esac
-+	    continue
-+	    ;;
-+	  prog)
-+	    if test "$pass" != link; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    continue
-+	    ;;
-+	  esac # linkmode
-+	  ;; # *.$libext
-+	*.lo | *.$objext)
-+	  if test "$pass" = conv; then
-+	    deplibs="$deplib $deplibs"
-+	  elif test "$linkmode" = prog; then
-+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	      # If there is no dlopen support or we're linking statically,
-+	      # we need to preload.
-+	      newdlprefiles="$newdlprefiles $deplib"
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    else
-+	      newdlfiles="$newdlfiles $deplib"
-+	    fi
-+	  fi
++	shrext)
++	  shrext_cmds="$arg"
++	  prev=
 +	  continue
 +	  ;;
-+	%DEPLIBS%)
-+	  alldeplibs=yes
++	weak)
++	  func_append weak_libs " $arg"
++	  prev=
 +	  continue
 +	  ;;
-+	esac # case $deplib
++	xcclinker)
++	  func_append linker_flags " $qarg"
++	  func_append compiler_flags " $qarg"
++	  prev=
++	  func_append compile_command " $qarg"
++	  func_append finalize_command " $qarg"
++	  continue
++	  ;;
++	xcompiler)
++	  func_append compiler_flags " $qarg"
++	  prev=
++	  func_append compile_command " $qarg"
++	  func_append finalize_command " $qarg"
++	  continue
++	  ;;
++	xlinker)
++	  func_append linker_flags " $qarg"
++	  func_append compiler_flags " $wl$qarg"
++	  prev=
++	  func_append compile_command " $wl$qarg"
++	  func_append finalize_command " $wl$qarg"
++	  continue
++	  ;;
++	*)
++	  eval "$prev=\"\$arg\""
++	  prev=
++	  continue
++	  ;;
++	esac
++      fi # test -n "$prev"
+ 
+-  # Find the directory that this script lives in.
+-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
++      prevarg="$arg"
+ 
+-  # Follow symbolic links until we get to the real thisdir.
+-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+-  while test -n \"\$file\"; do
+-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
++      case $arg in
++      -all-static)
++	if test -n "$link_static_flag"; then
++	  # See comment for -static flag below, for more details.
++	  func_append compile_command " $link_static_flag"
++	  func_append finalize_command " $link_static_flag"
++	fi
++	continue
++	;;
+ 
+-    # If there was a directory component, then change thisdir.
+-    if test \"x\$destdir\" != \"x\$file\"; then
+-      case \"\$destdir\" in
+-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+-      *) thisdir=\"\$thisdir/\$destdir\" ;;
+-      esac
+-    fi
++      -allow-undefined)
++	# FIXME: remove this flag sometime in the future.
++	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
++	;;
+ 
+-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+-  done
++      -avoid-version)
++	avoid_version=yes
++	continue
++	;;
+ 
+-  # Try to get the absolute directory name.
+-  absdir=\`cd \"\$thisdir\" && pwd\`
+-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+-"
++      -bindir)
++	prev=bindir
++	continue
++	;;
+ 
+-	if test "$fast_install" = yes; then
+-	  $echo >> $output "\
+-  program=lt-'$outputname'$exeext
+-  progdir=\"\$thisdir/$objdir\"
++      -dlopen)
++	prev=dlfiles
++	continue
++	;;
+ 
+-  if test ! -f \"\$progdir/\$program\" || \\
+-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
++      -dlpreopen)
++	prev=dlprefiles
++	continue
++	;;
+ 
+-    file=\"\$\$-\$program\"
++      -export-dynamic)
++	export_dynamic=yes
++	continue
++	;;
 +
-+	if test "$found" = yes || test -f "$lib"; then :
++      -export-symbols | -export-symbols-regex)
++	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	  func_fatal_error "more than one -exported-symbols argument is not allowed"
++	fi
++	if test "X$arg" = "X-export-symbols"; then
++	  prev=expsyms
 +	else
-+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
++	  prev=expsyms_regex
 +	fi
++	continue
++	;;
 +
-+	# Check to see that this really is a libtool archive.
-+	func_lalib_unsafe_p "$lib" \
-+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-+
-+	func_dirname "$lib" "" "."
-+	ladir="$func_dirname_result"
-+
-+	dlname=
-+	dlopen=
-+	dlpreopen=
-+	libdir=
-+	library_names=
-+	old_library=
-+	inherited_linker_flags=
-+	# If the library was installed with an old release of libtool,
-+	# it will not redefine variables installed, or shouldnotlink
-+	installed=yes
-+	shouldnotlink=no
-+	avoidtemprpath=
++      -framework)
++	prev=framework
++	continue
++	;;
 +
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
 +
-+	# Read the .la file
-+	func_source "$lib"
++      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
++      # so, if we see these flags be careful not to treat them like -L
++      -L[A-Z][A-Z]*:*)
++	case $with_gcc/$host in
++	no/*-*-irix* | /*-*-irix*)
++	  func_append compile_command " $arg"
++	  func_append finalize_command " $arg"
++	  ;;
++	esac
++	continue
++	;;
 +
-+	# Convert "-framework foo" to "foo.ltframework"
-+	if test -n "$inherited_linker_flags"; then
-+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
-+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-+	    case " $new_inherited_linker_flags " in
-+	      *" $tmp_inherited_linker_flag "*) ;;
-+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-+	    esac
-+	  done
-+	fi
-+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	if test "$linkmode,$pass" = "lib,link" ||
-+	   test "$linkmode,$pass" = "prog,scan" ||
-+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
++      -L*)
++	func_stripname "-L" '' "$arg"
++	if test -z "$func_stripname_result"; then
++	  if test "$#" -gt 0; then
++	    func_fatal_error "require no space between \`-L' and \`$1'"
++	  else
++	    func_fatal_error "need path for \`-L' option"
++	  fi
 +	fi
++	func_resolve_sysroot "$func_stripname_result"
++	dir=$func_resolve_sysroot_result
++	# We need an absolute path.
++	case $dir in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  absdir=`cd "$dir" && pwd`
++	  test -z "$absdir" && \
++	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
++	  dir="$absdir"
++	  ;;
++	esac
++	case "$deplibs " in
++	*" -L$dir "* | *" $arg "*)
++	  # Will only happen for absolute or sysroot arguments
++	  ;;
++	*)
++	  # Preserve sysroot, but never include relative directories
++	  case $dir in
++	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
++	    *) func_append deplibs " -L$dir" ;;
++	  esac
++	  func_append lib_search_path " $dir"
++	  ;;
++	esac
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
++	  case :$dllsearchpath: in
++	  *":$dir:"*) ;;
++	  ::) dllsearchpath=$dir;;
++	  *) func_append dllsearchpath ":$dir";;
++	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  ::) dllsearchpath=$testbindir;;
++	  *) func_append dllsearchpath ":$testbindir";;
++	  esac
++	  ;;
++	esac
++	continue
++	;;
 +
-+	if test "$pass" = conv; then
-+	  # Only check for convenience libraries
-+	  deplibs="$lib $deplibs"
-+	  if test -z "$libdir"; then
-+	    if test -z "$old_library"; then
-+	      func_fatal_error "cannot find name of link library for \`$lib'"
-+	    fi
-+	    # It is a libtool convenience library, so add in its objects.
-+	    convenience="$convenience $ladir/$objdir/$old_library"
-+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+	      if $opt_duplicate_deps ; then
-+		case "$tmp_libs " in
-+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+		esac
-+	      fi
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
-+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-+	    func_fatal_error "\`$lib' is not a convenience library"
-+	  fi
-+	  continue
-+	fi # $pass = conv
-+
-+
-+	# Get the name of the library we link against.
-+	linklib=
-+	for l in $old_library $library_names; do
-+	  linklib="$l"
-+	done
-+	if test -z "$linklib"; then
-+	  func_fatal_error "cannot find name of link library for \`$lib'"
++      -l*)
++	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
++	  case $host in
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
++	    # These systems don't actually have a C or math library (as such)
++	    continue
++	    ;;
++	  *-*-os2*)
++	    # These systems don't actually have a C library (as such)
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	    # Do not include libc due to us having libc/libc_r.
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody C and math libraries are in the System framework
++	    func_append deplibs " System.ltframework"
++	    continue
++	    ;;
++	  *-*-sco3.2v5* | *-*-sco5v6*)
++	    # Causes problems with __ctype
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++	    # Compiler inserts libc in the correct place for threads to work
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  esac
++	elif test "X$arg" = "X-lc_r"; then
++	 case $host in
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	   # Do not include libc_r directly, use -pthread flag.
++	   continue
++	   ;;
++	 esac
 +	fi
++	func_append deplibs " $arg"
++	continue
++	;;
 +
-+	# This library was specified with -dlopen.
-+	if test "$pass" = dlopen; then
-+	  if test -z "$libdir"; then
-+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-+	  fi
-+	  if test -z "$dlname" ||
-+	     test "$dlopen_support" != yes ||
-+	     test "$build_libtool_libs" = no; then
-+	    # If there is no dlname, no dlopen support or we're linking
-+	    # statically, we need to preload.  We also need to preload any
-+	    # dependent libraries so libltdl's deplib preloader doesn't
-+	    # bomb out in the load deplibs phase.
-+	    dlprefiles="$dlprefiles $lib $dependency_libs"
-+	  else
-+	    newdlfiles="$newdlfiles $lib"
-+	  fi
-+	  continue
-+	fi # $pass = dlopen
++      -module)
++	module=yes
++	continue
++	;;
++
++      # Tru64 UNIX uses -model [arg] to determine the layout of C++
++      # classes, name mangling, and exception handling.
++      # Darwin uses the -arch flag to determine output architecture.
++      -model|-arch|-isysroot|--sysroot)
++	func_append compiler_flags " $arg"
++	func_append compile_command " $arg"
++	func_append finalize_command " $arg"
++	prev=xcompiler
++	continue
++	;;
++
++      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++	func_append compiler_flags " $arg"
++	func_append compile_command " $arg"
++	func_append finalize_command " $arg"
++	case "$new_inherited_linker_flags " in
++	    *" $arg "*) ;;
++	    * ) func_append new_inherited_linker_flags " $arg" ;;
++	esac
++	continue
++	;;
++
++      -multi_module)
++	single_module="${wl}-multi_module"
++	continue
++	;;
++
++      -no-fast-install)
++	fast_install=no
++	continue
++	;;
 +
++      -no-install)
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
++	  # The PATH hackery in wrapper scripts is required on Windows
++	  # and Darwin in order for the loader to find any dlls it needs.
++	  func_warning "\`-no-install' is ignored for $host"
++	  func_warning "assuming \`-no-fast-install' instead"
++	  fast_install=no
++	  ;;
++	*) no_install=yes ;;
++	esac
++	continue
++	;;
++
++      -no-undefined)
++	allow_undefined=no
++	continue
++	;;
++
++      -objectlist)
++	prev=objectlist
++	continue
++	;;
++
++      -o) prev=output ;;
++
++      -precious-files-regex)
++	prev=precious_regex
++	continue
++	;;
++
++      -release)
++	prev=release
++	continue
++	;;
++
++      -rpath)
++	prev=rpath
++	continue
++	;;
++
++      -R)
++	prev=xrpath
++	continue
++	;;
++
++      -R*)
++	func_stripname '-R' '' "$arg"
++	dir=$func_stripname_result
 +	# We need an absolute path.
-+	case $ladir in
-+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
++	case $dir in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	=*)
++	  func_stripname '=' '' "$dir"
++	  dir=$lt_sysroot$func_stripname_result
++	  ;;
 +	*)
-+	  abs_ladir=`cd "$ladir" && pwd`
-+	  if test -z "$abs_ladir"; then
-+	    func_warning "cannot determine absolute directory name of \`$ladir'"
-+	    func_warning "passing it literally to the linker, although it might fail"
-+	    abs_ladir="$ladir"
-+	  fi
++	  func_fatal_error "only absolute run-paths are allowed"
 +	  ;;
 +	esac
-+	func_basename "$lib"
-+	laname="$func_basename_result"
++	case "$xrpath " in
++	*" $dir "*) ;;
++	*) func_append xrpath " $dir" ;;
++	esac
++	continue
++	;;
 +
-+	# Find the relevant object directory and library name.
-+	if test "X$installed" = Xyes; then
-+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    func_warning "library \`$lib' was moved."
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	  else
-+	    dir="$libdir"
-+	    absdir="$libdir"
-+	  fi
-+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-+	else
-+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  else
-+	    dir="$ladir/$objdir"
-+	    absdir="$abs_ladir/$objdir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  fi
-+	fi # $installed = yes
-+	func_stripname 'lib' '.la' "$laname"
-+	name=$func_stripname_result
++      -shared)
++	# The effects of -shared are defined in a previous loop.
++	continue
++	;;
 +
-+	# This library was specified with -dlpreopen.
-+	if test "$pass" = dlpreopen; then
-+	  if test -z "$libdir" && test "$linkmode" = prog; then
-+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-+	  fi
-+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-+	  # are required to link).
-+	  if test -n "$old_library"; then
-+	    newdlprefiles="$newdlprefiles $dir/$old_library"
-+	    # Keep a list of preopened convenience libraries to check
-+	    # that they are being used correctly in the link pass.
-+	    test -z "$libdir" && \
-+		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-+	  elif test -n "$dlname"; then
-+	    newdlprefiles="$newdlprefiles $dir/$dlname"
-+	  else
-+	    newdlprefiles="$newdlprefiles $dir/$linklib"
-+	  fi
-+	fi # $pass = dlpreopen
++      -shrext)
++	prev=shrext
++	continue
++	;;
 +
-+	if test -z "$libdir"; then
-+	  # Link the convenience library
-+	  if test "$linkmode" = lib; then
-+	    deplibs="$dir/$old_library $deplibs"
-+	  elif test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$dir/$old_library $compile_deplibs"
-+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-+	  else
-+	    deplibs="$lib $deplibs" # used for prog,scan pass
-+	  fi
-+	  continue
-+	fi
++      -static | -static-libtool-libs)
++	# The effects of -static are defined in a previous loop.
++	# We used to do the same as -all-static on platforms that
++	# didn't have a PIC flag, but the assumption that the effects
++	# would be equivalent was wrong.  It would break on at least
++	# Digital Unix and AIX.
++	continue
++	;;
++
++      -thread-safe)
++	thread_safe=yes
++	continue
++	;;
 +
++      -version-info)
++	prev=vinfo
++	continue
++	;;
 +
-+	if test "$linkmode" = prog && test "$pass" != link; then
-+	  newlib_search_path="$newlib_search_path $ladir"
-+	  deplibs="$lib $deplibs"
++      -version-number)
++	prev=vinfo
++	vinfo_number=yes
++	continue
++	;;
 +
-+	  linkalldeplibs=no
-+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-+	     test "$build_libtool_libs" = no; then
-+	    linkalldeplibs=yes
++      -weak)
++        prev=weak
++	continue
++	;;
++
++      -Wc,*)
++	func_stripname '-Wc,' '' "$arg"
++	args=$func_stripname_result
++	arg=
++	save_ifs="$IFS"; IFS=','
++	for flag in $args; do
++	  IFS="$save_ifs"
++          func_quote_for_eval "$flag"
++	  func_append arg " $func_quote_for_eval_result"
++	  func_append compiler_flags " $func_quote_for_eval_result"
++	done
++	IFS="$save_ifs"
++	func_stripname ' ' '' "$arg"
++	arg=$func_stripname_result
++	;;
++
++      -Wl,*)
++	func_stripname '-Wl,' '' "$arg"
++	args=$func_stripname_result
++	arg=
++	save_ifs="$IFS"; IFS=','
++	for flag in $args; do
++	  IFS="$save_ifs"
++          func_quote_for_eval "$flag"
++	  func_append arg " $wl$func_quote_for_eval_result"
++	  func_append compiler_flags " $wl$func_quote_for_eval_result"
++	  func_append linker_flags " $func_quote_for_eval_result"
++	done
++	IFS="$save_ifs"
++	func_stripname ' ' '' "$arg"
++	arg=$func_stripname_result
++	;;
++
++      -Xcompiler)
++	prev=xcompiler
++	continue
++	;;
++
++      -Xlinker)
++	prev=xlinker
++	continue
++	;;
++
++      -XCClinker)
++	prev=xcclinker
++	continue
++	;;
++
++      # -msg_* for osf cc
++      -msg_*)
++	func_quote_for_eval "$arg"
++	arg="$func_quote_for_eval_result"
++	;;
++
++      # Flags to be passed through unchanged, with rationale:
++      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
++      # -r[0-9][0-9]*        specify processor for the SGI compiler
++      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
++      # +DA*, +DD*           enable 64-bit mode for the HP compiler
++      # -q*                  compiler args for the IBM compiler
++      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
++      # -F/path              path to uninstalled frameworks, gcc on darwin
++      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
++      # @file                GCC response files
++      # -tp=*                Portland pgcc target processor selection
++      # --sysroot=*          for sysroot support
++      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++        func_quote_for_eval "$arg"
++	arg="$func_quote_for_eval_result"
++        func_append compile_command " $arg"
++        func_append finalize_command " $arg"
++        func_append compiler_flags " $arg"
++        continue
++        ;;
++
++      # Some other compiler flag.
++      -* | +*)
++        func_quote_for_eval "$arg"
++	arg="$func_quote_for_eval_result"
++	;;
++
++      *.$objext)
++	# A standard object.
++	func_append objs " $arg"
++	;;
++
++      *.lo)
++	# A libtool-controlled object.
++
++	# Check to see that this really is a libtool object.
++	if func_lalib_unsafe_p "$arg"; then
++	  pic_object=
++	  non_pic_object=
++
++	  # Read the .lo file
++	  func_source "$arg"
++
++	  if test -z "$pic_object" ||
++	     test -z "$non_pic_object" ||
++	     test "$pic_object" = none &&
++	     test "$non_pic_object" = none; then
++	    func_fatal_error "cannot find name of object for \`$arg'"
 +	  fi
 +
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    case $deplib in
-+	    -L*) func_stripname '-L' '' "$deplib"
-+	         newlib_search_path="$newlib_search_path $func_stripname_result"
-+		 ;;
-+	    esac
-+	    # Need to link against all dependency_libs?
-+	    if test "$linkalldeplibs" = yes; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      # Need to hardcode shared library paths
-+	      # or/and link against static libraries
-+	      newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    if $opt_duplicate_deps ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
++	  # Extract subdirectory from the argument.
++	  func_dirname "$arg" "/" ""
++	  xdir="$func_dirname_result"
++
++	  if test "$pic_object" != none; then
++	    # Prepend the subdirectory the object is found in.
++	    pic_object="$xdir$pic_object"
++
++	    if test "$prev" = dlfiles; then
++	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++		func_append dlfiles " $pic_object"
++		prev=
++		continue
++	      else
++		# If libtool objects are unsupported, then we need to preload.
++		prev=dlprefiles
++	      fi
 +	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done # for deplib
-+	  continue
-+	fi # $linkmode = prog...
 +
-+	if test "$linkmode,$pass" = "prog,link"; then
-+	  if test -n "$library_names" &&
-+	     { { test "$prefer_static_libs" = no ||
-+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-+	       test -z "$old_library"; }; then
-+	    # We need to hardcode the library path
-+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-+	      # Make sure the rpath contains only unique directories.
-+	      case "$temp_rpath:" in
-+	      *"$absdir:"*) ;;
-+	      *) temp_rpath="$temp_rpath$absdir:" ;;
-+	      esac
++	    # CHECK ME:  I think I busted this.  -Ossama
++	    if test "$prev" = dlprefiles; then
++	      # Preload the old-style object.
++	      func_append dlprefiles " $pic_object"
++	      prev=
 +	    fi
 +
-+	    # Hardcode the library path.
-+	    # Skip directories that are in the system default run-time
-+	    # search path.
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $absdir "*) ;;
-+	    *)
-+	      case "$compile_rpath " in
-+	      *" $absdir "*) ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $libdir "*) ;;
-+	    *)
-+	      case "$finalize_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      esac
-+	      ;;
-+	    esac
-+	  fi # $linkmode,$pass = prog,link...
++	    # A PIC object.
++	    func_append libobjs " $pic_object"
++	    arg="$pic_object"
++	  fi
 +
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
-+		 test -n "$library_names"; }; }; then
-+	    # We only need to search for static libraries
-+	    continue
++	  # Non-PIC object.
++	  if test "$non_pic_object" != none; then
++	    # Prepend the subdirectory the object is found in.
++	    non_pic_object="$xdir$non_pic_object"
++
++	    # A standard non-PIC object
++	    func_append non_pic_objects " $non_pic_object"
++	    if test -z "$pic_object" || test "$pic_object" = none ; then
++	      arg="$non_pic_object"
++	    fi
++	  else
++	    # If the PIC object exists, use it instead.
++	    # $xdir was prepended to $pic_object above.
++	    non_pic_object="$pic_object"
++	    func_append non_pic_objects " $non_pic_object"
++	  fi
++	else
++	  # Only an error if not doing a dry-run.
++	  if $opt_dry_run; then
++	    # Extract subdirectory from the argument.
++	    func_dirname "$arg" "/" ""
++	    xdir="$func_dirname_result"
++
++	    func_lo2o "$arg"
++	    pic_object=$xdir$objdir/$func_lo2o_result
++	    non_pic_object=$xdir$func_lo2o_result
++	    func_append libobjs " $pic_object"
++	    func_append non_pic_objects " $non_pic_object"
++	  else
++	    func_fatal_error "\`$arg' is not a valid libtool object"
 +	  fi
 +	fi
++	;;
 +
-+	link_static=no # Whether the deplib will be linked statically
-+	use_static_libs=$prefer_static_libs
-+	if test "$use_static_libs" = built && test "$installed" = yes; then
-+	  use_static_libs=no
++      *.$libext)
++	# An archive.
++	func_append deplibs " $arg"
++	func_append old_deplibs " $arg"
++	continue
++	;;
++
++      *.la)
++	# A libtool-controlled library.
++
++	func_resolve_sysroot "$arg"
++	if test "$prev" = dlfiles; then
++	  # This library was specified with -dlopen.
++	  func_append dlfiles " $func_resolve_sysroot_result"
++	  prev=
++	elif test "$prev" = dlprefiles; then
++	  # The library was specified with -dlpreopen.
++	  func_append dlprefiles " $func_resolve_sysroot_result"
++	  prev=
++	else
++	  func_append deplibs " $func_resolve_sysroot_result"
 +	fi
-+	if test -n "$library_names" &&
-+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-+	  case $host in
-+	  *cygwin* | *mingw* | *cegcc*)
-+	      # No point in relinking DLLs because paths are not encoded
-+	      notinst_deplibs="$notinst_deplibs $lib"
-+	      need_relink=no
-+	    ;;
-+	  *)
-+	    if test "$installed" = no; then
-+	      notinst_deplibs="$notinst_deplibs $lib"
-+	      need_relink=yes
-+	    fi
-+	    ;;
-+	  esac
-+	  # This is a shared library
++	continue
++	;;
 +
-+	  # Warn about portability, can't link against -module's on some
-+	  # systems (darwin).  Don't bleat about dlopened modules though!
-+	  dlopenmodule=""
-+	  for dlpremoduletest in $dlprefiles; do
-+	    if test "X$dlpremoduletest" = "X$lib"; then
-+	      dlopenmodule="$dlpremoduletest"
-+	      break
-+	    fi
-+	  done
-+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-+	    $ECHO
-+	    if test "$linkmode" = prog; then
-+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-+	    else
-+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-+	    fi
-+	    $ECHO "*** $linklib is not portable!"
-+	  fi
-+	  if test "$linkmode" = lib &&
-+	     test "$hardcode_into_libs" = yes; then
-+	    # Hardcode the library path.
-+	    # Skip directories that are in the system default run-time
-+	    # search path.
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $absdir "*) ;;
-+	    *)
-+	      case "$compile_rpath " in
-+	      *" $absdir "*) ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $libdir "*) ;;
-+	    *)
-+	      case "$finalize_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      esac
-+	      ;;
-+	    esac
-+	  fi
++      # Some other compiler argument.
++      *)
++	# Unknown arguments in both finalize_command and compile_command need
++	# to be aesthetically quoted because they are evaled later.
++	func_quote_for_eval "$arg"
++	arg="$func_quote_for_eval_result"
++	;;
++      esac # arg
 +
-+	  if test -n "$old_archive_from_expsyms_cmds"; then
-+	    # figure out the soname
-+	    set dummy $library_names
-+	    shift
-+	    realname="$1"
-+	    shift
-+	    libname=`eval "\\$ECHO \"$libname_spec\""`
-+	    # use dlname if we got it. it's perfectly good, no?
-+	    if test -n "$dlname"; then
-+	      soname="$dlname"
-+	    elif test -n "$soname_spec"; then
-+	      # bleh windows
-+	      case $host in
-+	      *cygwin* | mingw* | *cegcc*)
-+	        func_arith $current - $age
-+		major=$func_arith_result
-+		versuffix="-$major"
-+		;;
-+	      esac
-+	      eval soname=\"$soname_spec\"
-+	    else
-+	      soname="$realname"
-+	    fi
++      # Now actually substitute the argument into the commands.
++      if test -n "$arg"; then
++	func_append compile_command " $arg"
++	func_append finalize_command " $arg"
++      fi
++    done # argument parsing loop
 +
-+	    # Make a new name for the extract_expsyms_cmds to use
-+	    soroot="$soname"
-+	    func_basename "$soroot"
-+	    soname="$func_basename_result"
-+	    func_stripname 'lib' '.dll' "$soname"
-+	    newlib=libimp-$func_stripname_result.a
++    test -n "$prev" && \
++      func_fatal_help "the \`$prevarg' option requires an argument"
 +
-+	    # If the library has no export list, then create one now
-+	    if test -f "$output_objdir/$soname-def"; then :
-+	    else
-+	      func_verbose "extracting exported symbol list from \`$soname'"
-+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-+	    fi
++    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
++      eval arg=\"$export_dynamic_flag_spec\"
++      func_append compile_command " $arg"
++      func_append finalize_command " $arg"
++    fi
 +
-+	    # Create $newlib
-+	    if test -f "$output_objdir/$newlib"; then :; else
-+	      func_verbose "generating import library for \`$soname'"
-+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-+	    fi
-+	    # make sure the library variables are pointing to the new library
-+	    dir=$output_objdir
-+	    linklib=$newlib
-+	  fi # test -n "$old_archive_from_expsyms_cmds"
++    oldlibs=
++    # calculate the name of the file, without its directory
++    func_basename "$output"
++    outputname="$func_basename_result"
++    libobjs_save="$libobjs"
 +
-+	  if test "$linkmode" = prog || test "$mode" != relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    lib_linked=yes
-+	    case $hardcode_action in
-+	    immediate | unsupported)
-+	      if test "$hardcode_direct" = no; then
-+		add="$dir/$linklib"
-+		case $host in
-+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-+		    *-*-unixware7*) add_dir="-L$dir" ;;
-+		  *-*-darwin* )
-+		    # if the lib is a (non-dlopened) module then we can not
-+		    # link against it, someone is ignoring the earlier warnings
-+		    if /usr/bin/file -L $add 2> /dev/null |
-+			 $GREP ": [^:]* bundle" >/dev/null ; then
-+		      if test "X$dlopenmodule" != "X$lib"; then
-+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-+			if test -z "$old_library" ; then
-+			  $ECHO
-+			  $ECHO "*** And there doesn't seem to be a static archive available"
-+			  $ECHO "*** The link will probably fail, sorry"
-+			else
-+			  add="$dir/$old_library"
-+			fi
-+		      elif test -n "$old_library"; then
-+			add="$dir/$old_library"
-+		      fi
-+		    fi
-+		esac
-+	      elif test "$hardcode_minus_L" = no; then
-+		case $host in
-+		*-*-sunos*) add_shlibpath="$dir" ;;
-+		esac
-+		add_dir="-L$dir"
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = no; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    relink)
-+	      if test "$hardcode_direct" = yes &&
-+	         test "$hardcode_direct_absolute" = no; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = yes; then
-+		add_dir="-L$dir"
-+		# Try looking first in the location we're being installed to.
-+		if test -n "$inst_prefix_dir"; then
-+		  case $libdir in
-+		    [\\/]*)
-+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		      ;;
-+		  esac
-+		fi
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = yes; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    *) lib_linked=no ;;
-+	    esac
++    if test -n "$shlibpath_var"; then
++      # get the directories listed in $shlibpath_var
++      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
++    else
++      shlib_search_path=
++    fi
++    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
++    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 +
-+	    if test "$lib_linked" != yes; then
-+	      func_fatal_configuration "unsupported hardcode properties"
-+	    fi
++    func_dirname "$output" "/" ""
++    output_objdir="$func_dirname_result$objdir"
++    func_to_tool_file "$output_objdir/"
++    tool_output_objdir=$func_to_tool_file_result
++    # Create the object directory.
++    func_mkdir_p "$output_objdir"
 +
-+	    if test -n "$add_shlibpath"; then
-+	      case :$compile_shlibpath: in
-+	      *":$add_shlibpath:"*) ;;
-+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+	      esac
-+	    fi
-+	    if test "$linkmode" = prog; then
-+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	      if test "$hardcode_direct" != yes &&
-+		 test "$hardcode_minus_L" != yes &&
-+		 test "$hardcode_shlibpath_var" = yes; then
-+		case :$finalize_shlibpath: in
-+		*":$libdir:"*) ;;
-+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+		esac
-+	      fi
-+	    fi
-+	  fi
++    # Determine the type of output
++    case $output in
++    "")
++      func_fatal_help "you must specify an output file"
++      ;;
++    *.$libext) linkmode=oldlib ;;
++    *.lo | *.$objext) linkmode=obj ;;
++    *.la) linkmode=lib ;;
++    *) linkmode=prog ;; # Anything else should be a program.
++    esac
 +
-+	  if test "$linkmode" = prog || test "$mode" = relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    # Finalize command for both is simple: just hardcode it.
-+	    if test "$hardcode_direct" = yes &&
-+	       test "$hardcode_direct_absolute" = no; then
-+	      add="$libdir/$linklib"
-+	    elif test "$hardcode_minus_L" = yes; then
-+	      add_dir="-L$libdir"
-+	      add="-l$name"
-+	    elif test "$hardcode_shlibpath_var" = yes; then
-+	      case :$finalize_shlibpath: in
-+	      *":$libdir:"*) ;;
-+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+	      esac
-+	      add="-l$name"
-+	    elif test "$hardcode_automatic" = yes; then
-+	      if test -n "$inst_prefix_dir" &&
-+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-+		add="$inst_prefix_dir$libdir/$linklib"
-+	      else
-+		add="$libdir/$linklib"
-+	      fi
-+	    else
-+	      # We cannot seem to hardcode it, guess we'll fake it.
-+	      add_dir="-L$libdir"
-+	      # Try looking first in the location we're being installed to.
-+	      if test -n "$inst_prefix_dir"; then
-+		case $libdir in
-+		  [\\/]*)
-+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		    ;;
-+		esac
-+	      fi
-+	      add="-l$name"
-+	    fi
++    specialdeplibs=
 +
-+	    if test "$linkmode" = prog; then
-+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	    fi
-+	  fi
-+	elif test "$linkmode" = prog; then
-+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-+	  # is not unsupported.  This is valid on all known static and
-+	  # shared platforms.
-+	  if test "$hardcode_direct" != unsupported; then
-+	    test -n "$old_library" && linklib="$old_library"
-+	    compile_deplibs="$dir/$linklib $compile_deplibs"
-+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-+	  else
-+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-+	  fi
-+	elif test "$build_libtool_libs" = yes; then
-+	  # Not a shared library
-+	  if test "$deplibs_check_method" != pass_all; then
-+	    # We're trying link a shared library against a static one
-+	    # but the system doesn't support it.
++    libs=
++    # Find all interdependent deplibs by searching for libraries
++    # that are linked more than once (e.g. -la -lb -la)
++    for deplib in $deplibs; do
++      if $opt_preserve_dup_deps ; then
++	case "$libs " in
++	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
++	esac
++      fi
++      func_append libs " $deplib"
++    done
 +
-+	    # Just print a warning and add the library to dependency_libs so
-+	    # that the program can be linked against the static library.
-+	    $ECHO
-+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-+	    $ECHO "*** I have the capability to make that library automatically link in when"
-+	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-+	    $ECHO "*** shared version of the library, which you do not appear to have."
-+	    if test "$module" = yes; then
-+	      $ECHO "*** But as you try to build a module library, libtool will still create "
-+	      $ECHO "*** a static module, that should work as long as the dlopening application"
-+	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+	      if test -z "$global_symbol_pipe"; then
-+		$ECHO
-+		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-+		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+		$ECHO "*** not find such a program.  So, this module is probably useless."
-+		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      fi
-+	      if test "$build_old_libs" = no; then
-+		build_libtool_libs=module
-+		build_old_libs=yes
-+	      else
-+		build_libtool_libs=no
-+	      fi
-+	    fi
-+	  else
-+	    deplibs="$dir/$old_library $deplibs"
-+	    link_static=yes
-+	  fi
-+	fi # link shared/static library?
++    if test "$linkmode" = lib; then
++      libs="$predeps $libs $compiler_lib_search_path $postdeps"
 +
-+	if test "$linkmode" = lib; then
-+	  if test -n "$dependency_libs" &&
-+	     { test "$hardcode_into_libs" != yes ||
-+	       test "$build_old_libs" = yes ||
-+	       test "$link_static" = yes; }; then
-+	    # Extract -R from dependency_libs
-+	    temp_deplibs=
-+	    for libdir in $dependency_libs; do
-+	      case $libdir in
-+	      -R*) func_stripname '-R' '' "$libdir"
-+	           temp_xrpath=$func_stripname_result
-+		   case " $xrpath " in
-+		   *" $temp_xrpath "*) ;;
-+		   *) xrpath="$xrpath $temp_xrpath";;
-+		   esac;;
-+	      *) temp_deplibs="$temp_deplibs $libdir";;
-+	      esac
-+	    done
-+	    dependency_libs="$temp_deplibs"
-+	  fi
++      # Compute libraries that are listed more than once in $predeps
++      # $postdeps and mark them as special (i.e., whose duplicates are
++      # not to be eliminated).
++      pre_post_deps=
++      if $opt_duplicate_compiler_generated_deps; then
++	for pre_post_dep in $predeps $postdeps; do
++	  case "$pre_post_deps " in
++	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
++	  esac
++	  func_append pre_post_deps " $pre_post_dep"
++	done
++      fi
++      pre_post_deps=
++    fi
 +
-+	  newlib_search_path="$newlib_search_path $absdir"
-+	  # Link against this library
-+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-+	  # ... and its dependency_libs
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    if $opt_duplicate_deps ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done
++    deplibs=
++    newdependency_libs=
++    newlib_search_path=
++    need_relink=no # whether we're linking any uninstalled libtool libraries
++    notinst_deplibs= # not-installed libtool libraries
++    notinst_path= # paths that contain not-installed libtool libraries
 +
-+	  if test "$link_all_deplibs" != no; then
-+	    # Add the search paths of all dependency libraries
-+	    for deplib in $dependency_libs; do
-+	      path=
-+	      case $deplib in
-+	      -L*) path="$deplib" ;;
-+	      *.la)
-+	        func_dirname "$deplib" "" "."
-+		dir="$func_dirname_result"
-+		# We need an absolute path.
-+		case $dir in
-+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-+		*)
-+		  absdir=`cd "$dir" && pwd`
-+		  if test -z "$absdir"; then
-+		    func_warning "cannot determine absolute directory name of \`$dir'"
-+		    absdir="$dir"
-+		  fi
-+		  ;;
-+		esac
-+		if $GREP "^installed=no" $deplib > /dev/null; then
-+		case $host in
-+		*-*-darwin*)
-+		  depdepl=
-+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+		  if test -n "$deplibrary_names" ; then
-+		    for tmp in $deplibrary_names ; do
-+		      depdepl=$tmp
-+		    done
-+		    if test -f "$absdir/$objdir/$depdepl" ; then
-+		      depdepl="$absdir/$objdir/$depdepl"
-+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-+                      if test -z "$darwin_install_name"; then
-+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-+                      fi
-+		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-+		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-+		      path=
-+		    fi
-+		  fi
-+		  ;;
-+		*)
-+		  path="-L$absdir/$objdir"
-+		  ;;
-+		esac
-+		else
-+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		  test -z "$libdir" && \
-+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-+		  test "$absdir" != "$libdir" && \
-+		    func_warning "\`$deplib' seems to be moved"
++    case $linkmode in
++    lib)
++	passes="conv dlpreopen link"
++	for file in $dlfiles $dlprefiles; do
++	  case $file in
++	  *.la) ;;
++	  *)
++	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
++	    ;;
++	  esac
++	done
++	;;
++    prog)
++	compile_deplibs=
++	finalize_deplibs=
++	alldeplibs=no
++	newdlfiles=
++	newdlprefiles=
++	passes="conv scan dlopen dlpreopen link"
++	;;
++    *)  passes="conv"
++	;;
++    esac
 +
-+		  path="-L$absdir"
-+		fi
-+		;;
-+	      esac
-+	      case " $deplibs " in
-+	      *" $path "*) ;;
-+	      *) deplibs="$path $deplibs" ;;
-+	      esac
-+	    done
-+	  fi # link_all_deplibs != no
-+	fi # linkmode = lib
-+      done # for deplib in $libs
-+      if test "$pass" = link; then
-+	if test "$linkmode" = "prog"; then
-+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-+	else
-+	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	fi
-+      fi
-+      dependency_libs="$newdependency_libs"
-+      if test "$pass" = dlpreopen; then
-+	# Link the dlpreopened libraries before other libraries
-+	for deplib in $save_deplibs; do
-+	  deplibs="$deplib $deplibs"
++    for pass in $passes; do
++      # The preopen pass in lib mode reverses $deplibs; put it back here
++      # so that -L comes before libs that need it for instance...
++      if test "$linkmode,$pass" = "lib,link"; then
++	## FIXME: Find the place where the list is rebuilt in the wrong
++	##        order, and fix it there properly
++        tmp_deplibs=
++	for deplib in $deplibs; do
++	  tmp_deplibs="$deplib $tmp_deplibs"
 +	done
++	deplibs="$tmp_deplibs"
 +      fi
-+      if test "$pass" != dlopen; then
-+	if test "$pass" != conv; then
-+	  # Make sure lib_search_path contains only unique directories.
-+	  lib_search_path=
-+	  for dir in $newlib_search_path; do
-+	    case "$lib_search_path " in
-+	    *" $dir "*) ;;
-+	    *) lib_search_path="$lib_search_path $dir" ;;
++
++      if test "$linkmode,$pass" = "lib,link" ||
++	 test "$linkmode,$pass" = "prog,scan"; then
++	libs="$deplibs"
++	deplibs=
++      fi
++      if test "$linkmode" = prog; then
++	case $pass in
++	dlopen) libs="$dlfiles" ;;
++	dlpreopen) libs="$dlprefiles" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
++	esac
++      fi
++      if test "$linkmode,$pass" = "lib,dlpreopen"; then
++	# Collect and forward deplibs of preopened libtool libs
++	for lib in $dlprefiles; do
++	  # Ignore non-libtool-libs
++	  dependency_libs=
++	  func_resolve_sysroot "$lib"
++	  case $lib in
++	  *.la)	func_source "$func_resolve_sysroot_result" ;;
++	  esac
++
++	  # Collect preopened libtool deplibs, except any this library
++	  # has declared as weak libs
++	  for deplib in $dependency_libs; do
++	    func_basename "$deplib"
++            deplib_base=$func_basename_result
++	    case " $weak_libs " in
++	    *" $deplib_base "*) ;;
++	    *) func_append deplibs " $deplib" ;;
 +	    esac
 +	  done
-+	  newlib_search_path=
-+	fi
++	done
++	libs="$dlprefiles"
++      fi
++      if test "$pass" = dlopen; then
++	# Collect dlpreopened libraries
++	save_deplibs="$deplibs"
++	deplibs=
++      fi
 +
-+	if test "$linkmode,$pass" != "prog,link"; then
-+	  vars="deplibs"
-+	else
-+	  vars="compile_deplibs finalize_deplibs"
-+	fi
-+	for var in $vars dependency_libs; do
-+	  # Add libraries to $var in reverse order
-+	  eval tmp_libs=\"\$$var\"
-+	  new_libs=
-+	  for deplib in $tmp_libs; do
-+	    # FIXME: Pedantically, this is the right thing to do, so
-+	    #        that some nasty dependency loop isn't accidentally
-+	    #        broken:
-+	    #new_libs="$deplib $new_libs"
-+	    # Pragmatically, this seems to cause very few problems in
-+	    # practice:
-+	    case $deplib in
-+	    -L*) new_libs="$deplib $new_libs" ;;
-+	    -R*) ;;
-+	    *)
-+	      # And here is the reason: when a library appears more
-+	      # than once as an explicit dependence of a library, or
-+	      # is implicitly linked in more than once by the
-+	      # compiler, it is considered special, and multiple
-+	      # occurrences thereof are not removed.  Compare this
-+	      # with having the same library being listed as a
-+	      # dependency of multiple other libraries: in this case,
-+	      # we know (pedantically, we assume) the library does not
-+	      # need to be listed more than once, so we keep only the
-+	      # last copy.  This is not always right, but it is rare
-+	      # enough that we require users that really mean to play
-+	      # such unportable linking tricks to link the library
-+	      # using -Wl,-lname, so that libtool does not consider it
-+	      # for duplicate removal.
-+	      case " $specialdeplibs " in
-+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-+	      *)
-+		case " $new_libs " in
-+		*" $deplib "*) ;;
-+		*) new_libs="$deplib $new_libs" ;;
++      for deplib in $libs; do
++	lib=
++	found=no
++	case $deplib in
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    func_append compiler_flags " $deplib"
++	    if test "$linkmode" = lib ; then
++		case "$new_inherited_linker_flags " in
++		    *" $deplib "*) ;;
++		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 +		esac
++	    fi
++	  fi
++	  continue
++	  ;;
++	-l*)
++	  if test "$linkmode" != lib && test "$linkmode" != prog; then
++	    func_warning "\`-l' is ignored for archives/objects"
++	    continue
++	  fi
++	  func_stripname '-l' '' "$deplib"
++	  name=$func_stripname_result
++	  if test "$linkmode" = lib; then
++	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
++	  else
++	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
++	  fi
++	  for searchdir in $searchdirs; do
++	    for search_ext in .la $std_shrext .so .a; do
++	      # Search the libtool library
++	      lib="$searchdir/lib${name}${search_ext}"
++	      if test -f "$lib"; then
++		if test "$search_ext" = ".la"; then
++		  found=yes
++		else
++		  found=no
++		fi
++		break 2
++	      fi
++	    done
++	  done
++	  if test "$found" != yes; then
++	    # deplib doesn't seem to be a libtool library
++	    if test "$linkmode,$pass" = "prog,link"; then
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      deplibs="$deplib $deplibs"
++	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    continue
++	  else # deplib is a libtool library
++	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
++	    # We need to do some special things here, and not later.
++	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	      case " $predeps $postdeps " in
++	      *" $deplib "*)
++		if func_lalib_p "$lib"; then
++		  library_names=
++		  old_library=
++		  func_source "$lib"
++		  for l in $old_library $library_names; do
++		    ll="$l"
++		  done
++		  if test "X$ll" = "X$old_library" ; then # only static version available
++		    found=no
++		    func_dirname "$lib" "" "."
++		    ladir="$func_dirname_result"
++		    lib=$ladir/$old_library
++		    if test "$linkmode,$pass" = "prog,link"; then
++		      compile_deplibs="$deplib $compile_deplibs"
++		      finalize_deplibs="$deplib $finalize_deplibs"
++		    else
++		      deplibs="$deplib $deplibs"
++		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++		    fi
++		    continue
++		  fi
++		fi
 +		;;
++	      *) ;;
 +	      esac
-+	      ;;
++	    fi
++	  fi
++	  ;; # -l
++	*.ltframework)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	    if test "$linkmode" = lib ; then
++		case "$new_inherited_linker_flags " in
++		    *" $deplib "*) ;;
++		    * ) func_append new_inherited_linker_flags " $deplib" ;;
++		esac
++	    fi
++	  fi
++	  continue
++	  ;;
++	-L*)
++	  case $linkmode in
++	  lib)
++	    deplibs="$deplib $deplibs"
++	    test "$pass" = conv && continue
++	    newdependency_libs="$deplib $newdependency_libs"
++	    func_stripname '-L' '' "$deplib"
++	    func_resolve_sysroot "$func_stripname_result"
++	    func_append newlib_search_path " $func_resolve_sysroot_result"
++	    ;;
++	  prog)
++	    if test "$pass" = conv; then
++	      deplibs="$deplib $deplibs"
++	      continue
++	    fi
++	    if test "$pass" = scan; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    fi
++	    func_stripname '-L' '' "$deplib"
++	    func_resolve_sysroot "$func_stripname_result"
++	    func_append newlib_search_path " $func_resolve_sysroot_result"
++	    ;;
++	  *)
++	    func_warning "\`-L' is ignored for archives/objects"
++	    ;;
++	  esac # linkmode
++	  continue
++	  ;; # -L
++	-R*)
++	  if test "$pass" = link; then
++	    func_stripname '-R' '' "$deplib"
++	    func_resolve_sysroot "$func_stripname_result"
++	    dir=$func_resolve_sysroot_result
++	    # Make sure the xrpath contains only unique directories.
++	    case "$xrpath " in
++	    *" $dir "*) ;;
++	    *) func_append xrpath " $dir" ;;
 +	    esac
-+	  done
-+	  tmp_libs=
-+	  for deplib in $new_libs; do
-+	    case $deplib in
-+	    -L*)
-+	      case " $tmp_libs " in
-+	      *" $deplib "*) ;;
-+	      *) tmp_libs="$tmp_libs $deplib" ;;
++	  fi
++	  deplibs="$deplib $deplibs"
++	  continue
++	  ;;
++	*.la)
++	  func_resolve_sysroot "$deplib"
++	  lib=$func_resolve_sysroot_result
++	  ;;
++	*.$libext)
++	  if test "$pass" = conv; then
++	    deplibs="$deplib $deplibs"
++	    continue
++	  fi
++	  case $linkmode in
++	  lib)
++	    # Linking convenience modules into shared libraries is allowed,
++	    # but linking other static libraries is non-portable.
++	    case " $dlpreconveniencelibs " in
++	    *" $deplib "*) ;;
++	    *)
++	      valid_a_lib=no
++	      case $deplibs_check_method in
++		match_pattern*)
++		  set dummy $deplibs_check_method; shift
++		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
++		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
++		    | $EGREP "$match_pattern_regex" > /dev/null; then
++		    valid_a_lib=yes
++		  fi
++		;;
++		pass_all)
++		  valid_a_lib=yes
++		;;
 +	      esac
++	      if test "$valid_a_lib" != yes; then
++		echo
++		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
++		echo "*** I have the capability to make that library automatically link in when"
++		echo "*** you link to this library.  But I can only do this if you have a"
++		echo "*** shared version of the library, which you do not appear to have"
++		echo "*** because the file extensions .$libext of this argument makes me believe"
++		echo "*** that it is just a static archive that I should not use here."
++	      else
++		echo
++		$ECHO "*** Warning: Linking the shared library $output against the"
++		$ECHO "*** static library $deplib is not portable!"
++		deplibs="$deplib $deplibs"
++	      fi
 +	      ;;
-+	    *) tmp_libs="$tmp_libs $deplib" ;;
 +	    esac
-+	  done
-+	  eval $var=\"$tmp_libs\"
-+	done # for var
-+      fi
-+      # Last step: remove runtime libs from dependency_libs
-+      # (they stay in deplibs)
-+      tmp_libs=
-+      for i in $dependency_libs ; do
-+	case " $predeps $postdeps $compiler_lib_search_path " in
-+	*" $i "*)
-+	  i=""
++	    continue
++	    ;;
++	  prog)
++	    if test "$pass" != link; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    fi
++	    continue
++	    ;;
++	  esac # linkmode
++	  ;; # *.$libext
++	*.lo | *.$objext)
++	  if test "$pass" = conv; then
++	    deplibs="$deplib $deplibs"
++	  elif test "$linkmode" = prog; then
++	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	      # If there is no dlopen support or we're linking statically,
++	      # we need to preload.
++	      func_append newdlprefiles " $deplib"
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      func_append newdlfiles " $deplib"
++	    fi
++	  fi
++	  continue
 +	  ;;
-+	esac
-+	if test -n "$i" ; then
-+	  tmp_libs="$tmp_libs $i"
-+	fi
-+      done
-+      dependency_libs=$tmp_libs
-+    done # for pass
-+    if test "$linkmode" = prog; then
-+      dlfiles="$newdlfiles"
-+    fi
-+    if test "$linkmode" = prog || test "$linkmode" = lib; then
-+      dlprefiles="$newdlprefiles"
-+    fi
++	%DEPLIBS%)
++	  alldeplibs=yes
++	  continue
++	  ;;
++	esac # case $deplib
 +
-+    case $linkmode in
-+    oldlib)
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	func_warning "\`-dlopen' is ignored for archives"
-+      fi
++	if test "$found" = yes || test -f "$lib"; then :
++	else
++	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
++	fi
 +
-+      case " $deplibs" in
-+      *\ -l* | *\ -L*)
-+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-+      esac
++	# Check to see that this really is a libtool archive.
++	func_lalib_unsafe_p "$lib" \
++	  || func_fatal_error "\`$lib' is not a valid libtool archive"
 +
-+      test -n "$rpath" && \
-+	func_warning "\`-rpath' is ignored for archives"
++	func_dirname "$lib" "" "."
++	ladir="$func_dirname_result"
 +
-+      test -n "$xrpath" && \
-+	func_warning "\`-R' is ignored for archives"
++	dlname=
++	dlopen=
++	dlpreopen=
++	libdir=
++	library_names=
++	old_library=
++	inherited_linker_flags=
++	# If the library was installed with an old release of libtool,
++	# it will not redefine variables installed, or shouldnotlink
++	installed=yes
++	shouldnotlink=no
++	avoidtemprpath=
 +
-+      test -n "$vinfo" && \
-+	func_warning "\`-version-info/-version-number' is ignored for archives"
 +
-+      test -n "$release" && \
-+	func_warning "\`-release' is ignored for archives"
++	# Read the .la file
++	func_source "$lib"
 +
-+      test -n "$export_symbols$export_symbols_regex" && \
-+	func_warning "\`-export-symbols' is ignored for archives"
++	# Convert "-framework foo" to "foo.ltframework"
++	if test -n "$inherited_linker_flags"; then
++	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
++	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
++	    case " $new_inherited_linker_flags " in
++	      *" $tmp_inherited_linker_flag "*) ;;
++	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
++	    esac
++	  done
++	fi
++	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++	if test "$linkmode,$pass" = "lib,link" ||
++	   test "$linkmode,$pass" = "prog,scan" ||
++	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
++	  test -n "$dlopen" && func_append dlfiles " $dlopen"
++	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
++	fi
 +
-+      # Now set the variables for building old libraries.
-+      build_libtool_libs=no
-+      oldlibs="$output"
-+      objs="$objs$old_deplibs"
-+      ;;
++	if test "$pass" = conv; then
++	  # Only check for convenience libraries
++	  deplibs="$lib $deplibs"
++	  if test -z "$libdir"; then
++	    if test -z "$old_library"; then
++	      func_fatal_error "cannot find name of link library for \`$lib'"
++	    fi
++	    # It is a libtool convenience library, so add in its objects.
++	    func_append convenience " $ladir/$objdir/$old_library"
++	    func_append old_convenience " $ladir/$objdir/$old_library"
++	    tmp_libs=
++	    for deplib in $dependency_libs; do
++	      deplibs="$deplib $deplibs"
++	      if $opt_preserve_dup_deps ; then
++		case "$tmp_libs " in
++		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
++		esac
++	      fi
++	      func_append tmp_libs " $deplib"
++	    done
++	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
++	    func_fatal_error "\`$lib' is not a convenience library"
++	  fi
++	  continue
++	fi # $pass = conv
 +
-+    lib)
-+      # Make sure we only generate libraries of the form `libNAME.la'.
-+      case $outputname in
-+      lib*)
-+	func_stripname 'lib' '.la' "$outputname"
-+	name=$func_stripname_result
-+	eval shared_ext=\"$shrext_cmds\"
-+	eval libname=\"$libname_spec\"
-+	;;
-+      *)
-+	test "$module" = no && \
-+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
 +
-+	if test "$need_lib_prefix" != no; then
-+	  # Add the "lib" prefix for modules if required
-+	  func_stripname '' '.la' "$outputname"
-+	  name=$func_stripname_result
-+	  eval shared_ext=\"$shrext_cmds\"
-+	  eval libname=\"$libname_spec\"
++	# Get the name of the library we link against.
++	linklib=
++	if test -n "$old_library" &&
++	   { test "$prefer_static_libs" = yes ||
++	     test "$prefer_static_libs,$installed" = "built,no"; }; then
++	  linklib=$old_library
 +	else
-+	  func_stripname '' '.la' "$outputname"
-+	  libname=$func_stripname_result
++	  for l in $old_library $library_names; do
++	    linklib="$l"
++	  done
 +	fi
-+	;;
-+      esac
-+
-+      if test -n "$objs"; then
-+	if test "$deplibs_check_method" != pass_all; then
-+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-+	else
-+	  $ECHO
-+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-+	  $ECHO "*** objects $objs is not portable!"
-+	  libobjs="$libobjs $objs"
++	if test -z "$linklib"; then
++	  func_fatal_error "cannot find name of link library for \`$lib'"
 +	fi
-+      fi
 +
-+      test "$dlself" != no && \
-+	func_warning "\`-dlopen self' is ignored for libtool libraries"
++	# This library was specified with -dlopen.
++	if test "$pass" = dlopen; then
++	  if test -z "$libdir"; then
++	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
++	  fi
++	  if test -z "$dlname" ||
++	     test "$dlopen_support" != yes ||
++	     test "$build_libtool_libs" = no; then
++	    # If there is no dlname, no dlopen support or we're linking
++	    # statically, we need to preload.  We also need to preload any
++	    # dependent libraries so libltdl's deplib preloader doesn't
++	    # bomb out in the load deplibs phase.
++	    func_append dlprefiles " $lib $dependency_libs"
++	  else
++	    func_append newdlfiles " $lib"
++	  fi
++	  continue
++	fi # $pass = dlopen
 +
-+      set dummy $rpath
-+      shift
-+      test "$#" -gt 1 && \
-+	func_warning "ignoring multiple \`-rpath's for a libtool library"
++	# We need an absolute path.
++	case $ladir in
++	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
++	*)
++	  abs_ladir=`cd "$ladir" && pwd`
++	  if test -z "$abs_ladir"; then
++	    func_warning "cannot determine absolute directory name of \`$ladir'"
++	    func_warning "passing it literally to the linker, although it might fail"
++	    abs_ladir="$ladir"
++	  fi
++	  ;;
++	esac
++	func_basename "$lib"
++	laname="$func_basename_result"
 +
-+      install_libdir="$1"
++	# Find the relevant object directory and library name.
++	if test "X$installed" = Xyes; then
++	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    func_warning "library \`$lib' was moved."
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	  else
++	    dir="$lt_sysroot$libdir"
++	    absdir="$lt_sysroot$libdir"
++	  fi
++	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
++	else
++	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    # Remove this search path later
++	    func_append notinst_path " $abs_ladir"
++	  else
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
++	    # Remove this search path later
++	    func_append notinst_path " $abs_ladir"
++	  fi
++	fi # $installed = yes
++	func_stripname 'lib' '.la' "$laname"
++	name=$func_stripname_result
 +
-+      oldlibs=
-+      if test -z "$rpath"; then
-+	if test "$build_libtool_libs" = yes; then
-+	  # Building a libtool convenience library.
-+	  # Some compilers have problems with a `.al' extension so
-+	  # convenience libraries should have the same extension an
-+	  # archive normally would.
-+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-+	  build_libtool_libs=convenience
-+	  build_old_libs=yes
-+	fi
++	# This library was specified with -dlpreopen.
++	if test "$pass" = dlpreopen; then
++	  if test -z "$libdir" && test "$linkmode" = prog; then
++	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
++	  fi
++	  case "$host" in
++	    # special handling for platforms with PE-DLLs.
++	    *cygwin* | *mingw* | *cegcc* )
++	      # Linker will automatically link against shared library if both
++	      # static and shared are present.  Therefore, ensure we extract
++	      # symbols from the import library if a shared library is present
++	      # (otherwise, the dlopen module name will be incorrect).  We do
++	      # this by putting the import library name into $newdlprefiles.
++	      # We recover the dlopen module name by 'saving' the la file
++	      # name in a special purpose variable, and (later) extracting the
++	      # dlname from the la file.
++	      if test -n "$dlname"; then
++	        func_tr_sh "$dir/$linklib"
++	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
++	        func_append newdlprefiles " $dir/$linklib"
++	      else
++	        func_append newdlprefiles " $dir/$old_library"
++	        # Keep a list of preopened convenience libraries to check
++	        # that they are being used correctly in the link pass.
++	        test -z "$libdir" && \
++	          func_append dlpreconveniencelibs " $dir/$old_library"
++	      fi
++	    ;;
++	    * )
++	      # Prefer using a static library (so that no silly _DYNAMIC symbols
++	      # are required to link).
++	      if test -n "$old_library"; then
++	        func_append newdlprefiles " $dir/$old_library"
++	        # Keep a list of preopened convenience libraries to check
++	        # that they are being used correctly in the link pass.
++	        test -z "$libdir" && \
++	          func_append dlpreconveniencelibs " $dir/$old_library"
++	      # Otherwise, use the dlname, so that lt_dlopen finds it.
++	      elif test -n "$dlname"; then
++	        func_append newdlprefiles " $dir/$dlname"
++	      else
++	        func_append newdlprefiles " $dir/$linklib"
++	      fi
++	    ;;
++	  esac
++	fi # $pass = dlpreopen
 +
-+	test -n "$vinfo" && \
-+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
++	if test -z "$libdir"; then
++	  # Link the convenience library
++	  if test "$linkmode" = lib; then
++	    deplibs="$dir/$old_library $deplibs"
++	  elif test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$dir/$old_library $compile_deplibs"
++	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
++	  else
++	    deplibs="$lib $deplibs" # used for prog,scan pass
++	  fi
++	  continue
++	fi
 +
-+	test -n "$release" && \
-+	  func_warning "\`-release' is ignored for convenience libraries"
-+      else
 +
-+	# Parse the version information argument.
-+	save_ifs="$IFS"; IFS=':'
-+	set dummy $vinfo 0 0 0
-+	shift
-+	IFS="$save_ifs"
++	if test "$linkmode" = prog && test "$pass" != link; then
++	  func_append newlib_search_path " $ladir"
++	  deplibs="$lib $deplibs"
 +
-+	test -n "$7" && \
-+	  func_fatal_help "too many parameters to \`-version-info'"
++	  linkalldeplibs=no
++	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
++	     test "$build_libtool_libs" = no; then
++	    linkalldeplibs=yes
++	  fi
 +
-+	# convert absolute version numbers to libtool ages
-+	# this retains compatibility with .la files and attempts
-+	# to make the code below a bit more comprehensible
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    case $deplib in
++	    -L*) func_stripname '-L' '' "$deplib"
++	         func_resolve_sysroot "$func_stripname_result"
++	         func_append newlib_search_path " $func_resolve_sysroot_result"
++		 ;;
++	    esac
++	    # Need to link against all dependency_libs?
++	    if test "$linkalldeplibs" = yes; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      # Need to hardcode shared library paths
++	      # or/and link against static libraries
++	      newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    if $opt_preserve_dup_deps ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
++	      esac
++	    fi
++	    func_append tmp_libs " $deplib"
++	  done # for deplib
++	  continue
++	fi # $linkmode = prog...
 +
-+	case $vinfo_number in
-+	yes)
-+	  number_major="$1"
-+	  number_minor="$2"
-+	  number_revision="$3"
-+	  #
-+	  # There are really only two kinds -- those that
-+	  # use the current revision as the major version
-+	  # and those that subtract age and use age as
-+	  # a minor version.  But, then there is irix
-+	  # which has an extra 1 added just for fun
-+	  #
-+	  case $version_type in
-+	  darwin|linux|osf|windows|none)
-+	    func_arith $number_major + $number_minor
-+	    current=$func_arith_result
-+	    age="$number_minor"
-+	    revision="$number_revision"
-+	    ;;
-+	  freebsd-aout|freebsd-elf|sunos)
-+	    current="$number_major"
-+	    revision="$number_minor"
-+	    age="0"
-+	    ;;
-+	  irix|nonstopux)
-+	    func_arith $number_major + $number_minor
-+	    current=$func_arith_result
-+	    age="$number_minor"
-+	    revision="$number_minor"
-+	    lt_irix_increment=no
-+	    ;;
-+	  *)
-+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-+	    ;;
-+	  esac
-+	  ;;
-+	no)
-+	  current="$1"
-+	  revision="$2"
-+	  age="$3"
-+	  ;;
-+	esac
-+
-+	# Check that each of the things are valid numbers.
-+	case $current in
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+	*)
-+	  func_error "CURRENT \`$current' must be a nonnegative integer"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
-+	  ;;
-+	esac
-+
-+	case $revision in
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+	*)
-+	  func_error "REVISION \`$revision' must be a nonnegative integer"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
-+	  ;;
-+	esac
-+
-+	case $age in
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+	*)
-+	  func_error "AGE \`$age' must be a nonnegative integer"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
-+	  ;;
-+	esac
-+
-+	if test "$age" -gt "$current"; then
-+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
-+	fi
-+
-+	# Calculate the version variables.
-+	major=
-+	versuffix=
-+	verstring=
-+	case $version_type in
-+	none) ;;
-+
-+	darwin)
-+	  # Like Linux, but with the current version available in
-+	  # verstring for coding it into the library header
-+	  func_arith $current - $age
-+	  major=.$func_arith_result
-+	  versuffix="$major.$age.$revision"
-+	  # Darwin ld doesn't like 0 for these options...
-+	  func_arith $current + 1
-+	  minor_current=$func_arith_result
-+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  ;;
-+
-+	freebsd-aout)
-+	  major=".$current"
-+	  versuffix=".$current.$revision";
-+	  ;;
++	if test "$linkmode,$pass" = "prog,link"; then
++	  if test -n "$library_names" &&
++	     { { test "$prefer_static_libs" = no ||
++	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
++	       test -z "$old_library"; }; then
++	    # We need to hardcode the library path
++	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
++	      # Make sure the rpath contains only unique directories.
++	      case "$temp_rpath:" in
++	      *"$absdir:"*) ;;
++	      *) func_append temp_rpath "$absdir:" ;;
++	      esac
++	    fi
 +
-+	freebsd-elf)
-+	  major=".$current"
-+	  versuffix=".$current"
-+	  ;;
++	    # Hardcode the library path.
++	    # Skip directories that are in the system default run-time
++	    # search path.
++	    case " $sys_lib_dlsearch_path " in
++	    *" $absdir "*) ;;
++	    *)
++	      case "$compile_rpath " in
++	      *" $absdir "*) ;;
++	      *) func_append compile_rpath " $absdir" ;;
++	      esac
++	      ;;
++	    esac
++	    case " $sys_lib_dlsearch_path " in
++	    *" $libdir "*) ;;
++	    *)
++	      case "$finalize_rpath " in
++	      *" $libdir "*) ;;
++	      *) func_append finalize_rpath " $libdir" ;;
++	      esac
++	      ;;
++	    esac
++	  fi # $linkmode,$pass = prog,link...
 +
-+	irix | nonstopux)
-+	  if test "X$lt_irix_increment" = "Xno"; then
-+	    func_arith $current - $age
-+	  else
-+	    func_arith $current - $age + 1
++	  if test "$alldeplibs" = yes &&
++	     { test "$deplibs_check_method" = pass_all ||
++	       { test "$build_libtool_libs" = yes &&
++		 test -n "$library_names"; }; }; then
++	    # We only need to search for static libraries
++	    continue
 +	  fi
-+	  major=$func_arith_result
++	fi
 +
-+	  case $version_type in
-+	    nonstopux) verstring_prefix=nonstopux ;;
-+	    *)         verstring_prefix=sgi ;;
++	link_static=no # Whether the deplib will be linked statically
++	use_static_libs=$prefer_static_libs
++	if test "$use_static_libs" = built && test "$installed" = yes; then
++	  use_static_libs=no
++	fi
++	if test -n "$library_names" &&
++	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
++	  case $host in
++	  *cygwin* | *mingw* | *cegcc*)
++	      # No point in relinking DLLs because paths are not encoded
++	      func_append notinst_deplibs " $lib"
++	      need_relink=no
++	    ;;
++	  *)
++	    if test "$installed" = no; then
++	      func_append notinst_deplibs " $lib"
++	      need_relink=yes
++	    fi
++	    ;;
 +	  esac
-+	  verstring="$verstring_prefix$major.$revision"
++	  # This is a shared library
 +
-+	  # Add in all the interfaces that we are compatible with.
-+	  loop=$revision
-+	  while test "$loop" -ne 0; do
-+	    func_arith $revision - $loop
-+	    iface=$func_arith_result
-+	    func_arith $loop - 1
-+	    loop=$func_arith_result
-+	    verstring="$verstring_prefix$major.$iface:$verstring"
++	  # Warn about portability, can't link against -module's on some
++	  # systems (darwin).  Don't bleat about dlopened modules though!
++	  dlopenmodule=""
++	  for dlpremoduletest in $dlprefiles; do
++	    if test "X$dlpremoduletest" = "X$lib"; then
++	      dlopenmodule="$dlpremoduletest"
++	      break
++	    fi
 +	  done
++	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
++	    echo
++	    if test "$linkmode" = prog; then
++	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
++	    else
++	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
++	    fi
++	    $ECHO "*** $linklib is not portable!"
++	  fi
++	  if test "$linkmode" = lib &&
++	     test "$hardcode_into_libs" = yes; then
++	    # Hardcode the library path.
++	    # Skip directories that are in the system default run-time
++	    # search path.
++	    case " $sys_lib_dlsearch_path " in
++	    *" $absdir "*) ;;
++	    *)
++	      case "$compile_rpath " in
++	      *" $absdir "*) ;;
++	      *) func_append compile_rpath " $absdir" ;;
++	      esac
++	      ;;
++	    esac
++	    case " $sys_lib_dlsearch_path " in
++	    *" $libdir "*) ;;
++	    *)
++	      case "$finalize_rpath " in
++	      *" $libdir "*) ;;
++	      *) func_append finalize_rpath " $libdir" ;;
++	      esac
++	      ;;
++	    esac
++	  fi
 +
-+	  # Before this point, $major must not contain `.'.
-+	  major=.$major
-+	  versuffix="$major.$revision"
-+	  ;;
-+
-+	linux)
-+	  func_arith $current - $age
-+	  major=.$func_arith_result
-+	  versuffix="$major.$age.$revision"
-+	  ;;
++	  if test -n "$old_archive_from_expsyms_cmds"; then
++	    # figure out the soname
++	    set dummy $library_names
++	    shift
++	    realname="$1"
++	    shift
++	    libname=`eval "\\$ECHO \"$libname_spec\""`
++	    # use dlname if we got it. it's perfectly good, no?
++	    if test -n "$dlname"; then
++	      soname="$dlname"
++	    elif test -n "$soname_spec"; then
++	      # bleh windows
++	      case $host in
++	      *cygwin* | mingw* | *cegcc*)
++	        func_arith $current - $age
++		major=$func_arith_result
++		versuffix="-$major"
++		;;
++	      esac
++	      eval soname=\"$soname_spec\"
++	    else
++	      soname="$realname"
++	    fi
 +
-+	osf)
-+	  func_arith $current - $age
-+	  major=.$func_arith_result
-+	  versuffix=".$current.$age.$revision"
-+	  verstring="$current.$age.$revision"
++	    # Make a new name for the extract_expsyms_cmds to use
++	    soroot="$soname"
++	    func_basename "$soroot"
++	    soname="$func_basename_result"
++	    func_stripname 'lib' '.dll' "$soname"
++	    newlib=libimp-$func_stripname_result.a
 +
-+	  # Add in all the interfaces that we are compatible with.
-+	  loop=$age
-+	  while test "$loop" -ne 0; do
-+	    func_arith $current - $loop
-+	    iface=$func_arith_result
-+	    func_arith $loop - 1
-+	    loop=$func_arith_result
-+	    verstring="$verstring:${iface}.0"
-+	  done
++	    # If the library has no export list, then create one now
++	    if test -f "$output_objdir/$soname-def"; then :
++	    else
++	      func_verbose "extracting exported symbol list from \`$soname'"
++	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
++	    fi
 +
-+	  # Make executables depend on our current version.
-+	  verstring="$verstring:${current}.0"
-+	  ;;
++	    # Create $newlib
++	    if test -f "$output_objdir/$newlib"; then :; else
++	      func_verbose "generating import library for \`$soname'"
++	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
++	    fi
++	    # make sure the library variables are pointing to the new library
++	    dir=$output_objdir
++	    linklib=$newlib
++	  fi # test -n "$old_archive_from_expsyms_cmds"
 +
-+	qnx)
-+	  major=".$current"
-+	  versuffix=".$current"
-+	  ;;
++	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
++	    add_shlibpath=
++	    add_dir=
++	    add=
++	    lib_linked=yes
++	    case $hardcode_action in
++	    immediate | unsupported)
++	      if test "$hardcode_direct" = no; then
++		add="$dir/$linklib"
++		case $host in
++		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
++		    *-*-unixware7*) add_dir="-L$dir" ;;
++		  *-*-darwin* )
++		    # if the lib is a (non-dlopened) module then we can not
++		    # link against it, someone is ignoring the earlier warnings
++		    if /usr/bin/file -L $add 2> /dev/null |
++			 $GREP ": [^:]* bundle" >/dev/null ; then
++		      if test "X$dlopenmodule" != "X$lib"; then
++			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
++			if test -z "$old_library" ; then
++			  echo
++			  echo "*** And there doesn't seem to be a static archive available"
++			  echo "*** The link will probably fail, sorry"
++			else
++			  add="$dir/$old_library"
++			fi
++		      elif test -n "$old_library"; then
++			add="$dir/$old_library"
++		      fi
++		    fi
++		esac
++	      elif test "$hardcode_minus_L" = no; then
++		case $host in
++		*-*-sunos*) add_shlibpath="$dir" ;;
++		esac
++		add_dir="-L$dir"
++		add="-l$name"
++	      elif test "$hardcode_shlibpath_var" = no; then
++		add_shlibpath="$dir"
++		add="-l$name"
++	      else
++		lib_linked=no
++	      fi
++	      ;;
++	    relink)
++	      if test "$hardcode_direct" = yes &&
++	         test "$hardcode_direct_absolute" = no; then
++		add="$dir/$linklib"
++	      elif test "$hardcode_minus_L" = yes; then
++		add_dir="-L$dir"
++		# Try looking first in the location we're being installed to.
++		if test -n "$inst_prefix_dir"; then
++		  case $libdir in
++		    [\\/]*)
++		      func_append add_dir " -L$inst_prefix_dir$libdir"
++		      ;;
++		  esac
++		fi
++		add="-l$name"
++	      elif test "$hardcode_shlibpath_var" = yes; then
++		add_shlibpath="$dir"
++		add="-l$name"
++	      else
++		lib_linked=no
++	      fi
++	      ;;
++	    *) lib_linked=no ;;
++	    esac
 +
-+	sunos)
-+	  major=".$current"
-+	  versuffix=".$current.$revision"
-+	  ;;
++	    if test "$lib_linked" != yes; then
++	      func_fatal_configuration "unsupported hardcode properties"
++	    fi
 +
-+	windows)
-+	  # Use '-' rather than '.', since we only want one
-+	  # extension on DOS 8.3 filesystems.
-+	  func_arith $current - $age
-+	  major=$func_arith_result
-+	  versuffix="-$major"
-+	  ;;
++	    if test -n "$add_shlibpath"; then
++	      case :$compile_shlibpath: in
++	      *":$add_shlibpath:"*) ;;
++	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
++	      esac
++	    fi
++	    if test "$linkmode" = prog; then
++	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
++	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
++	    else
++	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
++	      test -n "$add" && deplibs="$add $deplibs"
++	      if test "$hardcode_direct" != yes &&
++		 test "$hardcode_minus_L" != yes &&
++		 test "$hardcode_shlibpath_var" = yes; then
++		case :$finalize_shlibpath: in
++		*":$libdir:"*) ;;
++		*) func_append finalize_shlibpath "$libdir:" ;;
++		esac
++	      fi
++	    fi
++	  fi
 +
-+	*)
-+	  func_fatal_configuration "unknown library version type \`$version_type'"
-+	  ;;
-+	esac
++	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
++	    add_shlibpath=
++	    add_dir=
++	    add=
++	    # Finalize command for both is simple: just hardcode it.
++	    if test "$hardcode_direct" = yes &&
++	       test "$hardcode_direct_absolute" = no; then
++	      add="$libdir/$linklib"
++	    elif test "$hardcode_minus_L" = yes; then
++	      add_dir="-L$libdir"
++	      add="-l$name"
++	    elif test "$hardcode_shlibpath_var" = yes; then
++	      case :$finalize_shlibpath: in
++	      *":$libdir:"*) ;;
++	      *) func_append finalize_shlibpath "$libdir:" ;;
++	      esac
++	      add="-l$name"
++	    elif test "$hardcode_automatic" = yes; then
++	      if test -n "$inst_prefix_dir" &&
++		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
++		add="$inst_prefix_dir$libdir/$linklib"
++	      else
++		add="$libdir/$linklib"
++	      fi
++	    else
++	      # We cannot seem to hardcode it, guess we'll fake it.
++	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      if test -n "$inst_prefix_dir"; then
++		case $libdir in
++		  [\\/]*)
++		    func_append add_dir " -L$inst_prefix_dir$libdir"
++		    ;;
++		esac
++	      fi
++	      add="-l$name"
++	    fi
 +
-+	# Clear the version info if we defaulted, and they specified a release.
-+	if test -z "$vinfo" && test -n "$release"; then
-+	  major=
-+	  case $version_type in
-+	  darwin)
-+	    # we can't check for "0.0" in archive_cmds due to quoting
-+	    # problems, so we reset it completely
-+	    verstring=
-+	    ;;
-+	  *)
-+	    verstring="0.0"
-+	    ;;
-+	  esac
-+	  if test "$need_version" = no; then
-+	    versuffix=
++	    if test "$linkmode" = prog; then
++	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
++	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
++	    else
++	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
++	      test -n "$add" && deplibs="$add $deplibs"
++	    fi
++	  fi
++	elif test "$linkmode" = prog; then
++	  # Here we assume that one of hardcode_direct or hardcode_minus_L
++	  # is not unsupported.  This is valid on all known static and
++	  # shared platforms.
++	  if test "$hardcode_direct" != unsupported; then
++	    test -n "$old_library" && linklib="$old_library"
++	    compile_deplibs="$dir/$linklib $compile_deplibs"
++	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
 +	  else
-+	    versuffix=".0.0"
++	    compile_deplibs="-l$name -L$dir $compile_deplibs"
++	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
 +	  fi
-+	fi
-+
-+	# Remove version info from name if versioning should be avoided
-+	if test "$avoid_version" = yes && test "$need_version" = no; then
-+	  major=
-+	  versuffix=
-+	  verstring=""
-+	fi
++	elif test "$build_libtool_libs" = yes; then
++	  # Not a shared library
++	  if test "$deplibs_check_method" != pass_all; then
++	    # We're trying link a shared library against a static one
++	    # but the system doesn't support it.
 +
-+	# Check to see if the archive will have undefined symbols.
-+	if test "$allow_undefined" = yes; then
-+	  if test "$allow_undefined_flag" = unsupported; then
-+	    func_warning "undefined symbols not allowed in $host shared libraries"
-+	    build_libtool_libs=no
-+	    build_old_libs=yes
++	    # Just print a warning and add the library to dependency_libs so
++	    # that the program can be linked against the static library.
++	    echo
++	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
++	    echo "*** I have the capability to make that library automatically link in when"
++	    echo "*** you link to this library.  But I can only do this if you have a"
++	    echo "*** shared version of the library, which you do not appear to have."
++	    if test "$module" = yes; then
++	      echo "*** But as you try to build a module library, libtool will still create "
++	      echo "*** a static module, that should work as long as the dlopening application"
++	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
++	      if test -z "$global_symbol_pipe"; then
++		echo
++		echo "*** However, this would only work if libtool was able to extract symbol"
++		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++		echo "*** not find such a program.  So, this module is probably useless."
++		echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	      fi
++	      if test "$build_old_libs" = no; then
++		build_libtool_libs=module
++		build_old_libs=yes
++	      else
++		build_libtool_libs=no
++	      fi
++	    fi
++	  else
++	    deplibs="$dir/$old_library $deplibs"
++	    link_static=yes
 +	  fi
-+	else
-+	  # Don't allow undefined symbols.
-+	  allow_undefined_flag="$no_undefined_flag"
-+	fi
++	fi # link shared/static library?
 +
-+      fi
++	if test "$linkmode" = lib; then
++	  if test -n "$dependency_libs" &&
++	     { test "$hardcode_into_libs" != yes ||
++	       test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
++	    # Extract -R from dependency_libs
++	    temp_deplibs=
++	    for libdir in $dependency_libs; do
++	      case $libdir in
++	      -R*) func_stripname '-R' '' "$libdir"
++	           temp_xrpath=$func_stripname_result
++		   case " $xrpath " in
++		   *" $temp_xrpath "*) ;;
++		   *) func_append xrpath " $temp_xrpath";;
++		   esac;;
++	      *) func_append temp_deplibs " $libdir";;
++	      esac
++	    done
++	    dependency_libs="$temp_deplibs"
++	  fi
 +
-+      func_generate_dlsyms "$libname" "$libname" "yes"
-+      libobjs="$libobjs $symfileobj"
++	  func_append newlib_search_path " $absdir"
++	  # Link against this library
++	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
++	  # ... and its dependency_libs
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    newdependency_libs="$deplib $newdependency_libs"
++	    case $deplib in
++              -L*) func_stripname '-L' '' "$deplib"
++                   func_resolve_sysroot "$func_stripname_result";;
++              *) func_resolve_sysroot "$deplib" ;;
++            esac
++	    if $opt_preserve_dup_deps ; then
++	      case "$tmp_libs " in
++	      *" $func_resolve_sysroot_result "*)
++                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
++	      esac
++	    fi
++	    func_append tmp_libs " $func_resolve_sysroot_result"
++	  done
++
++	  if test "$link_all_deplibs" != no; then
++	    # Add the search paths of all dependency libraries
++	    for deplib in $dependency_libs; do
++	      path=
++	      case $deplib in
++	      -L*) path="$deplib" ;;
++	      *.la)
++	        func_resolve_sysroot "$deplib"
++	        deplib=$func_resolve_sysroot_result
++	        func_dirname "$deplib" "" "."
++		dir=$func_dirname_result
++		# We need an absolute path.
++		case $dir in
++		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
++		*)
++		  absdir=`cd "$dir" && pwd`
++		  if test -z "$absdir"; then
++		    func_warning "cannot determine absolute directory name of \`$dir'"
++		    absdir="$dir"
++		  fi
++		  ;;
++		esac
++		if $GREP "^installed=no" $deplib > /dev/null; then
++		case $host in
++		*-*-darwin*)
++		  depdepl=
++		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++		  if test -n "$deplibrary_names" ; then
++		    for tmp in $deplibrary_names ; do
++		      depdepl=$tmp
++		    done
++		    if test -f "$absdir/$objdir/$depdepl" ; then
++		      depdepl="$absdir/$objdir/$depdepl"
++		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
++                      if test -z "$darwin_install_name"; then
++                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
++                      fi
++		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
++		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
++		      path=
++		    fi
++		  fi
++		  ;;
++		*)
++		  path="-L$absdir/$objdir"
++		  ;;
++		esac
++		else
++		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  test -z "$libdir" && \
++		    func_fatal_error "\`$deplib' is not a valid libtool archive"
++		  test "$absdir" != "$libdir" && \
++		    func_warning "\`$deplib' seems to be moved"
++
++		  path="-L$absdir"
++		fi
++		;;
++	      esac
++	      case " $deplibs " in
++	      *" $path "*) ;;
++	      *) deplibs="$path $deplibs" ;;
++	      esac
++	    done
++	  fi # link_all_deplibs != no
++	fi # linkmode = lib
++      done # for deplib in $libs
++      if test "$pass" = link; then
++	if test "$linkmode" = "prog"; then
++	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
++	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
++	else
++	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++	fi
++      fi
++      dependency_libs="$newdependency_libs"
++      if test "$pass" = dlpreopen; then
++	# Link the dlpreopened libraries before other libraries
++	for deplib in $save_deplibs; do
++	  deplibs="$deplib $deplibs"
++	done
++      fi
++      if test "$pass" != dlopen; then
++	if test "$pass" != conv; then
++	  # Make sure lib_search_path contains only unique directories.
++	  lib_search_path=
++	  for dir in $newlib_search_path; do
++	    case "$lib_search_path " in
++	    *" $dir "*) ;;
++	    *) func_append lib_search_path " $dir" ;;
++	    esac
++	  done
++	  newlib_search_path=
++	fi
++
++	if test "$linkmode,$pass" != "prog,link"; then
++	  vars="deplibs"
++	else
++	  vars="compile_deplibs finalize_deplibs"
++	fi
++	for var in $vars dependency_libs; do
++	  # Add libraries to $var in reverse order
++	  eval tmp_libs=\"\$$var\"
++	  new_libs=
++	  for deplib in $tmp_libs; do
++	    # FIXME: Pedantically, this is the right thing to do, so
++	    #        that some nasty dependency loop isn't accidentally
++	    #        broken:
++	    #new_libs="$deplib $new_libs"
++	    # Pragmatically, this seems to cause very few problems in
++	    # practice:
++	    case $deplib in
++	    -L*) new_libs="$deplib $new_libs" ;;
++	    -R*) ;;
++	    *)
++	      # And here is the reason: when a library appears more
++	      # than once as an explicit dependence of a library, or
++	      # is implicitly linked in more than once by the
++	      # compiler, it is considered special, and multiple
++	      # occurrences thereof are not removed.  Compare this
++	      # with having the same library being listed as a
++	      # dependency of multiple other libraries: in this case,
++	      # we know (pedantically, we assume) the library does not
++	      # need to be listed more than once, so we keep only the
++	      # last copy.  This is not always right, but it is rare
++	      # enough that we require users that really mean to play
++	      # such unportable linking tricks to link the library
++	      # using -Wl,-lname, so that libtool does not consider it
++	      # for duplicate removal.
++	      case " $specialdeplibs " in
++	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
++	      *)
++		case " $new_libs " in
++		*" $deplib "*) ;;
++		*) new_libs="$deplib $new_libs" ;;
++		esac
++		;;
++	      esac
++	      ;;
++	    esac
++	  done
++	  tmp_libs=
++	  for deplib in $new_libs; do
++	    case $deplib in
++	    -L*)
++	      case " $tmp_libs " in
++	      *" $deplib "*) ;;
++	      *) func_append tmp_libs " $deplib" ;;
++	      esac
++	      ;;
++	    *) func_append tmp_libs " $deplib" ;;
++	    esac
++	  done
++	  eval $var=\"$tmp_libs\"
++	done # for var
++      fi
++      # Last step: remove runtime libs from dependency_libs
++      # (they stay in deplibs)
++      tmp_libs=
++      for i in $dependency_libs ; do
++	case " $predeps $postdeps $compiler_lib_search_path " in
++	*" $i "*)
++	  i=""
++	  ;;
++	esac
++	if test -n "$i" ; then
++	  func_append tmp_libs " $i"
++	fi
++      done
++      dependency_libs=$tmp_libs
++    done # for pass
++    if test "$linkmode" = prog; then
++      dlfiles="$newdlfiles"
++    fi
++    if test "$linkmode" = prog || test "$linkmode" = lib; then
++      dlprefiles="$newdlprefiles"
++    fi
++
++    case $linkmode in
++    oldlib)
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	func_warning "\`-dlopen' is ignored for archives"
++      fi
++
++      case " $deplibs" in
++      *\ -l* | *\ -L*)
++	func_warning "\`-l' and \`-L' are ignored for archives" ;;
++      esac
++
++      test -n "$rpath" && \
++	func_warning "\`-rpath' is ignored for archives"
++
++      test -n "$xrpath" && \
++	func_warning "\`-R' is ignored for archives"
++
++      test -n "$vinfo" && \
++	func_warning "\`-version-info/-version-number' is ignored for archives"
++
++      test -n "$release" && \
++	func_warning "\`-release' is ignored for archives"
++
++      test -n "$export_symbols$export_symbols_regex" && \
++	func_warning "\`-export-symbols' is ignored for archives"
++
++      # Now set the variables for building old libraries.
++      build_libtool_libs=no
++      oldlibs="$output"
++      func_append objs "$old_deplibs"
++      ;;
++
++    lib)
++      # Make sure we only generate libraries of the form `libNAME.la'.
++      case $outputname in
++      lib*)
++	func_stripname 'lib' '.la' "$outputname"
++	name=$func_stripname_result
++	eval shared_ext=\"$shrext_cmds\"
++	eval libname=\"$libname_spec\"
++	;;
++      *)
++	test "$module" = no && \
++	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
++
++	if test "$need_lib_prefix" != no; then
++	  # Add the "lib" prefix for modules if required
++	  func_stripname '' '.la' "$outputname"
++	  name=$func_stripname_result
++	  eval shared_ext=\"$shrext_cmds\"
++	  eval libname=\"$libname_spec\"
++	else
++	  func_stripname '' '.la' "$outputname"
++	  libname=$func_stripname_result
++	fi
++	;;
++      esac
++
++      if test -n "$objs"; then
++	if test "$deplibs_check_method" != pass_all; then
++	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
++	else
++	  echo
++	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
++	  $ECHO "*** objects $objs is not portable!"
++	  func_append libobjs " $objs"
++	fi
++      fi
++
++      test "$dlself" != no && \
++	func_warning "\`-dlopen self' is ignored for libtool libraries"
++
++      set dummy $rpath
++      shift
++      test "$#" -gt 1 && \
++	func_warning "ignoring multiple \`-rpath's for a libtool library"
++
++      install_libdir="$1"
++
++      oldlibs=
++      if test -z "$rpath"; then
++	if test "$build_libtool_libs" = yes; then
++	  # Building a libtool convenience library.
++	  # Some compilers have problems with a `.al' extension so
++	  # convenience libraries should have the same extension an
++	  # archive normally would.
++	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
++	  build_libtool_libs=convenience
++	  build_old_libs=yes
++	fi
++
++	test -n "$vinfo" && \
++	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
++
++	test -n "$release" && \
++	  func_warning "\`-release' is ignored for convenience libraries"
++      else
++
++	# Parse the version information argument.
++	save_ifs="$IFS"; IFS=':'
++	set dummy $vinfo 0 0 0
++	shift
++	IFS="$save_ifs"
++
++	test -n "$7" && \
++	  func_fatal_help "too many parameters to \`-version-info'"
++
++	# convert absolute version numbers to libtool ages
++	# this retains compatibility with .la files and attempts
++	# to make the code below a bit more comprehensible
++
++	case $vinfo_number in
++	yes)
++	  number_major="$1"
++	  number_minor="$2"
++	  number_revision="$3"
++	  #
++	  # There are really only two kinds -- those that
++	  # use the current revision as the major version
++	  # and those that subtract age and use age as
++	  # a minor version.  But, then there is irix
++	  # which has an extra 1 added just for fun
++	  #
++	  case $version_type in
++	  darwin|linux|osf|windows|none)
++	    func_arith $number_major + $number_minor
++	    current=$func_arith_result
++	    age="$number_minor"
++	    revision="$number_revision"
++	    ;;
++	  freebsd-aout|freebsd-elf|qnx|sunos)
++	    current="$number_major"
++	    revision="$number_minor"
++	    age="0"
++	    ;;
++	  irix|nonstopux)
++	    func_arith $number_major + $number_minor
++	    current=$func_arith_result
++	    age="$number_minor"
++	    revision="$number_minor"
++	    lt_irix_increment=no
++	    ;;
++	  *)
++	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
++	    ;;
++	  esac
++	  ;;
++	no)
++	  current="$1"
++	  revision="$2"
++	  age="$3"
++	  ;;
++	esac
++
++	# Check that each of the things are valid numbers.
++	case $current in
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
++	*)
++	  func_error "CURRENT \`$current' must be a nonnegative integer"
++	  func_fatal_error "\`$vinfo' is not valid version information"
++	  ;;
++	esac
++
++	case $revision in
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
++	*)
++	  func_error "REVISION \`$revision' must be a nonnegative integer"
++	  func_fatal_error "\`$vinfo' is not valid version information"
++	  ;;
++	esac
++
++	case $age in
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
++	*)
++	  func_error "AGE \`$age' must be a nonnegative integer"
++	  func_fatal_error "\`$vinfo' is not valid version information"
++	  ;;
++	esac
++
++	if test "$age" -gt "$current"; then
++	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
++	  func_fatal_error "\`$vinfo' is not valid version information"
++	fi
++
++	# Calculate the version variables.
++	major=
++	versuffix=
++	verstring=
++	case $version_type in
++	none) ;;
++
++	darwin)
++	  # Like Linux, but with the current version available in
++	  # verstring for coding it into the library header
++	  func_arith $current - $age
++	  major=.$func_arith_result
++	  versuffix="$major.$age.$revision"
++	  # Darwin ld doesn't like 0 for these options...
++	  func_arith $current + 1
++	  minor_current=$func_arith_result
++	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  ;;
++
++	freebsd-aout)
++	  major=".$current"
++	  versuffix=".$current.$revision";
++	  ;;
++
++	freebsd-elf)
++	  major=".$current"
++	  versuffix=".$current"
++	  ;;
++
++	irix | nonstopux)
++	  if test "X$lt_irix_increment" = "Xno"; then
++	    func_arith $current - $age
++	  else
++	    func_arith $current - $age + 1
++	  fi
++	  major=$func_arith_result
++
++	  case $version_type in
++	    nonstopux) verstring_prefix=nonstopux ;;
++	    *)         verstring_prefix=sgi ;;
++	  esac
++	  verstring="$verstring_prefix$major.$revision"
++
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$revision
++	  while test "$loop" -ne 0; do
++	    func_arith $revision - $loop
++	    iface=$func_arith_result
++	    func_arith $loop - 1
++	    loop=$func_arith_result
++	    verstring="$verstring_prefix$major.$iface:$verstring"
++	  done
++
++	  # Before this point, $major must not contain `.'.
++	  major=.$major
++	  versuffix="$major.$revision"
++	  ;;
++
++	linux)
++	  func_arith $current - $age
++	  major=.$func_arith_result
++	  versuffix="$major.$age.$revision"
++	  ;;
++
++	osf)
++	  func_arith $current - $age
++	  major=.$func_arith_result
++	  versuffix=".$current.$age.$revision"
++	  verstring="$current.$age.$revision"
++
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$age
++	  while test "$loop" -ne 0; do
++	    func_arith $current - $loop
++	    iface=$func_arith_result
++	    func_arith $loop - 1
++	    loop=$func_arith_result
++	    verstring="$verstring:${iface}.0"
++	  done
++
++	  # Make executables depend on our current version.
++	  func_append verstring ":${current}.0"
++	  ;;
++
++	qnx)
++	  major=".$current"
++	  versuffix=".$current"
++	  ;;
++
++	sunos)
++	  major=".$current"
++	  versuffix=".$current.$revision"
++	  ;;
++
++	windows)
++	  # Use '-' rather than '.', since we only want one
++	  # extension on DOS 8.3 filesystems.
++	  func_arith $current - $age
++	  major=$func_arith_result
++	  versuffix="-$major"
++	  ;;
++
++	*)
++	  func_fatal_configuration "unknown library version type \`$version_type'"
++	  ;;
++	esac
++
++	# Clear the version info if we defaulted, and they specified a release.
++	if test -z "$vinfo" && test -n "$release"; then
++	  major=
++	  case $version_type in
++	  darwin)
++	    # we can't check for "0.0" in archive_cmds due to quoting
++	    # problems, so we reset it completely
++	    verstring=
++	    ;;
++	  *)
++	    verstring="0.0"
++	    ;;
++	  esac
++	  if test "$need_version" = no; then
++	    versuffix=
++	  else
++	    versuffix=".0.0"
++	  fi
++	fi
++
++	# Remove version info from name if versioning should be avoided
++	if test "$avoid_version" = yes && test "$need_version" = no; then
++	  major=
++	  versuffix=
++	  verstring=""
++	fi
++
++	# Check to see if the archive will have undefined symbols.
++	if test "$allow_undefined" = yes; then
++	  if test "$allow_undefined_flag" = unsupported; then
++	    func_warning "undefined symbols not allowed in $host shared libraries"
++	    build_libtool_libs=no
++	    build_old_libs=yes
++	  fi
++	else
++	  # Don't allow undefined symbols.
++	  allow_undefined_flag="$no_undefined_flag"
++	fi
++
++      fi
++
++      func_generate_dlsyms "$libname" "$libname" "yes"
++      func_append libobjs " $symfileobj"
 +      test "X$libobjs" = "X " && libobjs=
 +
-+      if test "$mode" != relink; then
++      if test "$opt_mode" != relink; then
 +	# Remove our outputs, but don't remove object files since they
 +	# may have been created when compiling PIC objects.
 +	removelist=
@@ -29809,7 +30494,7 @@
 +		   continue
 +		 fi
 +	       fi
-+	       removelist="$removelist $p"
++	       func_append removelist " $p"
 +	       ;;
 +	    *) ;;
 +	  esac
@@ -29817,96 +30502,67 @@
 +	test -n "$removelist" && \
 +	  func_show_eval "${RM}r \$removelist"
 +      fi
- 
--  assert(str != NULL);
--  assert(pat != NULL);
++
 +      # Now set the variables for building old libraries.
 +      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
- 
--  len = strlen(str);
--  patlen = strlen(pat);
++	func_append oldlibs " $output_objdir/$libname.$libext"
++
 +	# Transform .lo files to .o files.
-+	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
++	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
 +      fi
- 
--  if (patlen <= len)
--  {
--    str += len - patlen;
--    if (strcmp(str, pat) == 0)
--      *str = '\0';
--  }
--  return str;
--}
++
 +      # Eliminate all temporary directories.
 +      #for path in $notinst_path; do
-+      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-+      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-+      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
++      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
++      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
++      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
 +      #done
- 
--static void
--lt_error_core (int exit_status, const char * mode, 
--          const char * message, va_list ap)
--{
--  fprintf (stderr, "%s: %s: ", program_name, mode);
--  vfprintf (stderr, message, ap);
--  fprintf (stderr, ".\n");
++
 +      if test -n "$xrpath"; then
 +	# If the user specified any rpath flags, then add them.
 +	temp_xrpath=
 +	for libdir in $xrpath; do
-+	  temp_xrpath="$temp_xrpath -R$libdir"
++	  func_replace_sysroot "$libdir"
++	  func_append temp_xrpath " -R$func_replace_sysroot_result"
 +	  case "$finalize_rpath " in
 +	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  *) func_append finalize_rpath " $libdir" ;;
 +	  esac
 +	done
 +	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
 +	  dependency_libs="$temp_xrpath $dependency_libs"
 +	fi
 +      fi
- 
--  if (exit_status >= 0)
--    exit (exit_status);
--}
++
 +      # Make sure dlfiles contains only unique files that won't be dlpreopened
 +      old_dlfiles="$dlfiles"
 +      dlfiles=
 +      for lib in $old_dlfiles; do
 +	case " $dlprefiles $dlfiles " in
 +	*" $lib "*) ;;
-+	*) dlfiles="$dlfiles $lib" ;;
++	*) func_append dlfiles " $lib" ;;
 +	esac
 +      done
- 
--void
--lt_fatal (const char *message, ...)
--{
--  va_list ap;
--  va_start (ap, message);
--  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
--  va_end (ap);
--}
++
 +      # Make sure dlprefiles contains only unique files
 +      old_dlprefiles="$dlprefiles"
 +      dlprefiles=
 +      for lib in $old_dlprefiles; do
 +	case "$dlprefiles " in
 +	*" $lib "*) ;;
-+	*) dlprefiles="$dlprefiles $lib" ;;
++	*) func_append dlprefiles " $lib" ;;
 +	esac
 +      done
 +
 +      if test "$build_libtool_libs" = yes; then
 +	if test -n "$rpath"; then
 +	  case $host in
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
 +	    # these systems don't actually have a c library (as such)!
 +	    ;;
 +	  *-*-rhapsody* | *-*-darwin1.[012])
 +	    # Rhapsody C library is in the System framework
-+	    deplibs="$deplibs System.ltframework"
++	    func_append deplibs " System.ltframework"
 +	    ;;
 +	  *-*-netbsd*)
 +	    # Don't link with libc until the a.out ld.so is fixed.
@@ -29923,7 +30579,7 @@
 +	  *)
 +	    # Add libc to deplibs on all other systems if necessary.
 +	    if test "$build_libtool_need_lc" = "yes"; then
-+	      deplibs="$deplibs -lc"
++	      func_append deplibs " -lc"
 +	    fi
 +	    ;;
 +	  esac
@@ -29960,13 +30616,7 @@
 +	  $opt_dry_run || $RM conftest.c
 +	  cat > conftest.c <<EOF
 +	  int main() { return 0; }
- EOF
--	  # we should really use a build-platform specific compiler
--	  # here, but OTOH, the wrappers (shell script and this C one)
--	  # are only useful if you want to execute the "real" binary.
--	  # Since the "real" binary is built for $host, then this
--	  # wrapper might as well be built for $host, too.
--	  $run $LTCC -s -o $cwrapper $cwrappersource
++EOF
 +	  $opt_dry_run || $RM conftest
 +	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 +	    ldd_output=`ldd conftest`
@@ -29978,7 +30628,7 @@
 +		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +		  case " $predeps $postdeps " in
 +		  *" $i "*)
-+		    newdeplibs="$newdeplibs $i"
++		    func_append newdeplibs " $i"
 +		    i=""
 +		    ;;
 +		  esac
@@ -29989,21 +30639,21 @@
 +		  set dummy $deplib_matches; shift
 +		  deplib_match=$1
 +		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		    newdeplibs="$newdeplibs $i"
++		    func_append newdeplibs " $i"
 +		  else
 +		    droppeddeps=yes
-+		    $ECHO
++		    echo
 +		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-+		    $ECHO "*** I have the capability to make that library automatically link in when"
-+		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-+		    $ECHO "*** shared version of the library, which I believe you do not have"
-+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
++		    echo "*** I have the capability to make that library automatically link in when"
++		    echo "*** you link to this library.  But I can only do this if you have a"
++		    echo "*** shared version of the library, which I believe you do not have"
++		    echo "*** because a test_compile did reveal that the linker did not use it for"
++		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
 +		  fi
 +		fi
 +		;;
 +	      *)
-+		newdeplibs="$newdeplibs $i"
++		func_append newdeplibs " $i"
 +		;;
 +	      esac
 +	    done
@@ -30021,7 +30671,7 @@
 +		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +		    case " $predeps $postdeps " in
 +		    *" $i "*)
-+		      newdeplibs="$newdeplibs $i"
++		      func_append newdeplibs " $i"
 +		      i=""
 +		      ;;
 +		    esac
@@ -30032,29 +30682,29 @@
 +		    set dummy $deplib_matches; shift
 +		    deplib_match=$1
 +		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		      newdeplibs="$newdeplibs $i"
++		      func_append newdeplibs " $i"
 +		    else
 +		      droppeddeps=yes
-+		      $ECHO
++		      echo
 +		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-+		      $ECHO "*** I have the capability to make that library automatically link in when"
-+		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-+		      $ECHO "*** shared version of the library, which you do not appear to have"
-+		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
++		      echo "*** I have the capability to make that library automatically link in when"
++		      echo "*** you link to this library.  But I can only do this if you have a"
++		      echo "*** shared version of the library, which you do not appear to have"
++		      echo "*** because a test_compile did reveal that the linker did not use this one"
++		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
 +		    fi
 +		  fi
 +		else
 +		  droppeddeps=yes
-+		  $ECHO
++		  echo
 +		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-+		  $ECHO "*** make it link in!  You will probably need to install it or some"
-+		  $ECHO "*** library that it depends on before this library will be fully"
-+		  $ECHO "*** functional.  Installing it before continuing would be even better."
++		  echo "*** make it link in!  You will probably need to install it or some"
++		  echo "*** library that it depends on before this library will be fully"
++		  echo "*** functional.  Installing it before continuing would be even better."
 +		fi
 +		;;
 +	      *)
-+		newdeplibs="$newdeplibs $i"
++		func_append newdeplibs " $i"
 +		;;
 +	      esac
 +	    done
@@ -30071,15 +30721,27 @@
 +	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +		case " $predeps $postdeps " in
 +		*" $a_deplib "*)
-+		  newdeplibs="$newdeplibs $a_deplib"
++		  func_append newdeplibs " $a_deplib"
 +		  a_deplib=""
 +		  ;;
 +		esac
 +	      fi
 +	      if test -n "$a_deplib" ; then
 +		libname=`eval "\\$ECHO \"$libname_spec\""`
++		if test -n "$file_magic_glob"; then
++		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
++		else
++		  libnameglob=$libname
++		fi
++		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
 +		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		  if test "$want_nocaseglob" = yes; then
++		    shopt -s nocaseglob
++		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
++		    $nocaseglob
++		  else
++		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
++		  fi
 +		  for potent_lib in $potential_libs; do
 +		      # Follow soft links.
 +		      if ls -lLd "$potent_lib" 2>/dev/null |
@@ -30096,13 +30758,13 @@
 +			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 +			case $potliblink in
 +			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-+			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
++			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
 +			esac
 +		      done
 +		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 +			 $SED -e 10q |
 +			 $EGREP "$file_magic_regex" > /dev/null; then
-+			newdeplibs="$newdeplibs $a_deplib"
++			func_append newdeplibs " $a_deplib"
 +			a_deplib=""
 +			break 2
 +		      fi
@@ -30111,12 +30773,12 @@
 +	      fi
 +	      if test -n "$a_deplib" ; then
 +		droppeddeps=yes
-+		$ECHO
++		echo
 +		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because I did check the linker path looking for a file starting"
++		echo "*** I have the capability to make that library automatically link in when"
++		echo "*** you link to this library.  But I can only do this if you have a"
++		echo "*** shared version of the library, which you do not appear to have"
++		echo "*** because I did check the linker path looking for a file starting"
 +		if test -z "$potlib" ; then
 +		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 +		else
@@ -30127,7 +30789,7 @@
 +	      ;;
 +	    *)
 +	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
++	      func_append newdeplibs " $a_deplib"
 +	      ;;
 +	    esac
 +	  done # Gone through all deplibs.
@@ -30143,7 +30805,7 @@
 +	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +		case " $predeps $postdeps " in
 +		*" $a_deplib "*)
-+		  newdeplibs="$newdeplibs $a_deplib"
++		  func_append newdeplibs " $a_deplib"
 +		  a_deplib=""
 +		  ;;
 +		esac
@@ -30154,9 +30816,9 @@
 +		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 +		  for potent_lib in $potential_libs; do
 +		    potlib="$potent_lib" # see symlink-check above in file_magic test
-+		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
++		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 +		       $EGREP "$match_pattern_regex" > /dev/null; then
-+		      newdeplibs="$newdeplibs $a_deplib"
++		      func_append newdeplibs " $a_deplib"
 +		      a_deplib=""
 +		      break 2
 +		    fi
@@ -30165,12 +30827,12 @@
 +	      fi
 +	      if test -n "$a_deplib" ; then
 +		droppeddeps=yes
-+		$ECHO
++		echo
 +		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because I did check the linker path looking for a file starting"
++		echo "*** I have the capability to make that library automatically link in when"
++		echo "*** you link to this library.  But I can only do this if you have a"
++		echo "*** shared version of the library, which you do not appear to have"
++		echo "*** because I did check the linker path looking for a file starting"
 +		if test -z "$potlib" ; then
 +		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 +		else
@@ -30181,116 +30843,66 @@
 +	      ;;
 +	    *)
 +	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
++	      func_append newdeplibs " $a_deplib"
 +	      ;;
 +	    esac
 +	  done # Gone through all deplibs.
 +	  ;;
 +	none | unknown | *)
 +	  newdeplibs=""
-+	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
++	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
 +	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +	    for i in $predeps $postdeps ; do
 +	      # can't use Xsed below, because $i might contain '/'
-+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
++	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
 +	    done
 +	  fi
-+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-+	     $GREP . >/dev/null; then
-+	    $ECHO
++	  case $tmp_deplibs in
++	  *[!\	\ ]*)
++	    echo
 +	    if test "X$deplibs_check_method" = "Xnone"; then
-+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
++	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 +	    else
-+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
++	      echo "*** Warning: inter-library dependencies are not known to be supported."
 +	    fi
-+	    $ECHO "*** All declared inter-library dependencies are being dropped."
++	    echo "*** All declared inter-library dependencies are being dropped."
 +	    droppeddeps=yes
-+	  fi
- 	  ;;
- 	esac
--	$rm $output
--	trap "$rm $output; exit 1" 1 2 15
--
--	$echo > $output "\
--#! $SHELL
--
--# $output - temporary wrapper script for $objdir/$outputname
--# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
--#
--# The $output program cannot be directly executed until all the libtool
--# libraries that it depends on are installed.
--#
--# This wrapper script should never be moved out of the build directory.
--# If it is, it will not operate correctly.
--
--# Sed substitution that helps us do robust quoting.  It backslashifies
--# metacharacters that are still active within double-quoted strings.
--Xsed='${SED} -e 1s/^X//'
--sed_quote_subst='$sed_quote_subst'
--
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
--
--relink_command=\"$relink_command\"
--
--# This environment variable determines our operation mode.
--if test \"\$libtool_install_magic\" = \"$magic\"; then
--  # install mode needs the following variable:
--  notinst_deplibs='$notinst_deplibs'
--else
--  # When we are sourced in execute mode, \$file and \$echo are already set.
--  if test \"\$libtool_execute_magic\" != \"$magic\"; then
--    echo=\"$qecho\"
--    file=\"\$0\"
--    # Make sure echo works.
--    if test \"X\$1\" = X--no-reexec; then
--      # Discard the --no-reexec flag, and continue.
--      shift
--    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
--      # Yippee, \$echo works!
--      :
--    else
--      # Restart under the correct shell, and then maybe \$echo will work.
--      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
--    fi
--  fi\
--"
--	$echo >> $output "\
++	    ;;
++	  esac
++	  ;;
++	esac
 +	versuffix=$versuffix_save
 +	major=$major_save
 +	release=$release_save
 +	libname=$libname_save
 +	name=$name_save
  
--  # Find the directory that this script lives in.
--  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
--  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+-    if test ! -d \"\$progdir\"; then
+-      $mkdir \"\$progdir\"
+-    else
+-      $rm \"\$progdir/\$file\"
+-    fi"
 +	case $host in
 +	*-*-rhapsody* | *-*-darwin1.[012])
 +	  # On Rhapsody replace the C library with the System framework
-+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
 +	  ;;
 +	esac
  
--  # Follow symbolic links until we get to the real thisdir.
--  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
--  while test -n \"\$file\"; do
--    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+-	  $echo >> $output "\
 +	if test "$droppeddeps" = yes; then
 +	  if test "$module" = yes; then
-+	    $ECHO
-+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
++	    echo
++	    echo "*** Warning: libtool could not satisfy all declared inter-library"
 +	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-+	    $ECHO "*** a static module, that should work as long as the dlopening"
-+	    $ECHO "*** application is linked with the -dlopen flag."
++	    echo "*** a static module, that should work as long as the dlopening"
++	    echo "*** application is linked with the -dlopen flag."
 +	    if test -z "$global_symbol_pipe"; then
-+	      $ECHO
-+	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-+	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	      $ECHO "*** not find such a program.  So, this module is probably useless."
-+	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
++	      echo
++	      echo "*** However, this would only work if libtool was able to extract symbol"
++	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++	      echo "*** not find such a program.  So, this module is probably useless."
++	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
 +	    fi
 +	    if test "$build_old_libs" = no; then
 +	      oldlibs="$output_objdir/$libname.$libext"
@@ -30300,21 +30912,23 @@
 +	      build_libtool_libs=no
 +	    fi
 +	  else
-+	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-+	    $ECHO "*** automatically added whenever a program is linked with this library"
-+	    $ECHO "*** or is declared to -dlopen it."
++	    echo "*** The inter-library dependencies that have been dropped here will be"
++	    echo "*** automatically added whenever a program is linked with this library"
++	    echo "*** or is declared to -dlopen it."
  
--    # If there was a directory component, then change thisdir.
--    if test \"x\$destdir\" != \"x\$file\"; then
--      case \"\$destdir\" in
--      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
--      *) thisdir=\"\$thisdir/\$destdir\" ;;
+-    # relink executable if necessary
+-    if test -n \"\$relink_command\"; then
+-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+-      else
+-	$echo \"\$relink_command_output\" >&2
+-	$rm \"\$progdir/\$file\"
+-	exit $EXIT_FAILURE
 +	    if test "$allow_undefined" = no; then
-+	      $ECHO
-+	      $ECHO "*** Since this library must not contain undefined symbols,"
-+	      $ECHO "*** because either the platform does not support them or"
-+	      $ECHO "*** it was explicitly requested with -no-undefined,"
-+	      $ECHO "*** libtool will only create a static version of it."
++	      echo
++	      echo "*** Since this library must not contain undefined symbols,"
++	      echo "*** because either the platform does not support them or"
++	      echo "*** it was explicitly requested with -no-undefined,"
++	      echo "*** libtool will only create a static version of it."
 +	      if test "$build_old_libs" = no; then
 +		oldlibs="$output_objdir/$libname.$libext"
 +		build_libtool_libs=module
@@ -30327,44 +30941,28 @@
 +	fi
 +	# Done checking deplibs!
 +	deplibs=$newdeplibs
-+      fi
+       fi
+-    fi
 +      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
 +      case $host in
 +	*-*-darwin*)
-+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 +	  ;;
-       esac
--    fi
--
--    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
--    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
--  done
--
--  # Try to get the absolute directory name.
--  absdir=\`cd \"\$thisdir\" && pwd\`
--  test -n \"\$absdir\" && thisdir=\"\$absdir\"
--"
--
--	if test "$fast_install" = yes; then
--	  $echo >> $output "\
--  program=lt-'$outputname'$exeext
--  progdir=\"\$thisdir/$objdir\"
--
--  if test ! -f \"\$progdir/\$program\" || \\
--     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
--       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
--
--    file=\"\$\$-\$program\"
++      esac
  
--    if test ! -d \"\$progdir\"; then
--      $mkdir \"\$progdir\"
--    else
--      $rm \"\$progdir/\$file\"
--    fi"
--
+-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+-    { $rm \"\$progdir/\$program\";
+-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+-    $rm \"\$progdir/\$file\"
+-  fi"
+-	else
 -	  $echo >> $output "\
+-  program='$outputname'
+-  progdir=\"\$thisdir/$objdir\"
+-"
+-	fi
 +      # move library search paths that coincide with paths to not yet
 +      # installed libraries to the beginning of the library search list
 +      new_libs=
@@ -30374,7 +30972,7 @@
 +	*)
 +	  case " $deplibs " in
 +	  *" -L$path/$objdir "*)
-+	    new_libs="$new_libs -L$path/$objdir" ;;
++	    func_append new_libs " -L$path/$objdir" ;;
 +	  esac
 +	  ;;
 +	esac
@@ -30384,38 +30982,21 @@
 +	-L*)
 +	  case " $new_libs " in
 +	  *" $deplib "*) ;;
-+	  *) new_libs="$new_libs $deplib" ;;
++	  *) func_append new_libs " $deplib" ;;
 +	  esac
 +	  ;;
-+	*) new_libs="$new_libs $deplib" ;;
++	*) func_append new_libs " $deplib" ;;
 +	esac
 +      done
 +      deplibs="$new_libs"
  
--    # relink executable if necessary
--    if test -n \"\$relink_command\"; then
--      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
--      else
--	$echo \"\$relink_command_output\" >&2
--	$rm \"\$progdir/\$file\"
--	exit 1
--      fi
--    fi
+-	$echo >> $output "\
 +      # All the library-specific variables (install_libdir is set above).
 +      library_names=
 +      old_library=
 +      dlname=
  
--    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
--    { $rm \"\$progdir/\$program\";
--      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
--    $rm \"\$progdir/\$file\"
--  fi"
--	else
--	  $echo >> $output "\
--  program='$outputname'
--  progdir=\"\$thisdir/$objdir\"
--"
+-  if test -f \"\$progdir/\$program\"; then"
 +      # Test again, we may have decided not to build it any more
 +      if test "$build_libtool_libs" = yes; then
 +	if test "$hardcode_into_libs" = yes; then
@@ -30423,10 +31004,12 @@
 +	  hardcode_libdirs=
 +	  dep_rpath=
 +	  rpath="$finalize_rpath"
-+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
++	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
 +	  for libdir in $rpath; do
 +	    if test -n "$hardcode_libdir_flag_spec"; then
 +	      if test -n "$hardcode_libdir_separator"; then
++		func_replace_sysroot "$libdir"
++		libdir=$func_replace_sysroot_result
 +		if test -z "$hardcode_libdirs"; then
 +		  hardcode_libdirs="$libdir"
 +		else
@@ -30435,18 +31018,18 @@
 +		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 +		    ;;
 +		  *)
-+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 +		    ;;
 +		  esac
 +		fi
 +	      else
 +		eval flag=\"$hardcode_libdir_flag_spec\"
-+		dep_rpath="$dep_rpath $flag"
++		func_append dep_rpath " $flag"
 +	      fi
 +	    elif test -n "$runpath_var"; then
 +	      case "$perm_rpath " in
 +	      *" $libdir "*) ;;
-+	      *) perm_rpath="$perm_rpath $libdir" ;;
++	      *) func_apped perm_rpath " $libdir" ;;
 +	      esac
 +	    fi
 +	  done
@@ -30464,24 +31047,20 @@
 +	    # We should set the runpath_var.
 +	    rpath=
 +	    for dir in $perm_rpath; do
-+	      rpath="$rpath$dir:"
++	      func_append rpath "$dir:"
 +	    done
 +	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 +	  fi
 +	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
- 	fi
++	fi
  
--	$echo >> $output "\
--
--  if test -f \"\$progdir/\$program\"; then"
--
 -	# Export our shlibpath_var if we have one.
 -	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 -	  $echo >> $output "\
 -    # Add our own library path to $shlibpath_var
 -    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
 +	shlibpath="$finalize_shlibpath"
-+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
++	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 +	if test -n "$shlibpath"; then
 +	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 +	fi
@@ -30523,62 +31102,29 @@
 -	# Backslashes separate directories on plain windows
 -	*-*-mingw | *-*-os2*)
 -	  $echo >> $output "\
--      exec \$progdir\\\\\$program \${1+\"\$@\"}
--"
--	  ;;
--
--	*)
--	  $echo >> $output "\
--      exec \$progdir/\$program \${1+\"\$@\"}
+-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 -"
 -	  ;;
--	esac
--	$echo >> $output "\
--      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
--      exit 1
--    fi
--  else
--    # The program doesn't exist.
--    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
--    \$echo \"This script is just a wrapper for \$program.\" 1>&2
--    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
--    exit 1
--  fi
--fi\
--"
--	chmod +x $output
--      fi
--      exit 0
--      ;;
--    esac
 +	lib="$output_objdir/$realname"
 +	linknames=
 +	for link
 +	do
-+	  linknames="$linknames $link"
++	  func_append linknames " $link"
 +	done
  
--    # See if we need to build an old-fashioned archive.
--    for oldlib in $oldlibs; do
+-	*)
+-	  $echo >> $output "\
+-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+-"
 +	# Use standard objects if they are pic
-+	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 +	test "X$libobjs" = "X " && libobjs=
- 
--      if test "$build_libtool_libs" = convenience; then
--	oldobjs="$libobjs_save"
--	addlibs="$convenience"
--	build_libtool_libs=no
--      else
--	if test "$build_libtool_libs" = module; then
--	  oldobjs="$libobjs_save"
--	  build_libtool_libs=no
--	else
--	  oldobjs="$old_deplibs $non_pic_objects"
++
 +	delfiles=
 +	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 +	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
 +	  export_symbols="$output_objdir/$libname.uexp"
-+	  delfiles="$delfiles $export_symbols"
++	  func_append delfiles " $export_symbols"
 +	fi
 +
 +	orig_export_symbols=
@@ -30598,9 +31144,40 @@
 +	      always_export_symbols=yes
 +	    fi
 +	  fi
-+	  ;;
-+	esac
-+
+ 	  ;;
+ 	esac
+-	$echo >> $output "\
+-      \$echo \"\$0: cannot exec \$program \$*\"
+-      exit $EXIT_FAILURE
+-    fi
+-  else
+-    # The program doesn't exist.
+-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
+-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+-    exit $EXIT_FAILURE
+-  fi
+-fi\
+-"
+-	chmod +x $output
+-      fi
+-      exit $EXIT_SUCCESS
+-      ;;
+-    esac
+-
+-    # See if we need to build an old-fashioned archive.
+-    for oldlib in $oldlibs; do
+ 
+-      if test "$build_libtool_libs" = convenience; then
+-	oldobjs="$libobjs_save"
+-	addlibs="$convenience"
+-	build_libtool_libs=no
+-      else
+-	if test "$build_libtool_libs" = module; then
+-	  oldobjs="$libobjs_save"
+-	  build_libtool_libs=no
+-	else
+-	  oldobjs="$old_deplibs $non_pic_objects"
 +	# Prepare the list of exported symbols
 +	if test -z "$export_symbols"; then
 +	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
@@ -30609,13 +31186,45 @@
 +	    $opt_dry_run || $RM $export_symbols
 +	    cmds=$export_symbols_cmds
 +	    save_ifs="$IFS"; IFS='~'
-+	    for cmd in $cmds; do
++	    for cmd1 in $cmds; do
 +	      IFS="$save_ifs"
-+	      eval cmd=\"$cmd\"
-+	      func_len " $cmd"
-+	      len=$func_len_result
-+	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++	      # Take the normal branch if the nm_file_list_spec branch
++	      # doesn't work or if tool conversion is not needed.
++	      case $nm_file_list_spec~$to_tool_file_cmd in
++		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
++		  try_normal_branch=yes
++		  eval cmd=\"$cmd1\"
++		  func_len " $cmd"
++		  len=$func_len_result
++		  ;;
++		*)
++		  try_normal_branch=no
++		  ;;
++	      esac
++	      if test "$try_normal_branch" = yes \
++		 && { test "$len" -lt "$max_cmd_len" \
++		      || test "$max_cmd_len" -le -1; }
++	      then
++		func_show_eval "$cmd" 'exit $?'
++		skipped_export=false
++	      elif test -n "$nm_file_list_spec"; then
++		func_basename "$output"
++		output_la=$func_basename_result
++		save_libobjs=$libobjs
++		save_output=$output
++		output=${output_objdir}/${output_la}.nm
++		func_to_tool_file "$output"
++		libobjs=$nm_file_list_spec$func_to_tool_file_result
++		func_append delfiles " $output"
++		func_verbose "creating $NM input file list: $output"
++		for obj in $save_libobjs; do
++		  func_to_tool_file "$obj"
++		  $ECHO "$func_to_tool_file_result"
++		done > "$output"
++		eval cmd=\"$cmd1\"
 +		func_show_eval "$cmd" 'exit $?'
++		output=$save_output
++		libobjs=$save_libobjs
 +		skipped_export=false
 +	      else
 +		# The command line is too long to execute in one step.
@@ -30635,20 +31244,18 @@
  	fi
 -	addlibs="$old_convenience"
 -      fi
- 
+-
 -      if test -n "$addlibs"; then
 -	gentop="$output_objdir/${outputname}x"
--	$show "${rm}r $gentop"
--	$run ${rm}r "$gentop"
--	$show "$mkdir $gentop"
--	$run $mkdir "$gentop"
--	status=$?
--	if test "$status" -ne 0 && test ! -d "$gentop"; then
--	  exit $status
+-	generated="$generated $gentop"
+ 
+-	func_extract_archives $gentop $addlibs
+-	oldobjs="$oldobjs $func_extract_archives_result"
+-      fi
 +	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 +	  tmp_export_symbols="$export_symbols"
 +	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-+	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
++	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 +	fi
 +
 +	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -30660,46 +31267,40 @@
 +	  # global variables. join(1) would be nice here, but unfortunately
 +	  # isn't a blessed tool.
 +	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-+	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
++	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 +	  export_symbols=$output_objdir/$libname.def
 +	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- 	fi
--	generated="$generated $gentop"
++	fi
  
--	# Add in members from convenience archives.
--	for xlib in $addlibs; do
--	  # Extract the objects.
--	  case $xlib in
--	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	  *) xabs=`pwd`"/$xlib" ;;
+-      # Do each command in the archive commands.
+-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+-       cmds=$old_archive_from_new_cmds
+-      else
+-	# POSIX demands no paths to be encoded in archives.  We have
+-	# to avoid creating archives with duplicate basenames if we
+-	# might have to extract them afterwards, e.g., when creating a
+-	# static archive out of a convenience library, or when linking
+-	# the entirety of a libtool archive into another (currently
+-	# not supported by libtool).
+-	if (for obj in $oldobjs
+-	    do
+-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+-	    done | sort | sort -uc >/dev/null 2>&1); then
+-	  :
+-	else
+-	  $echo "copying selected object files to avoid basename conflicts..."
 +	tmp_deplibs=
 +	for test_deplib in $deplibs; do
 +	  case " $convenience " in
 +	  *" $test_deplib "*) ;;
 +	  *)
-+	    tmp_deplibs="$tmp_deplibs $test_deplib"
++	    func_append tmp_deplibs " $test_deplib"
 +	    ;;
- 	  esac
--	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	  xdir="$gentop/$xlib"
++	  esac
 +	done
 +	deplibs="$tmp_deplibs"
  
--	  $show "${rm}r $xdir"
--	  $run ${rm}r "$xdir"
--	  $show "$mkdir $xdir"
--	  $run $mkdir "$xdir"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$xdir"; then
--	    exit $status
--	  fi
--	  # We will extract separately just the conflicting names and we will no
--	  # longer touch any unique names. It is faster to leave these extract
--	  # automatically by $AR in one run.
--	  $show "(cd $xdir && $AR x $xabs)"
--	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	    :
+-	  if test -z "$gentop"; then
 +	if test -n "$convenience"; then
 +	  if test -n "$whole_archive_flag_spec" &&
 +	    test "$compiler_needs_object" = yes &&
@@ -30712,96 +31313,95 @@
 +	    save_libobjs=$libobjs
 +	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 +	    test "X$libobjs" = "X " && libobjs=
- 	  else
--	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	    do
--	      i=1
--	      while test "$i" -le "$count"
--	      do
--	       # Put our $i before any first dot (extension)
--	       # Never overwrite any file
--	       name_to="$name"
--	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--	       do
--		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--	       done
--	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--	       i=`expr $i + 1`
--	      done
--	    done
-+	    gentop="$output_objdir/${outputname}x"
-+	    generated="$generated $gentop"
-+
++	  else
+ 	    gentop="$output_objdir/${outputname}x"
+-	    generated="$generated $gentop"
++	    func_append generated " $gentop"
+ 
+-	    $show "${rm}r $gentop"
+-	    $run ${rm}r "$gentop"
+-	    $show "$mkdir $gentop"
+-	    $run $mkdir "$gentop"
+-	    exit_status=$?
+-	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
+-	      exit $exit_status
+-	    fi
 +	    func_extract_archives $gentop $convenience
-+	    libobjs="$libobjs $func_extract_archives_result"
++	    func_append libobjs " $func_extract_archives_result"
 +	    test "X$libobjs" = "X " && libobjs=
  	  fi
 +	fi
  
--	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
--	done
--      fi
+-	  save_oldobjs=$oldobjs
+-	  oldobjs=
+-	  counter=1
+-	  for obj in $save_oldobjs
+-	  do
+-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+-	    case " $oldobjs " in
+-	    " ") oldobjs=$obj ;;
+-	    *[\ /]"$objbase "*)
+-	      while :; do
+-		# Make sure we don't pick an alternate name that also
+-		# overlaps.
+-		newobj=lt$counter-$objbase
+-		counter=`expr $counter + 1`
+-		case " $oldobjs " in
+-		*[\ /]"$newobj "*) ;;
+-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+-		esac
+-	      done
+-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+-	      $run ln "$obj" "$gentop/$newobj" ||
+-	      $run cp "$obj" "$gentop/$newobj"
+-	      oldobjs="$oldobjs $gentop/$newobj"
+-	      ;;
+-	    *) oldobjs="$oldobjs $obj" ;;
+-	    esac
+-	  done
 +	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 +	  eval flag=\"$thread_safe_flag_spec\"
-+	  linker_flags="$linker_flags $flag"
-+	fi
++	  func_append linker_flags " $flag"
+ 	fi
  
--      # Do each command in the archive commands.
--      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
--       cmds=$old_archive_from_new_cmds
--      else
 -	eval cmds=\"$old_archive_cmds\"
 +	# Make a backup of the uninstalled library when relinking
-+	if test "$mode" = relink; then
++	if test "$opt_mode" = relink; then
 +	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 +	fi
  
 -	if len=`expr "X$cmds" : ".*"` &&
 -	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 -	  cmds=$old_archive_cmds
--	else
--	  # the command line is too long to link in one step, link in parts
--	  $echo "using piecewise archive linking..."
--	  save_RANLIB=$RANLIB
--	  RANLIB=:
--	  objlist=
--	  concat_cmds=
--	  save_oldobjs=$oldobjs
--	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
--	  # encoded into archives.  This makes 'ar r' malfunction in
--	  # this piecewise linking case whenever conflicting object
--	  # names appear in distinct ar calls; check, warn and compensate.
--	    if (for obj in $save_oldobjs
--	    do
--	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
--	    done | sort | sort -uc >/dev/null 2>&1); then
--	    :
 +	# Do each of the archive commands.
 +	if test "$module" = yes && test -n "$module_cmds" ; then
 +	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 +	    eval test_cmds=\"$module_expsym_cmds\"
 +	    cmds=$module_expsym_cmds
- 	  else
--	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
--	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
--	    AR_FLAGS=cq
++	  else
 +	    eval test_cmds=\"$module_cmds\"
 +	    cmds=$module_cmds
- 	  fi
++	  fi
+ 	else
+-	  # the command line is too long to link in one step, link in parts
+-	  $echo "using piecewise archive linking..."
+-	  save_RANLIB=$RANLIB
+-	  RANLIB=:
+-	  objlist=
+-	  concat_cmds=
+-	  save_oldobjs=$oldobjs
+-
 -	  # Is there a better way of finding the last object in the list?
 -	  for obj in $save_oldobjs
 -	  do
 -	    last_oldobj=$obj
--	  done  
+-	  done
 -	  for obj in $save_oldobjs
 -	  do
 -	    oldobjs="$objlist $obj"
 -	    objlist="$objlist $obj"
 -	    eval test_cmds=\"$old_archive_cmds\"
--	    if len=`expr "X$test_cmds" : ".*"` &&
+-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 -	       test "$len" -le "$max_cmd_len"; then
 -	      :
 -	    else
@@ -30809,7 +31409,7 @@
 -	      oldobjs=$objlist
 -	      if test "$obj" = "$last_oldobj" ; then
 -	        RANLIB=$save_RANLIB
--	      fi  
+-	      fi
 -	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 -	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
 -	      objlist=
@@ -30819,7 +31419,6 @@
 -	  oldobjs=$objlist
 -	  if test "X$oldobjs" = "X" ; then
 -	    eval cmds=\"\$concat_cmds\"
-+	else
 +	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 +	    eval test_cmds=\"$archive_expsym_cmds\"
 +	    cmds=$archive_expsym_cmds
@@ -30844,22 +31443,40 @@
 -      $show "${rm}r$generated"
 -      $run ${rm}r$generated
 -    fi
+-
+-    # Now create the libtool archive.
+-    case $output in
+-    *.la)
+-      old_library=
+-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+-      $show "creating $output"
+-
+-      # Preserve any variables that may affect compiler behavior
+-      for var in $variables_saved_for_relink; do
+-	if eval test -z \"\${$var+set}\"; then
+-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+-	elif eval var_value=\$$var; test -z "$var_value"; then
+-	  relink_command="$var=; export $var; $relink_command"
 +	if test "X$skipped_export" != "X:" &&
 +	   func_len " $test_cmds" &&
 +	   len=$func_len_result &&
 +	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 +	  :
-+	else
+ 	else
+-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+-	fi
+-      done
+-      # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+-      if test "$hardcode_automatic" = yes ; then
+-	relink_command=
+-      fi
 +	  # The command line is too long to link in one step, link piecewise
 +	  # or, if using GNU ld and skipped_export is not :, use a linker
 +	  # script.
- 
--    # Now create the libtool archive.
--    case $output in
--    *.la)
--      old_library=
--      test "$build_old_libs" = yes && old_library="$libname.$libext"
--      $show "creating $output"
++
 +	  # Save the value of $output and $libobjs because we want to
 +	  # use them later.  If we have whole_archive_flag_spec, we
 +	  # want to use save_libobjs as it was before
@@ -30872,31 +31489,9 @@
 +	    save_libobjs=$libobjs
 +	  fi
 +	  save_output=$output
-+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
++	  func_basename "$output"
++	  output_la=$func_basename_result
  
--      # Preserve any variables that may affect compiler behavior
--      for var in $variables_saved_for_relink; do
--	if eval test -z \"\${$var+set}\"; then
--	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
--	elif eval var_value=\$$var; test -z "$var_value"; then
--	  relink_command="$var=; export $var; $relink_command"
--	else
--	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
--	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
--	fi
--      done
--      # Quote the link command for shipping.
--      relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
--      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
--      if test "$hardcode_automatic" = yes ; then
--        relink_command=
--      fi  
--      # Only create the output if not a dry run.
--      if test -z "$run"; then
--	for installed in no yes; do
--	  if test "$installed" = yes; then
--	    if test -z "$install_libdir"; then
--	      break
 +	  # Clear the reloadable object creation command queue and
 +	  # initialize k to one.
 +	  test_cmds=
@@ -30904,17 +31499,26 @@
 +	  objlist=
 +	  last_robj=
 +	  k=1
-+
+ 
+-      # Only create the output if not a dry run.
+-      if test -z "$run"; then
+-	for installed in no yes; do
+-	  if test "$installed" = yes; then
+-	    if test -z "$install_libdir"; then
+-	      break
 +	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
 +	    output=${output_objdir}/${output_la}.lnkscript
 +	    func_verbose "creating GNU ld script: $output"
-+	    $ECHO 'INPUT (' > $output
++	    echo 'INPUT (' > $output
 +	    for obj in $save_libobjs
 +	    do
-+	      $ECHO "$obj" >> $output
++	      func_to_tool_file "$obj"
++	      $ECHO "$func_to_tool_file_result" >> $output
 +	    done
-+	    $ECHO ')' >> $output
-+	    delfiles="$delfiles $output"
++	    echo ')' >> $output
++	    func_append delfiles " $output"
++	    func_to_tool_file "$output"
++	    output=$func_to_tool_file_result
 +	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
 +	    output=${output_objdir}/${output_la}.lnk
 +	    func_verbose "creating linker input file list: $output"
@@ -30936,7 +31540,7 @@
 -		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 -		if test -z "$libdir"; then
 -		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
--		  exit 1
+-		  exit $EXIT_FAILURE
 -		fi
 -		newdependency_libs="$newdependency_libs $libdir/$name"
 -		;;
@@ -30944,7 +31548,8 @@
 -	      esac
 +	    for obj
 +	    do
-+	      $ECHO "$obj" >> $output
++	      func_to_tool_file "$obj"
++	      $ECHO "$func_to_tool_file_result" >> $output
  	    done
 -	    dependency_libs="$newdependency_libs"
 -	    newdlfiles=
@@ -30953,9 +31558,10 @@
 -	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 -	      if test -z "$libdir"; then
 -		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--		exit 1
-+	    delfiles="$delfiles $output"
-+	    output=$firstobj\"$file_list_spec$output\"
+-		exit $EXIT_FAILURE
++	    func_append delfiles " $output"
++	    func_to_tool_file "$output"
++	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
 +	  else
 +	    if test -n "$save_libobjs"; then
 +	      func_verbose "creating reloadable object files..."
@@ -30979,17 +31585,19 @@
 +		  # command to the queue.
 +		  if test "$k" -eq 1 ; then
 +		    # The first file doesn't have a previous command to add.
-+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
++		    reload_objs=$objlist
++		    eval concat_cmds=\"$reload_cmds\"
 +		  else
 +		    # All subsequent reloadable object files will link in
 +		    # the last one created.
-+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
++		    reload_objs="$objlist $last_robj"
++		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 +		  fi
 +		  last_robj=$output_objdir/$output_la-${k}.$objext
 +		  func_arith $k + 1
 +		  k=$func_arith_result
 +		  output=$output_objdir/$output_la-${k}.$objext
-+		  objlist=$obj
++		  objlist=" $obj"
 +		  func_len " $last_robj"
 +		  func_arith $len0 + $func_len_result
 +		  len=$func_arith_result
@@ -30999,7 +31607,8 @@
 +	      # reloadable object file.  All subsequent reloadable object
 +	      # files will link in the last one created.
 +	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
++	      reload_objs="$objlist $last_robj"
++	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
 +	      if test -n "$last_robj"; then
 +	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
  	      fi
@@ -31012,8 +31621,8 @@
 -	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 -	      if test -z "$libdir"; then
 -		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--		exit 1
-+	      delfiles="$delfiles $output"
+-		exit $EXIT_FAILURE
++	      func_append delfiles " $output"
 +
 +	    else
 +	      output=
@@ -31031,25 +31640,6 @@
 +		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
  	      fi
 -	      newdlprefiles="$newdlprefiles $libdir/$name"
--	    done
--	    dlprefiles="$newdlprefiles"
--	  else
--	    newdlfiles=
--	    for lib in $dlfiles; do
--	      case $lib in 
--		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
--		*) abs=`pwd`"/$lib" ;;
--	      esac
--	      newdlfiles="$newdlfiles $abs"
--	    done
--	    dlfiles="$newdlfiles"
--	    newdlprefiles=
--	    for lib in $dlprefiles; do
--	      case $lib in 
--		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
--		*) abs=`pwd`"/$lib" ;;
--	      esac
--	      newdlprefiles="$newdlprefiles $abs"
 +	    fi
 +
 +	    test -n "$save_libobjs" &&
@@ -31067,7 +31657,7 @@
 +		lt_exit=$?
 +
 +		# Restore the uninstalled library and exit
-+		if test "$mode" = relink; then
++		if test "$opt_mode" = relink; then
 +		  ( cd "$output_objdir" && \
 +		    $RM "${realname}T" && \
 +		    $MV "${realname}U" "$realname" )
@@ -31083,27 +31673,13 @@
 +	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 +	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 +	    fi
- 	  fi
--	  $rm $output
--	  # place dlname in correct position for cygwin
--	  tdlname=$dlname
--	  case $host,$output,$installed,$module,$dlname in
--	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
--	  esac
--	  $echo > $output "\
--# $outputname - a libtool library file
--# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
--#
--# Please DO NOT delete this file!
--# It is necessary for linking the library.
- 
--# The name that we can dlopen(3).
--dlname='$tdlname'
++	  fi
++
 +          if ${skipped_export-false}; then
 +	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
 +	      tmp_export_symbols="$export_symbols"
 +	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-+	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
++	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 +	    fi
 +
 +	    if test -n "$orig_export_symbols"; then
@@ -31115,7 +31691,7 @@
 +	      # global variables. join(1) would be nice here, but unfortunately
 +	      # isn't a blessed tool.
 +	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-+	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
++	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 +	      export_symbols=$output_objdir/$libname.def
 +	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 +	    fi
@@ -31139,15 +31715,47 @@
 +	    else
 +	      cmds=$module_cmds
 +	    fi
-+	  else
+ 	  else
+-	    newdlfiles=
+-	    for lib in $dlfiles; do
+-	      case $lib in
+-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+-		*) abs=`pwd`"/$lib" ;;
+-	      esac
+-	      newdlfiles="$newdlfiles $abs"
+-	    done
+-	    dlfiles="$newdlfiles"
+-	    newdlprefiles=
+-	    for lib in $dlprefiles; do
+-	      case $lib in
+-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+-		*) abs=`pwd`"/$lib" ;;
+-	      esac
+-	      newdlprefiles="$newdlprefiles $abs"
+-	    done
+-	    dlprefiles="$newdlprefiles"
 +	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 +	      cmds=$archive_expsym_cmds
 +	    else
 +	      cmds=$archive_cmds
 +	    fi
-+	  fi
+ 	  fi
+-	  $rm $output
+-	  # place dlname in correct position for cygwin
+-	  tdlname=$dlname
+-	  case $host,$output,$installed,$module,$dlname in
+-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+-	  esac
+-	  $echo > $output "\
+-# $outputname - a libtool library file
+-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+-#
+-# Please DO NOT delete this file!
+-# It is necessary for linking the library.
 +	fi
-+
+ 
+-# The name that we can dlopen(3).
+-dlname='$tdlname'
 +	if test -n "$delfiles"; then
 +	  # Append the command to remove temporary files to $cmds.
 +	  eval cmds=\"\$cmds~\$RM $delfiles\"
@@ -31158,12 +31766,12 @@
 +	# Add any objects from preloaded convenience libraries
 +	if test -n "$dlprefiles"; then
 +	  gentop="$output_objdir/${outputname}x"
-+	  generated="$generated $gentop"
++	  func_append generated " $gentop"
  
 -# The name of the static archive.
 -old_library='$old_library'
 +	  func_extract_archives $gentop $dlprefiles
-+	  libobjs="$libobjs $func_extract_archives_result"
++	  func_append libobjs " $func_extract_archives_result"
 +	  test "X$libobjs" = "X " && libobjs=
 +	fi
  
@@ -31179,31 +31787,31 @@
 +	  }
 +	  $opt_dry_run || eval "$cmd" || {
 +	    lt_exit=$?
-+
+ 
+-# Version information for $libname.
+-current=$current
+-age=$age
+-revision=$revision
 +	    # Restore the uninstalled library and exit
-+	    if test "$mode" = relink; then
++	    if test "$opt_mode" = relink; then
 +	      ( cd "$output_objdir" && \
 +	        $RM "${realname}T" && \
 +		$MV "${realname}U" "$realname" )
 +	    fi
  
--# Version information for $libname.
--current=$current
--age=$age
--revision=$revision
+-# Is this an already installed library?
+-installed=$installed
 +	    exit $lt_exit
 +	  }
 +	done
 +	IFS="$save_ifs"
  
--# Is this an already installed library?
--installed=$installed
-+	# Restore the uninstalled library and exit
-+	if test "$mode" = relink; then
-+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
- 
 -# Should we warn about portability when linking against -modules?
 -shouldnotlink=$module
++	# Restore the uninstalled library and exit
++	if test "$opt_mode" = relink; then
++	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
++
 +	  if test -n "$convenience"; then
 +	    if test -z "$whole_archive_flag_spec"; then
 +	      func_show_eval '${RM}r "$gentop"'
@@ -31241,7 +31849,7 @@
 +      fi
        ;;
 -    esac
--    exit 0
+-    exit $EXIT_SUCCESS
 -    ;;
  
 -  # libtool install mode
@@ -31256,11 +31864,11 @@
 -    # install_prog (especially on Windows NT).
 -    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
 -       # Allow the use of GNU shtool's install command.
--       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+-       $echo "X$nonopt" | grep shtool > /dev/null; then
 -      # Aesthetically quote it.
 -      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
 -      case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 -	arg="\"$arg\""
 -	;;
 +      case " $deplibs" in
@@ -31272,14 +31880,14 @@
 -      shift
 -    else
 -      install_prog=
--      arg="$nonopt"
+-      arg=$nonopt
 -    fi
  
 -    # The real first argument should be the name of the installation program.
 -    # Aesthetically quote it.
 -    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 -    case $arg in
--    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 -      arg="\"$arg\""
 -      ;;
 -    esac
@@ -31299,7 +31907,7 @@
 -    do
 -      if test -n "$dest"; then
 -	files="$files $dest"
--	dest="$arg"
+-	dest=$arg
 -	continue
 -      fi
 +      test -n "$xrpath" && \
@@ -31307,21 +31915,24 @@
  
 -      case $arg in
 -      -d) isdir=yes ;;
--      -f) prev="-f" ;;
--      -g) prev="-g" ;;
--      -m) prev="-m" ;;
--      -o) prev="-o" ;;
+-      -f) 
+-      	case " $install_prog " in
+-	*[\\\ /]cp\ *) ;;
+-	*) prev=$arg ;;
+-	esac
+-	;;
+-      -g | -m | -o) prev=$arg ;;
 -      -s)
 -	stripme=" -s"
 -	continue
 -	;;
--      -*) ;;
+-      -*)
 +      test -n "$vinfo" && \
 +	func_warning "\`-version-info' is ignored for objects"
 +
 +      test -n "$release" && \
 +	func_warning "\`-release' is ignored for objects"
- 
++
 +      case $output in
 +      *.lo)
 +	test -n "$objs$old_deplibs" && \
@@ -31330,13 +31941,13 @@
 +	libobj=$output
 +	func_lo2o "$libobj"
 +	obj=$func_lo2o_result
-+	;;
+ 	;;
        *)
 -	# If the previous option needed an argument, then skip it.
 -	if test -n "$prev"; then
 -	  prev=
 -	else
--	  dest="$arg"
+-	  dest=$arg
 -	  continue
 -	fi
 +	libobj=
@@ -31347,7 +31958,7 @@
 -      # Aesthetically quote the argument.
 -      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 -      case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 -	arg="\"$arg\""
 -	;;
 -      esac
@@ -31359,7 +31970,7 @@
 -    if test -z "$install_prog"; then
 -      $echo "$modename: you must specify an install program" 1>&2
 -      $echo "$help" 1>&2
--      exit 1
+-      exit $EXIT_FAILURE
 -    fi
 +      # Objects from convenience libraries.  This assumes
 +      # single-version convenience libraries.  Whenever we create
@@ -31375,15 +31986,15 @@
 -    if test -n "$prev"; then
 -      $echo "$modename: the \`$prev' option requires an argument" 1>&2
 -      $echo "$help" 1>&2
--      exit 1
+-      exit $EXIT_FAILURE
 -    fi
 +      if test -n "$convenience"; then
 +	if test -n "$whole_archive_flag_spec"; then
 +	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-+	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
++	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
 +	else
 +	  gentop="$output_objdir/${obj}x"
-+	  generated="$generated $gentop"
++	  func_append generated " $gentop"
  
 -    if test -z "$files"; then
 -      if test -z "$dest"; then
@@ -31395,13 +32006,13 @@
 +	fi
        fi
 -      $echo "$help" 1>&2
--      exit 1
+-      exit $EXIT_FAILURE
 -    fi
  
 -    # Strip any trailing slash from the destination.
 -    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-+      # Create the old-style object.
-+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
++      # If we're not building shared, we need to use non_pic_objs
++      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
  
 -    # Check to see that the destination is a directory.
 -    test -d "$dest" && isdir=yes
@@ -31412,15 +32023,18 @@
 -      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
 -      test "X$destdir" = "X$dest" && destdir=.
 -      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-+      output="$obj"
-+      func_execute_cmds "$reload_cmds" 'exit $?'
++      # Create the old-style object.
++      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
  
 -      # Not a directory, so check to see that there is only one file specified.
 -      set dummy $files
 -      if test "$#" -gt 2; then
 -	$echo "$modename: \`$dest' is not a directory" 1>&2
 -	$echo "$help" 1>&2
--	exit 1
+-	exit $EXIT_FAILURE
++      output="$obj"
++      func_execute_cmds "$reload_cmds" 'exit $?'
++
 +      # Exit if we aren't doing a library object file.
 +      if test -z "$libobj"; then
 +	if test -n "$gentop"; then
@@ -31439,7 +32053,7 @@
 -	*)
 -	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
 -	  $echo "$help" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	  ;;
 -	esac
 -      done
@@ -31503,8 +32117,8 @@
 +      case $host in
 +      *-*-rhapsody* | *-*-darwin1.[012])
 +	# On Rhapsody replace the C library is the System framework
-+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
++	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
  	;;
 +      esac
  
@@ -31514,7 +32128,7 @@
 -	else
 -	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
 -	  $echo "$help" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 +      case $host in
 +      *-*-darwin*)
 +	# Don't allow lazy linking, it breaks C++ global constructors
@@ -31522,14 +32136,14 @@
 +	if test "$tagname" = CXX ; then
 +	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 +	    10.[0123])
-+	      compile_command="$compile_command ${wl}-bind_at_load"
-+	      finalize_command="$finalize_command ${wl}-bind_at_load"
++	      func_append compile_command " ${wl}-bind_at_load"
++	      func_append finalize_command " ${wl}-bind_at_load"
 +	    ;;
 +	  esac
  	fi
 +	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 +	;;
 +      esac
  
@@ -31556,7 +32170,7 @@
 +	*)
 +	  case " $compile_deplibs " in
 +	  *" -L$path/$objdir "*)
-+	    new_libs="$new_libs -L$path/$objdir" ;;
++	    func_append new_libs " -L$path/$objdir" ;;
  	  esac
 -	else
 -	  # Note the libdir as a future libdir.
@@ -31571,11 +32185,11 @@
 +	-L*)
 +	  case " $new_libs " in
 +	  *" $deplib "*) ;;
-+	  *) new_libs="$new_libs $deplib" ;;
++	  *) func_append new_libs " $deplib" ;;
  	  esac
 -	fi
 +	  ;;
-+	*) new_libs="$new_libs $deplib" ;;
++	*) func_append new_libs " $deplib" ;;
 +	esac
 +      done
 +      compile_deplibs="$new_libs"
@@ -31587,8 +32201,8 @@
 -	if test -n "$relink_command"; then
 -	  # Determine the prefix the user has applied to our future dir.
 -	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-+      compile_command="$compile_command $compile_deplibs"
-+      finalize_command="$finalize_command $finalize_deplibs"
++      func_append compile_command " $compile_deplibs"
++      func_append finalize_command " $finalize_deplibs"
  
 -	  # Don't allow the user to place us outside of our expected
 -	  # location b/c this prevents finding dependent libraries that
@@ -31598,7 +32212,7 @@
 -	  # but it's something to keep an eye on.
 -	  if test "$inst_prefix_dir" = "$destdir"; then
 -	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit 1
+-	    exit $EXIT_FAILURE
 -	  fi
 +      if test -n "$rpath$xrpath"; then
 +	# If the user specified any rpath flags, then add them.
@@ -31606,14 +32220,14 @@
 +	  # This is the magic to use -rpath.
 +	  case "$finalize_rpath " in
 +	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  *) func_append finalize_rpath " $libdir" ;;
 +	  esac
 +	done
 +      fi
  
 -	  if test -n "$inst_prefix_dir"; then
 -	    # Stick the inst_prefix_dir data into the link command.
--	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 +      # Now hardcode the library paths
 +      rpath=
 +      hardcode_libdirs=
@@ -31628,19 +32242,19 @@
 +	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 +		;;
 +	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 +		;;
 +	      esac
 +	    fi
  	  else
--	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 +	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
++	    func_append rpath " $flag"
  	  fi
 +	elif test -n "$runpath_var"; then
 +	  case "$perm_rpath " in
 +	  *" $libdir "*) ;;
-+	  *) perm_rpath="$perm_rpath $libdir" ;;
++	  *) func_append perm_rpath " $libdir" ;;
 +	  esac
 +	fi
 +	case $host in
@@ -31649,12 +32263,12 @@
 +	  case :$dllsearchpath: in
 +	  *":$libdir:"*) ;;
 +	  ::) dllsearchpath=$libdir;;
-+	  *) dllsearchpath="$dllsearchpath:$libdir";;
++	  *) func_append dllsearchpath ":$libdir";;
 +	  esac
 +	  case :$dllsearchpath: in
 +	  *":$testbindir:"*) ;;
 +	  ::) dllsearchpath=$testbindir;;
-+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  *) func_append dllsearchpath ":$testbindir";;
 +	  esac
 +	  ;;
 +	esac
@@ -31683,20 +32297,20 @@
 +	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 +		;;
 +	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 +		;;
 +	      esac
 +	    fi
  	  else
 -	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
--	    exit 1
+-	    exit $EXIT_FAILURE
 +	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
++	    func_append rpath " $flag"
  	  fi
 +	elif test -n "$runpath_var"; then
 +	  case "$finalize_perm_rpath " in
 +	  *" $libdir "*) ;;
-+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
++	  *) func_append finalize_perm_rpath " $libdir" ;;
 +	  esac
  	fi
 +      done
@@ -31714,10 +32328,16 @@
 -	  realname="$2"
 -	  shift
 -	  shift
--
++      if test -n "$libobjs" && test "$build_old_libs" = yes; then
++	# Transform all the library objects into standard objects.
++	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
++	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
++      fi
+ 
 -	  srcname="$realname"
 -	  test -n "$relink_command" && srcname="$realname"T
--
++      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ 
 -	  # Install the shared library and build the symlinks.
 -	  $show "$install_prog $dir/$srcname $destdir/$realname"
 -	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
@@ -31725,22 +32345,45 @@
 -	    $show "$striplib $destdir/$realname"
 -	    $run eval "$striplib $destdir/$realname" || exit $?
 -	  fi
--
++      # template prelinking step
++      if test -n "$prelink_cmds"; then
++	func_execute_cmds "$prelink_cmds" 'exit $?'
++      fi
+ 
 -	  if test "$#" -gt 0; then
 -	    # Delete the old symlinks, and create new ones.
+-	    # Try `ln -sf' first, because the `ln' binary might depend on
+-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+-	    # so we also need to try rm && ln -s.
 -	    for linkname
 -	    do
 -	      if test "$linkname" != "$realname"; then
--		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
--		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
 -	      fi
 -	    done
 -	  fi
-+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-+	# Transform all the library objects into standard objects.
-+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+      fi
++      wrappers_required=yes
++      case $host in
++      *cegcc* | *mingw32ce*)
++        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
++        wrappers_required=no
++        ;;
++      *cygwin* | *mingw* )
++        if test "$build_libtool_libs" != yes; then
++          wrappers_required=no
++        fi
++        ;;
++      *)
++        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
++          wrappers_required=no
++        fi
++        ;;
++      esac
++      if test "$wrappers_required" = no; then
++	# Replace the output file specification.
++	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
++	link_command="$compile_command$compile_rpath"
  
 -	  # Do each command in the postinstall commands.
 -	  lib="$destdir/$realname"
@@ -31750,52 +32393,51 @@
 -	    IFS="$save_ifs"
 -	    eval cmd=\"$cmd\"
 -	    $show "$cmd"
--	    $run eval "$cmd" || exit $?
+-	    $run eval "$cmd" || {
+-	      lt_exit=$?
+-
+-	      # Restore the uninstalled library and exit
+-	      if test "$mode" = relink; then
+-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+-	      fi
++	# We have no uninstalled library dependencies, so finalize right now.
++	exit_status=0
++	func_show_eval "$link_command" 'exit_status=$?'
+ 
+-	      exit $lt_exit
+-	    }
 -	  done
 -	  IFS="$save_ifs"
--	fi
-+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
++	if test -n "$postlink_cmds"; then
++	  func_to_tool_file "$output"
++	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
++	  func_execute_cmds "$postlink_cmds" 'exit $?'
+ 	fi
  
 -	# Install the pseudo-library for information purposes.
 -	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 -	instname="$dir/$name"i
 -	$show "$install_prog $instname $destdir/$name"
 -	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+      # template prelinking step
-+      if test -n "$prelink_cmds"; then
-+	func_execute_cmds "$prelink_cmds" 'exit $?'
-+      fi
++	# Delete the generated files.
++	if test -f "$output_objdir/${outputname}S.${objext}"; then
++	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
++	fi
  
 -	# Maybe install the static library, too.
 -	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
 -	;;
-+      wrappers_required=yes
-+      case $host in
-+      *cygwin* | *mingw* )
-+        if test "$build_libtool_libs" != yes; then
-+          wrappers_required=no
-+        fi
-+        ;;
-+      *cegcc)
-+        # Disable wrappers for cegcc, we are cross compiling anyway.
-+        wrappers_required=no
-+        ;;
-+      *)
-+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-+          wrappers_required=no
-+        fi
-+        ;;
-+      esac
-+      if test "$wrappers_required" = no; then
-+	# Replace the output file specification.
-+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	link_command="$compile_command$compile_rpath"
++	exit $exit_status
++      fi
  
 -      *.lo)
 -	# Install (i.e. copy) a libtool object.
-+	# We have no uninstalled library dependencies, so finalize right now.
-+	exit_status=0
-+	func_show_eval "$link_command" 'exit_status=$?'
++      if test -n "$compile_shlibpath$finalize_shlibpath"; then
++	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
++      fi
++      if test -n "$finalize_shlibpath"; then
++	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
++      fi
  
 -	# Figure out destination file name, if it wasn't already specified.
 -	if test -n "$destname"; then
@@ -31803,11 +32445,18 @@
 -	else
 -	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 -	  destfile="$destdir/$destfile"
-+	# Delete the generated files.
-+	if test -f "$output_objdir/${outputname}S.${objext}"; then
-+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
++      compile_var=
++      finalize_var=
++      if test -n "$runpath_var"; then
++	if test -n "$perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $perm_rpath; do
++	    func_append rpath "$dir:"
++	  done
++	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
  	fi
- 
+-
 -	# Deduce the name of the destination old-style object file.
 -	case $destfile in
 -	*.lo)
@@ -31820,7 +32469,7 @@
 -	*)
 -	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
 -	  $echo "$help" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	  ;;
 -	esac
 -
@@ -31828,51 +32477,67 @@
 -	if test -n "$destfile"; then
 -	  $show "$install_prog $file $destfile"
 -	  $run eval "$install_prog $file $destfile" || exit $?
--	fi
-+	exit $exit_status
++	if test -n "$finalize_perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $finalize_perm_rpath; do
++	    func_append rpath "$dir:"
++	  done
++	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ 	fi
 +      fi
  
 -	# Install the old object if enabled.
 -	if test "$build_old_libs" = yes; then
 -	  # Deduce the name of the old-style object file.
 -	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-+      fi
-+      if test -n "$finalize_shlibpath"; then
-+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-+      fi
++      if test "$no_install" = yes; then
++	# We don't need to create a wrapper script.
++	link_command="$compile_var$compile_command$compile_rpath"
++	# Replace the output file specification.
++	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
++	# Delete the old output file.
++	$opt_dry_run || $RM $output
++	# Link the executable and exit
++	func_show_eval "$link_command" 'exit $?'
  
 -	  $show "$install_prog $staticobj $staticdest"
 -	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-+      compile_var=
-+      finalize_var=
-+      if test -n "$runpath_var"; then
-+	if test -n "$perm_rpath"; then
-+	  # We should set the runpath_var.
-+	  rpath=
-+	  for dir in $perm_rpath; do
-+	    rpath="$rpath$dir:"
-+	  done
-+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	if test -n "$postlink_cmds"; then
++	  func_to_tool_file "$output"
++	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
++	  func_execute_cmds "$postlink_cmds" 'exit $?'
  	fi
--	exit 0
++
+ 	exit $EXIT_SUCCESS
 -	;;
--
++      fi
+ 
 -      *)
 -	# Figure out destination file name, if it wasn't already specified.
 -	if test -n "$destname"; then
 -	  destfile="$destdir/$destname"
--	else
++      if test "$hardcode_action" = relink; then
++	# Fast installation is not supported
++	link_command="$compile_var$compile_command$compile_rpath"
++	relink_command="$finalize_var$finalize_command$finalize_rpath"
++
++	func_warning "this platform does not like uninstalled shared libraries"
++	func_warning "\`$output' will be relinked during installation"
++      else
++	if test "$fast_install" != no; then
++	  link_command="$finalize_var$compile_command$finalize_rpath"
++	  if test "$fast_install" = yes; then
++	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
++	  else
++	    # fast_install is set to needless
++	    relink_command=
++	  fi
+ 	else
 -	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 -	  destfile="$destdir/$destfile"
-+	if test -n "$finalize_perm_rpath"; then
-+	  # We should set the runpath_var.
-+	  rpath=
-+	  for dir in $finalize_perm_rpath; do
-+	    rpath="$rpath$dir:"
-+	  done
-+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	  link_command="$compile_var$compile_command$compile_rpath"
++	  relink_command="$finalize_var$finalize_command$finalize_rpath"
  	fi
 +      fi
  
@@ -31888,7 +32553,9 @@
 -	    fi
 -	    ;;
 -	esac
--
++      # Replace the output file specification.
++      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ 
 -	# Do a test to see if this is really a libtool program.
 -	case $host in
 -	*cygwin*|*mingw*)
@@ -31901,54 +32568,30 @@
 -	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
 -	  notinst_deplibs=
 -	  relink_command=
-+      if test "$no_install" = yes; then
-+	# We don't need to create a wrapper script.
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	# Replace the output file specification.
-+	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	# Delete the old output file.
-+	$opt_dry_run || $RM $output
-+	# Link the executable and exit
-+	func_show_eval "$link_command" 'exit $?'
-+	exit $EXIT_SUCCESS
-+      fi
++      # Delete the old output files.
++      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
  
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
+-	  # Note that it is not necessary on cygwin/mingw to append a dot to
+-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+-	  # `FILE.' does not work on cygwin managed mounts.
+-	  #
 -	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
+-	  case $wrapper in
+-	  */* | *\\*) . ${wrapper} ;;
+-	  *) . ./${wrapper} ;;
 -	  esac
-+      if test "$hardcode_action" = relink; then
-+	# Fast installation is not supported
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	relink_command="$finalize_var$finalize_command$finalize_rpath"
++      func_show_eval "$link_command" 'exit $?'
  
 -	  # Check the variables that should have been set.
 -	  if test -z "$notinst_deplibs"; then
 -	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
--	    exit 1
-+	func_warning "this platform does not like uninstalled shared libraries"
-+	func_warning "\`$output' will be relinked during installation"
-+      else
-+	if test "$fast_install" != no; then
-+	  link_command="$finalize_var$compile_command$finalize_rpath"
-+	  if test "$fast_install" = yes; then
-+	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+	  else
-+	    # fast_install is set to needless
-+	    relink_command=
- 	  fi
-+	else
-+	  link_command="$compile_var$compile_command$compile_rpath"
-+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-+	fi
+-	    exit $EXIT_FAILURE
+-	  fi
++      if test -n "$postlink_cmds"; then
++	func_to_tool_file "$output_objdir/$outputname"
++	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
++	func_execute_cmds "$postlink_cmds" 'exit $?'
 +      fi
  
 -	  finalize=yes
@@ -31968,59 +32611,20 @@
 -	      finalize=no
 -	    fi
 -	  done
-+      # Replace the output file specification.
-+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
++      # Now create the wrapper script.
++      func_verbose "creating $output"
  
 -	  relink_command=
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
+-	  # Note that it is not necessary on cygwin/mingw to append a dot to
+-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+-	  # `FILE.' does not work on cygwin managed mounts.
+-	  #
 -	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
+-	  case $wrapper in
+-	  */* | *\\*) . ${wrapper} ;;
+-	  *) . ./${wrapper} ;;
 -	  esac
-+      # Delete the old output files.
-+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
- 
--	  outputname=
--	  if test "$fast_install" = no && test -n "$relink_command"; then
--	    if test "$finalize" = yes && test -z "$run"; then
--	      tmpdir="/tmp"
--	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
--              if tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`; then :
--	      else
--                tmpdir="$tmpdir/libtool-$$"
--		if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
--		else
--		  $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
--		  continue
--		fi
--	      fi
--	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
--	      outputname="$tmpdir/$file"
--	      # Replace the output file specification.
--	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+      func_show_eval "$link_command" 'exit $?'
- 
--	      $show "$relink_command"
--	      if $run eval "$relink_command"; then :
--	      else
--		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
--		${rm}r "$tmpdir"
--		continue
--	      fi
--	      file="$outputname"
--	    else
--	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
--	    fi
-+      # Now create the wrapper script.
-+      func_verbose "creating $output"
-+
 +      # Quote the relink command for shipping.
 +      if test -n "$relink_command"; then
 +	# Preserve any variables that may affect compiler behavior
@@ -32029,53 +32633,23 @@
 +	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
 +	  elif eval var_value=\$$var; test -z "$var_value"; then
 +	    relink_command="$var=; export $var; $relink_command"
- 	  else
--	    # Install the binary that we compiled earlier.
--	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
++	  else
 +	    func_quote_for_eval "$var_value"
 +	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
- 	  fi
--	fi
++	  fi
 +	done
 +	relink_command="(cd `pwd`; $relink_command)"
-+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      fi
- 
--	# remove .exe since cygwin /usr/bin/install will append another
--	# one anyways
--	case $install_prog,$host in
--	*/usr/bin/install*,*cygwin*)
--	  case $file:$destfile in
--	  *.exe:*.exe)
--	    # this is ok
--	    ;;
--	  *.exe:*)
--	    destfile=$destfile.exe
--	    ;;
--	  *:*.exe)
--	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
--	    ;;
--	  esac
--	  ;;
-+      # Quote $ECHO for shipping.
-+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-+	case $progpath in
-+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
- 	esac
--	$show "$install_prog$stripme $file $destfile"
--	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
--	test -n "$outputname" && ${rm}r "$tmpdir"
--	;;
--      esac
--    done
-+	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-+      else
-+	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
++	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
 +      fi
  
--    for file in $staticlibs; do
--      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-	  outputname=
+-	  if test "$fast_install" = no && test -n "$relink_command"; then
+-	    if test "$finalize" = yes && test -z "$run"; then
+-	      tmpdir=`func_mktempdir`
+-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+-	      outputname="$tmpdir/$file"
+-	      # Replace the output file specification.
+-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 +      # Only actually do things if not in dry run mode.
 +      $opt_dry_run || {
 +	# win32 will think the script is a binary if it has
@@ -32112,7 +32686,9 @@
 +	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
 +	      $STRIP $cwrapper
 +	    }
-+
+ 
+-	      $show "$relink_command"
+-	      if $run eval "$relink_command"; then :
 +	    # Now, create the wrapper script for func_source use:
 +	    func_ltwrapper_scriptname $cwrapper
 +	    $RM $func_ltwrapper_scriptname_result
@@ -32121,21 +32697,58 @@
 +	      # note: this script will not be executed, so do not chmod.
 +	      if test "x$build" = "x$host" ; then
 +		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-+	      else
+ 	      else
+-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-		${rm}r "$tmpdir"
+-		continue
 +		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-+	      fi
+ 	      fi
+-	      file="$outputname"
+-	    else
+-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
+-	    fi
+-	  else
+-	    # Install the binary that we compiled earlier.
+-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+-	  fi
+-	fi
 +	    }
 +	  ;;
 +	  * )
 +	    $RM $output
 +	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
  
--      # Set up the ranlib parameters.
--      oldlib="$destdir/$name"
+-	# remove .exe since cygwin /usr/bin/install will append another
+-	# one anyway 
+-	case $install_prog,$host in
+-	*/usr/bin/install*,*cygwin*)
+-	  case $file:$destfile in
+-	  *.exe:*.exe)
+-	    # this is ok
+-	    ;;
+-	  *.exe:*)
+-	    destfile=$destfile.exe
+-	    ;;
+-	  *:*.exe)
+-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+-	    ;;
+-	  esac
 +	    func_emit_wrapper no > $output
 +	    chmod +x $output
-+	  ;;
-+	esac
+ 	  ;;
+ 	esac
+-	$show "$install_prog$stripme $file $destfile"
+-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+-	test -n "$outputname" && ${rm}r "$tmpdir"
+-	;;
+-      esac
+-    done
+-
+-    for file in $staticlibs; do
+-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-
+-      # Set up the ranlib parameters.
+-      oldlib="$destdir/$name"
 +      }
 +      exit $EXIT_SUCCESS
 +      ;;
@@ -32160,7 +32773,7 @@
 +	else
 +	  oldobjs="$old_deplibs $non_pic_objects"
 +	  if test "$preload" = yes && test -f "$symfileobj"; then
-+	    oldobjs="$oldobjs $symfileobj"
++	    func_append oldobjs " $symfileobj"
 +	  fi
 +	fi
 +	addlibs="$old_convenience"
@@ -32179,21 +32792,21 @@
 -    done
 +      if test -n "$addlibs"; then
 +	gentop="$output_objdir/${outputname}x"
-+	generated="$generated $gentop"
++	func_append generated " $gentop"
  
 -    if test -n "$future_libdirs"; then
 -      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
 -    fi
 +	func_extract_archives $gentop $addlibs
-+	oldobjs="$oldobjs $func_extract_archives_result"
++	func_append oldobjs " $func_extract_archives_result"
 +      fi
  
 -    if test -n "$current_libdirs"; then
 -      # Maybe just do a dry run.
 -      test -n "$run" && current_libdirs=" -n$current_libdirs"
--      exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
+-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
 -    else
--      exit 0
+-      exit $EXIT_SUCCESS
 -    fi
 -    ;;
 +      # Do each command in the archive commands.
@@ -32209,7 +32822,7 @@
 +	# Add any objects from preloaded convenience libraries
 +	if test -n "$dlprefiles"; then
 +	  gentop="$output_objdir/${outputname}x"
-+	  generated="$generated $gentop"
++	  func_append generated " $gentop"
  
 -    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
 -      for dir
@@ -32217,7 +32830,7 @@
 -	libdirs="$libdirs $dir"
 -      done
 +	  func_extract_archives $gentop $dlprefiles
-+	  oldobjs="$oldobjs $func_extract_archives_result"
++	  func_append oldobjs " $func_extract_archives_result"
 +	fi
  
 -      for libdir in $libdirs; do
@@ -32244,9 +32857,9 @@
 +	    done | sort | sort -uc >/dev/null 2>&1); then
 +	  :
 +	else
-+	  $ECHO "copying selected object files to avoid basename conflicts..."
++	  echo "copying selected object files to avoid basename conflicts..."
 +	  gentop="$output_objdir/${outputname}x"
-+	  generated="$generated $gentop"
++	  func_append generated " $gentop"
 +	  func_mkdir_p "$gentop"
 +	  save_oldobjs=$oldobjs
 +	  oldobjs=
@@ -32270,9 +32883,9 @@
 +		esac
 +	      done
 +	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-+	      oldobjs="$oldobjs $gentop/$newobj"
++	      func_append oldobjs " $gentop/$newobj"
 +	      ;;
-+	    *) oldobjs="$oldobjs $obj" ;;
++	    *) func_append oldobjs " $obj" ;;
 +	    esac
  	  done
 -	  IFS="$save_ifs"
@@ -32287,10 +32900,10 @@
 -    fi
 -
 -    # Exit here if they wanted silent mode.
--    test "$show" = : && exit 0
+-    test "$show" = : && exit $EXIT_SUCCESS
 +	eval cmds=\"$old_archive_cmds\"
  
--    $echo "----------------------------------------------------------------------"
+-    $echo "X----------------------------------------------------------------------" | $Xsed
 -    $echo "Libraries have been installed in:"
 -    for libdir in $libdirs; do
 -      $echo "   $libdir"
@@ -32298,6 +32911,16 @@
 +	len=$func_len_result
 +	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 +	  cmds=$old_archive_cmds
++	elif test -n "$archiver_list_spec"; then
++	  func_verbose "using command file archive linking..."
++	  for obj in $oldobjs
++	  do
++	    func_to_tool_file "$obj"
++	    $ECHO "$func_to_tool_file_result"
++	  done > $output_objdir/$libname.libcmd
++	  func_to_tool_file "$output_objdir/$libname.libcmd"
++	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
++	  cmds=$old_archive_cmds
 +	else
 +	  # the command line is too long to link in one step, link in parts
 +	  func_verbose "using piecewise archive linking..."
@@ -32375,20 +32998,20 @@
 -    $echo
 -    $echo "See any operating system documentation about shared libraries for"
 -    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    $echo "----------------------------------------------------------------------"
--    exit 0
+-    $echo "X----------------------------------------------------------------------" | $Xsed
+-    exit $EXIT_SUCCESS
 -    ;;
- 
+-
 -  # libtool execute mode
 -  execute)
 -    modename="$modename: execute"
--
+ 
 -    # The first argument is the command name.
 -    cmd="$nonopt"
 -    if test -z "$cmd"; then
 -      $echo "$modename: you must specify a COMMAND" 1>&2
 -      $echo "$help"
--      exit 1
+-      exit $EXIT_FAILURE
 -    fi
 +    test -n "$generated" && \
 +      func_show_eval "${RM}r$generated"
@@ -32398,7 +33021,7 @@
 -      if test ! -f "$file"; then
 -	$echo "$modename: \`$file' is not a file" 1>&2
 -	$echo "$help" 1>&2
--	exit 1
+-	exit $EXIT_FAILURE
 -      fi
 +    # Now create the libtool archive.
 +    case $output in
@@ -32421,14 +33044,14 @@
  	else
 -	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
 -	  $echo "$help" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 +	  func_quote_for_eval "$var_value"
 +	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
  	fi
 +      done
 +      # Quote the link command for shipping.
 +      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
 +      if test "$hardcode_automatic" = yes ; then
 +	relink_command=
 +      fi
@@ -32454,14 +33077,29 @@
 +		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 +		test -z "$libdir" && \
 +		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-+		newdependency_libs="$newdependency_libs $libdir/$name"
++		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
++		;;
++	      -L*)
++		func_stripname -L '' "$deplib"
++		func_replace_sysroot "$func_stripname_result"
++		func_append newdependency_libs " -L$func_replace_sysroot_result"
 +		;;
-+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
++	      -R*)
++		func_stripname -R '' "$deplib"
++		func_replace_sysroot "$func_stripname_result"
++		func_append newdependency_libs " -R$func_replace_sysroot_result"
++		;;
++	      *) func_append newdependency_libs " $deplib" ;;
 +	      esac
 +	    done
 +	    dependency_libs="$newdependency_libs"
 +	    newdlfiles=
-+
+ 
+-	# If there is no directory component, then add one.
+-	case $file in
+-	*/* | *\\*) . $file ;;
+-	*) . ./$file ;;
+-	esac
 +	    for lib in $dlfiles; do
 +	      case $lib in
 +	      *.la)
@@ -32470,9 +33108,9 @@
 +		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 +		test -z "$libdir" && \
 +		  func_fatal_error "\`$lib' is not a valid libtool archive"
-+		newdlfiles="$newdlfiles $libdir/$name"
++		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 +		;;
-+	      *) newdlfiles="$newdlfiles $lib" ;;
++	      *) func_append newdlfiles " $lib" ;;
 +	      esac
 +	    done
 +	    dlfiles="$newdlfiles"
@@ -32489,7 +33127,7 @@
 +		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 +		test -z "$libdir" && \
 +		  func_fatal_error "\`$lib' is not a valid libtool archive"
-+		newdlprefiles="$newdlprefiles $libdir/$name"
++		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 +		;;
 +	      esac
 +	    done
@@ -32501,7 +33139,7 @@
 +		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 +		*) abs=`pwd`"/$lib" ;;
 +	      esac
-+	      newdlfiles="$newdlfiles $abs"
++	      func_append newdlfiles " $abs"
 +	    done
 +	    dlfiles="$newdlfiles"
 +	    newdlprefiles=
@@ -32510,15 +33148,33 @@
 +		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 +		*) abs=`pwd`"/$lib" ;;
 +	      esac
-+	      newdlprefiles="$newdlprefiles $abs"
++	      func_append newdlprefiles " $abs"
 +	    done
 +	    dlprefiles="$newdlprefiles"
 +	  fi
 +	  $RM $output
 +	  # place dlname in correct position for cygwin
++	  # In fact, it would be nice if we could use this code for all target
++	  # systems that can't hard-code library paths into their executables
++	  # and that have no shared library path variable independent of PATH,
++	  # but it turns out we can't easily determine that from inspecting
++	  # libtool variables, so we have to hard-code the OSs to which it
++	  # applies here; at the moment, that means platforms that use the PE
++	  # object format with DLL files.  See the long comment at the top of
++	  # tests/bindir.at for full details.
 +	  tdlname=$dlname
 +	  case $host,$output,$installed,$module,$dlname in
-+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
++	      # If a -bindir argument was supplied, place the dll there.
++	      if test "x$bindir" != x ;
++	      then
++		func_relative_path "$install_libdir" "$bindir"
++		tdlname=$func_relative_path_result$dlname
++	      else
++		# Otherwise fall back on heuristic.
++		tdlname=../bin/$dlname
++	      fi
++	      ;;
 +	  esac
 +	  $ECHO > $output "\
 +# $outputname - a libtool library file
@@ -32527,61 +33183,51 @@
 +# Please DO NOT delete this file!
 +# It is necessary for linking the library.
  
--	# If there is no directory component, then add one.
--	case $file in
--	*/* | *\\*) . $file ;;
--	*) . ./$file ;;
--	esac
-+# The name that we can dlopen(3).
-+dlname='$tdlname'
- 
 -	# Skip this library if it cannot be dlopened.
 -	if test -z "$dlname"; then
 -	  # Warn if it was a shared library.
 -	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
 -	  continue
 -	fi
-+# Names of this library.
-+library_names='$library_names'
++# The name that we can dlopen(3).
++dlname='$tdlname'
  
 -	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
 -	test "X$dir" = "X$file" && dir=.
-+# The name of the static archive.
-+old_library='$old_library'
++# Names of this library.
++library_names='$library_names'
  
 -	if test -f "$dir/$objdir/$dlname"; then
 -	  dir="$dir/$objdir"
 -	else
 -	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
--	  exit 1
+-	  exit $EXIT_FAILURE
 -	fi
 -	;;
-+# Linker flags that can not go in dependency_libs.
-+inherited_linker_flags='$new_inherited_linker_flags'
++# The name of the static archive.
++old_library='$old_library'
  
 -      *.lo)
 -	# Just add the directory containing the .lo file.
 -	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
 -	test "X$dir" = "X$file" && dir=.
 -	;;
-+# Libraries that this one depends upon.
-+dependency_libs='$dependency_libs'
++# Linker flags that can not go in dependency_libs.
++inherited_linker_flags='$new_inherited_linker_flags'
  
 -      *)
 -	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
 -	continue
 -	;;
 -      esac
-+# Names of additional weak libraries provided by this library
-+weak_library_names='$weak_libs'
++# Libraries that this one depends upon.
++dependency_libs='$dependency_libs'
  
 -      # Get the absolute pathname.
 -      absdir=`cd "$dir" && pwd`
 -      test -n "$absdir" && dir="$absdir"
-+# Version information for $libname.
-+current=$current
-+age=$age
-+revision=$revision
++# Names of additional weak libraries provided by this library
++weak_library_names='$weak_libs'
  
 -      # Now add the directory to shlibpath_var.
 -      if eval "test -z \"\$$shlibpath_var\""; then
@@ -32590,14 +33236,16 @@
 -	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
 -      fi
 -    done
-+# Is this an already installed library?
-+installed=$installed
++# Version information for $libname.
++current=$current
++age=$age
++revision=$revision
  
 -    # This variable tells wrapper scripts just to set shlibpath_var
 -    # rather than running their programs.
 -    libtool_execute_magic="$magic"
-+# Should we warn about portability when linking against -modules?
-+shouldnotlink=$module
++# Is this an already installed library?
++installed=$installed
  
 -    # Check if any of the arguments is a wrapper script.
 -    args=
@@ -32613,9 +33261,8 @@
 -	  */* | *\\*) . $file ;;
 -	  *) . ./$file ;;
 -	  esac
-+# Files to dlopen/dlpreopen
-+dlopen='$dlfiles'
-+dlpreopen='$dlprefiles'
++# Should we warn about portability when linking against -modules?
++shouldnotlink=$module
  
 -	  # Transform arg to wrapped name.
 -	  file="$progdir/$program"
@@ -32626,6 +33273,15 @@
 -      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
 -      args="$args \"$file\""
 -    done
++# Files to dlopen/dlpreopen
++dlopen='$dlfiles'
++dlpreopen='$dlprefiles'
+ 
+-    if test -z "$run"; then
+-      if test -n "$shlibpath_var"; then
+-	# Export the shlibpath_var.
+-	eval "export $shlibpath_var"
+-      fi
 +# Directory that this library needs to be installed in:
 +libdir='$install_libdir'"
 +	  if test "$installed" = no && test "$need_relink" = yes; then
@@ -32635,11 +33291,15 @@
 +	done
 +      }
  
--    if test -z "$run"; then
--      if test -n "$shlibpath_var"; then
--	# Export the shlibpath_var.
--	eval "export $shlibpath_var"
--      fi
+-      # Restore saved environment variables
+-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+-      do
+-       eval "if test \"\${save_$lt_var+set}\" = set; then
+-               $lt_var=\$save_$lt_var; export $lt_var
+-             else
+-               $lt_unset $lt_var
+-             fi"
+-      done
 +      # Do a symbolic link so that the libtool archive can be found in
 +      # LD_LIBRARY_PATH before the program is installed.
 +      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
@@ -32648,26 +33308,19 @@
 +    exit $EXIT_SUCCESS
 +}
  
--      # Restore saved environment variables
--      if test "${save_LC_ALL+set}" = set; then
--	LC_ALL="$save_LC_ALL"; export LC_ALL
--      fi
--      if test "${save_LANG+set}" = set; then
--	LANG="$save_LANG"; export LANG
--      fi
-+{ test "$mode" = link || test "$mode" = relink; } &&
++{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
 +    func_mode_link ${1+"$@"}
  
 -      # Now prepare to actually exec the command.
--      exec_cmd="\"\$cmd\"$args"
+-      exec_cmd="\$cmd$args"
 -    else
 -      # Display what would be done.
 -      if test -n "$shlibpath_var"; then
 -	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
 -	$echo "export $shlibpath_var"
 -      fi
--      eval \$echo \"\$cmd\"$args
--      exit 0
+-      $echo "$cmd$args"
+-      exit $EXIT_SUCCESS
 -    fi
 -    ;;
  
@@ -32683,47 +33336,59 @@
      files=
      rmforce=
      exit_status=0
-@@ -5995,30 +8209,28 @@
+@@ -6494,44 +9441,41 @@
      for arg
      do
        case $arg in
 -      -f) rm="$rm $arg"; rmforce=yes ;;
 -      -*) rm="$rm $arg" ;;
-+      -f) RM="$RM $arg"; rmforce=yes ;;
-+      -*) RM="$RM $arg" ;;
-       *) files="$files $arg" ;;
+-      *) files="$files $arg" ;;
++      -f) func_append RM " $arg"; rmforce=yes ;;
++      -*) func_append RM " $arg" ;;
++      *) func_append files " $arg" ;;
        esac
      done
  
 -    if test -z "$rm"; then
 -      $echo "$modename: you must specify an RM program" 1>&2
 -      $echo "$help" 1>&2
--      exit 1
+-      exit $EXIT_FAILURE
 -    fi
 +    test -z "$RM" && \
 +      func_fatal_help "you must specify an RM program"
  
      rmdirs=
  
-     origobjdir="$objdir"
+-    origobjdir="$objdir"
      for file in $files; do
 -      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
 -      if test "X$dir" = "X$file"; then
 -	dir=.
+-	objdir="$origobjdir"
 +      func_dirname "$file" "" "."
 +      dir="$func_dirname_result"
 +      if test "X$dir" = X.; then
- 	objdir="$origobjdir"
++	odir="$objdir"
        else
- 	objdir="$dir/$origobjdir"
+-	objdir="$dir/$origobjdir"
++	odir="$dir/$objdir"
        fi
 -      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-      test "$mode" = uninstall && objdir="$dir"
 +      func_basename "$file"
 +      name="$func_basename_result"
-       test "$mode" = uninstall && objdir="$dir"
++      test "$opt_mode" = uninstall && odir="$dir"
  
-       # Remember objdir for removal later, being careful to avoid duplicates
-@@ -6030,9 +8242,9 @@
+-      # Remember objdir for removal later, being careful to avoid duplicates
+-      if test "$mode" = clean; then
++      # Remember odir for removal later, being careful to avoid duplicates
++      if test "$opt_mode" = clean; then
+ 	case " $rmdirs " in
+-	  *" $objdir "*) ;;
+-	  *) rmdirs="$rmdirs $objdir" ;;
++	  *" $odir "*) ;;
++	  *) func_append rmdirs " $odir" ;;
+ 	esac
        fi
  
        # Don't error if the file doesn't exist and rm -f was used.
@@ -32736,7 +33401,7 @@
  	:
        elif test -d "$file"; then
  	exit_status=1
-@@ -6046,69 +8258,56 @@
+@@ -6545,55 +9489,32 @@
        case $name in
        *.la)
  	# Possibly a libtool archive, so verify it.
@@ -32747,22 +33412,26 @@
  
  	  # Delete the libtool libraries and symlinks.
  	  for n in $library_names; do
- 	    rmfiles="$rmfiles $objdir/$n"
+-	    rmfiles="$rmfiles $objdir/$n"
++	    func_append rmfiles " $odir/$n"
  	  done
- 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
--	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
++	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
  
--	  if test "$mode" = uninstall; then
-+	  case "$mode" in
-+	  clean)
-+	    case "  $library_names " in
-+	    # "  " in the beginning catches empty $dlname
-+	    *" $dlname "*) ;;
-+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-+	    esac
-+	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+	    ;;
-+	  uninstall)
+-	  case "$mode" in
++	  case "$opt_mode" in
+ 	  clean)
+-	    case "  $library_names " in
+-	    # "  " in the beginning catches empty $dlname
++	    case " $library_names " in
+ 	    *" $dlname "*) ;;
+-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
++	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+ 	    esac
+-	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+ 	    ;;
+ 	  uninstall)
  	    if test -n "$library_names"; then
  	      # Do each command in the postuninstall commands.
 -	      cmds=$postuninstall_cmds
@@ -32797,11 +33466,8 @@
 +	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
  	    fi
  	    # FIXME: should reinstall the best remaining shared library.
--	  fi
-+	    ;;
-+	  esac
- 	fi
- 	;;
+ 	    ;;
+@@ -6603,288 +9524,95 @@
  
        *.lo)
  	# Possibly a libtool object, so verify it.
@@ -32815,34 +33481,39 @@
  	  # Add PIC object to the list of files to remove.
 -	  if test -n "$pic_object" \
 -	     && test "$pic_object" != none; then
+-	    rmfiles="$rmfiles $dir/$pic_object"
 +	  if test -n "$pic_object" &&
 +	     test "$pic_object" != none; then
- 	    rmfiles="$rmfiles $dir/$pic_object"
++	    func_append rmfiles " $dir/$pic_object"
  	  fi
  
  	  # Add non-PIC object to the list of files to remove.
 -	  if test -n "$non_pic_object" \
 -	     && test "$non_pic_object" != none; then
+-	    rmfiles="$rmfiles $dir/$non_pic_object"
 +	  if test -n "$non_pic_object" &&
 +	     test "$non_pic_object" != none; then
- 	    rmfiles="$rmfiles $dir/$non_pic_object"
++	    func_append rmfiles " $dir/$non_pic_object"
  	  fi
  	fi
-@@ -6118,18 +8317,27 @@
- 	if test "$mode" = clean ; then
+ 	;;
+ 
+       *)
+-	if test "$mode" = clean ; then
++	if test "$opt_mode" = clean ; then
  	  noexename=$name
  	  case $file in
--	  *.exe) 
+ 	  *.exe)
 -	    file=`$echo $file|${SED} 's,.exe$,,'`
 -	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-+	  *.exe)
 +	    func_stripname '' '.exe' "$file"
 +	    file=$func_stripname_result
 +	    func_stripname '' '.exe' "$name"
 +	    noexename=$func_stripname_result
  	    # $file with .exe has already been added to rmfiles,
  	    # add $file without .exe
- 	    rmfiles="$rmfiles $file"
+-	    rmfiles="$rmfiles $file"
++	    func_append rmfiles " $file"
  	    ;;
  	  esac
  	  # Do a test to see if this is a libtool program.
@@ -32854,7 +33525,7 @@
 +	      func_ltwrapper_scriptname "$file"
 +	      relink_command=
 +	      func_source $func_ltwrapper_scriptname_result
-+	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
++	      func_append rmfiles " $func_ltwrapper_scriptname_result"
 +	    else
 +	      relink_command=
 +	      func_source $dir/$noexename
@@ -32862,7 +33533,17 @@
  
  	    # note $name still contains .exe if it was in $file originally
  	    # as does the version of $file that was added into $rmfiles
-@@ -6144,237 +8352,38 @@
+-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
++	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+ 	    if test "$fast_install" = yes && test -n "$relink_command"; then
+-	      rmfiles="$rmfiles $objdir/lt-$name"
++	      func_append rmfiles " $odir/lt-$name"
+ 	    fi
+ 	    if test "X$noexename" != "X$name" ; then
+-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
++	      func_append rmfiles " $odir/lt-${noexename}.c"
+ 	    fi
+ 	  fi
  	fi
  	;;
        esac
@@ -32870,7 +33551,7 @@
 -      $run $rm $rmfiles || exit_status=1
 +      func_show_eval "$RM $rmfiles" 'exit_status=1'
      done
-     objdir="$origobjdir"
+-    objdir="$origobjdir"
  
      # Try to remove the ${objdir}s in the directories where we deleted files
      for dir in $rmdirs; do
@@ -32888,31 +33569,30 @@
 -  "")
 -    $echo "$modename: you must specify a MODE" 1>&2
 -    $echo "$generic_help" 1>&2
--    exit 1
+-    exit $EXIT_FAILURE
 -    ;;
 -  esac
-+{ test "$mode" = uninstall || test "$mode" = clean; } &&
++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
 +    func_mode_uninstall ${1+"$@"}
  
 -  if test -z "$exec_cmd"; then
 -    $echo "$modename: invalid operation mode \`$mode'" 1>&2
 -    $echo "$generic_help" 1>&2
--    exit 1
+-    exit $EXIT_FAILURE
 -  fi
 -fi # test -z "$show_help"
-+test -z "$mode" && {
++test -z "$opt_mode" && {
 +  help="$generic_help"
 +  func_fatal_help "you must specify a MODE"
 +}
 +
 +test -z "$exec_cmd" && \
-+  func_fatal_help "invalid operation mode \`$mode'"
++  func_fatal_help "invalid operation mode \`$opt_mode'"
  
  if test -n "$exec_cmd"; then
 -  eval exec $exec_cmd
--  exit 1
 +  eval exec "$exec_cmd"
-+  exit $EXIT_FAILURE
+   exit $EXIT_FAILURE
  fi
  
 -# We need to display help for each of the modes.
@@ -32948,7 +33628,7 @@
 -a more detailed description of MODE.
 -
 -Report bugs to <bug-libtool@gnu.org>."
--  exit 0
+-  exit $EXIT_SUCCESS
 -  ;;
 -
 -clean)
@@ -33049,9 +33729,9 @@
 -  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
 -  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
 -  -export-symbols SYMFILE
--		    try to export only the symbols listed in SYMFILE
+-                    try to export only the symbols listed in SYMFILE
 -  -export-symbols-regex REGEX
--		    try to export only the symbols matching REGEX
+-                    try to export only the symbols matching REGEX
 -  -LLIBDIR          search LIBDIR for required installed libraries
 -  -lNAME            OUTPUT-FILE requires the installed library libNAME
 -  -module           build a library that can dlopened
@@ -33065,9 +33745,11 @@
 -  -release RELEASE  specify package release information
 -  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
 -  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
--  -static           do not do any dynamic linking of libtool libraries
+-  -static           do not do any dynamic linking of uninstalled libtool libraries
+-  -static-libtool-libs
+-                    do not do any dynamic linking of libtool libraries
 -  -version-info CURRENT[:REVISION[:AGE]]
--		    specify library version info [each variable defaults to 0]
+-                    specify library version info [each variable defaults to 0]
 -
 -All other options (arguments beginning with \`-') are ignored.
 -
@@ -33089,7 +33771,8 @@
 -uninstall)
 -  $echo \
 -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
--
++exit $exit_status
+ 
 -Remove libraries from an installation directory.
 -
 -RM is the name of the program to use to delete files associated with each FILE
@@ -33099,27 +33782,32 @@
 -If FILE is a libtool library, all the files associated with it are deleted.
 -Otherwise, only FILE itself is deleted using RM."
 -  ;;
-+exit $exit_status
- 
+-
 -*)
 -  $echo "$modename: invalid operation mode \`$mode'" 1>&2
 -  $echo "$help" 1>&2
--  exit 1
+-  exit $EXIT_FAILURE
 -  ;;
 -esac
 -
 -$echo
 -$echo "Try \`$modename --help' for more information about other modes."
 -
--exit 0
+-exit $?
  
  # The TAGs below are defined such that we never get into a situation
  # in which we disable both kinds of libraries.  Given conflicting
-@@ -6393,10 +8402,12 @@
+@@ -6898,14 +9626,17 @@
+ # configuration.  But we'll never go from static-only to shared-only.
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-disable_libs=shared
++build_libtool_libs=no
++build_old_libs=yes
  # ### END LIBTOOL TAG CONFIG: disable-shared
  
  # ### BEGIN LIBTOOL TAG CONFIG: disable-static
--build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+-disable_libs=static
 +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
  # ### END LIBTOOL TAG CONFIG: disable-static
  
@@ -33129,18 +33817,18 @@
  # End:
 +# vi:sw=2
 +
-Index: blcr-0.8.2/config/missing
+Index: blcr-0.8.4/config/missing
 ===================================================================
---- blcr-0.8.2.orig/config/missing	2010-10-12 10:44:38.000000000 +0100
-+++ blcr-0.8.2/config/missing	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/config/missing	2011-10-11 23:58:52.000000000 +0100
++++ blcr-0.8.4/config/missing	2011-10-12 13:18:42.000000000 +0100
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
  
--scriptversion=2003-09-02.23
+-scriptversion=2005-06-08.21
 +scriptversion=2009-04-28.21; # UTC
  
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 -#   Free Software Foundation, Inc.
 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
 +# 2008, 2009 Free Software Foundation, Inc.
@@ -33152,8 +33840,8 @@
  
  # You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+-# 02110-1301, USA.
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # As a special exception to the GNU General Public License, if you
@@ -33176,19 +33864,7 @@
  --run)
    # Try to run requested program, and just exit if it succeeds.
    run=
-@@ -60,11 +60,6 @@
-     msg="probably too old"
-   fi
-   ;;
--esac
--
--# If it does not exist, or fails to run (possibly an outdated version),
--# try to emulate it.
--case "$1" in
- 
-   -h|--h|--he|--hel|--help)
-     echo "\
-@@ -82,6 +77,7 @@
+@@ -77,6 +77,7 @@
    aclocal      touch file \`aclocal.m4'
    autoconf     touch file \`configure'
    autoheader   touch file \`config.h.in'
@@ -33196,7 +33872,7 @@
    automake     touch all \`Makefile.in' files
    bison        create \`y.tab.[ch]', if possible, from existing .[ch]
    flex         create \`lex.yy.c', if possible, from existing .c
-@@ -91,11 +87,16 @@
+@@ -86,6 +87,9 @@
    tar          try tar, gnutar, gtar, then tar without non-portable flags
    yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
  
@@ -33204,95 +33880,63 @@
 +\`g' are ignored when checking the name.
 +
  Send bug reports to <bug-automake@gnu.org>."
-+    exit $?
+     exit $?
      ;;
+@@ -103,15 +107,22 @@
  
-   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-     echo "missing $scriptversion (GNU Automake)"
-+    exit $?
-     ;;
- 
-   -*)
-@@ -104,12 +105,49 @@
-     exit 1
-     ;;
+ esac
  
--  aclocal*)
-+esac
-+
 +# normalize program name to check for.
 +program=`echo "$1" | sed '
 +  s/^gnu-//; t
 +  s/^gnu//; t
 +  s/^g//; t'`
 +
-+# Now exit if we have it, but it failed.  Also exit now if we
-+# don't have it and --version was passed (most likely to detect
+ # Now exit if we have it, but it failed.  Also exit now if we
+ # don't have it and --version was passed (most likely to detect
+-# the program).
+-case "$1" in
+-  lex|yacc)
 +# the program).  This is about non-GNU programs, so use $1 not
 +# $program.
 +case $1 in
 +  lex*|yacc*)
-+    # Not GNU programs, they don't have --version.
-+    ;;
-+
+     # Not GNU programs, they don't have --version.
+     ;;
+ 
+-  tar)
 +  tar*)
-+    if test -n "$run"; then
-+       echo 1>&2 "ERROR: \`tar' requires --run"
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       exit 1
-+    fi
-+    ;;
-+
-+  *)
-     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-        # We have it, but it failed.
+     if test -n "$run"; then
+        echo 1>&2 "ERROR: \`tar' requires --run"
         exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       # Could not run --version or --help.  This is probably someone
-+       # running `$TOOL --version' or `$TOOL --help' to check whether
-+       # $TOOL exists and not knowing $TOOL uses missing.
-+       exit 1
-     fi
-+    ;;
-+esac
+@@ -135,7 +146,7 @@
  
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case "$1" in
 +case $program in
-+  aclocal*)
+   aclocal*)
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
-          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-@@ -118,12 +156,7 @@
+@@ -145,7 +156,7 @@
      touch aclocal.m4
      ;;
  
 -  autoconf)
--    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--       # We have it, but it failed.
--       exit 1
--    fi
--
 +  autoconf*)
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`${configure_ac}'.  You might want to install the
-@@ -132,12 +165,7 @@
+@@ -154,7 +165,7 @@
      touch configure
      ;;
  
 -  autoheader)
--    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--       # We have it, but it failed.
--       exit 1
--    fi
--
 +  autoheader*)
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-@@ -147,7 +175,7 @@
+@@ -164,7 +175,7 @@
      test -z "$files" && files="config.h"
      touch_files=
      for f in $files; do
@@ -33301,33 +33945,16 @@
        *:*) touch_files="$touch_files "`echo "$f" |
  				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
        *) touch_files="$touch_files $f.in";;
-@@ -157,11 +185,6 @@
-     ;;
- 
-   automake*)
--    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--       # We have it, but it failed.
--       exit 1
--    fi
--
-     echo 1>&2 "\
- WARNING: \`$1' is $msg.  You should only need it if
-          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-@@ -172,12 +195,7 @@
+@@ -184,7 +195,7 @@
  	   while read f; do touch "$f"; done
      ;;
  
 -  autom4te)
--    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--       # We have it, but it failed.
--       exit 1
--    fi
--
 +  autom4te*)
      echo 1>&2 "\
  WARNING: \`$1' is needed, but is $msg.
           You might have modified some files without having the
-@@ -185,8 +203,8 @@
+@@ -192,8 +203,8 @@
           You can get \`$1' as part of \`Autoconf' from any GNU
           archive site."
  
@@ -33338,7 +33965,7 @@
      if test -f "$file"; then
  	touch $file
      else
-@@ -200,90 +218,78 @@
+@@ -207,80 +218,78 @@
      fi
      ;;
  
@@ -33408,11 +34035,6 @@
      ;;
  
 -  help2man)
--    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--       # We have it, but it failed.
--       exit 1
--    fi
--
 +  help2man*)
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
@@ -33438,54 +34060,39 @@
      ;;
  
 -  makeinfo)
--    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
--       # We have makeinfo, but it failed.
--       exit 1
--    fi
--
 +  makeinfo*)
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified a \`.texi' or \`.texinfo' file, or any other file
-@@ -291,20 +297,29 @@
-          call might also be the consequence of using a buggy \`make' (AIX,
+@@ -289,11 +298,17 @@
           DU, IRIX).  You might want to install the \`Texinfo' package or
           the \`GNU make' package.  Grab either from any GNU archive site."
+     # The file to touch is that specified with -o ...
 -    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    # The file to touch is that specified with -o ...
 +    file=`echo "$*" | sed -n "$sed_output"`
 +    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
      if test -z "$file"; then
--      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
--    fi
-+      # ... or it is the one specified with @setfilename ...
-+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+       # ... or it is the one specified with @setfilename ...
+       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
 +      file=`sed -n '
 +	/^@setfilename/{
 +	  s/.* \([^ ]*\) *$/\1/
 +	  p
 +	  q
 +	}' $infile`
-+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-+    fi
-+    # If the file does not exist, the user really needs makeinfo;
-+    # let's fail without touching anything.
-+    test -f $file || exit 1
+       # ... or it is derived from the source name (dir/f.texi becomes f.info)
+       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+     fi
+@@ -303,7 +318,7 @@
      touch $file
      ;;
  
 -  tar)
 +  tar*)
      shift
--    if test -n "$run"; then
--      echo 1>&2 "ERROR: \`tar' requires --run"
--      exit 1
--    fi
  
      # We have already tried tar in the generic part.
-     # Look for gnutar/gtar before invocation to avoid ugly error
 @@ -317,13 +332,13 @@
      fi
      firstarg="$1"
@@ -33510,16 +34117,16 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-Index: blcr-0.8.2/configure
+Index: blcr-0.8.4/configure
 ===================================================================
---- blcr-0.8.2.orig/configure	2010-10-12 10:44:40.000000000 +0100
-+++ blcr-0.8.2/configure	2010-10-12 10:44:11.000000000 +0100
+--- blcr-0.8.4.orig/configure	2011-10-11 23:58:47.000000000 +0100
++++ blcr-0.8.4/configure	2011-10-12 13:18:40.000000000 +0100
 @@ -2,11 +2,16 @@
- # From acinclude.m4 Revision: 1.177.14.2 .
- # From configure.ac Revision: 1.410.2.9 .
+ # From acinclude.m4 Revision: 1.177.14.12 .
+ # From configure.ac Revision: 1.410.2.39 .
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59 for blcr 0.8.2.
-+# Generated by GNU Autoconf 2.67 for blcr 0.8.2.
+-# Generated by GNU Autoconf 2.59 for blcr 0.8.4.
++# Generated by GNU Autoconf 2.68 for blcr 0.8.4.
  #
  # Report bugs to <http://ftg.lbl.gov/checkpoint>.
  #
@@ -33533,7 +34140,7 @@
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
  #
-@@ -33,77 +38,407 @@
+@@ -33,77 +38,423 @@
  #     along with this program; if not, write to the Free Software
  #     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
@@ -33630,6 +34237,7 @@
 +IFS=" ""	$as_nl"
 +
 +# Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
 +case $0 in #((
 +  *[\\/]* ) as_myself=$0 ;;
 +  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -33718,6 +34326,14 @@
 +  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
 +  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
 +  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
++
++  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
++    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
++    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
++    PATH=/empty FPATH=/empty; export PATH FPATH
++    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
++      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
 +test \$(( 1 + 1 )) = 2 || exit 1"
 +  if (eval "$as_required") 2>/dev/null; then :
 +  as_have_required=yes
@@ -33766,11 +34382,18 @@
 +  # We cannot yet assume a decent shell, so we have to provide a
 +	# neutralization value for shells without unset; and this also
 +	# works around shells that cannot unset nonexistent variables.
++	# Preserve -v and -x to the replacement shell.
 +	BASH_ENV=/dev/null
 +	ENV=/dev/null
 +	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 +	export CONFIG_SHELL
-+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++	case $- in # ((((
++	  *v*x* | *x*v* ) as_opts=-vx ;;
++	  *v* ) as_opts=-v ;;
++	  *x* ) as_opts=-x ;;
++	  * ) as_opts= ;;
++	esac
++	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 +fi
 +
 +    if test x$as_have_required = xno; then :
@@ -33980,7 +34603,7 @@
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -111,146 +446,107 @@
+@@ -111,146 +462,107 @@
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
@@ -34200,10 +34823,11 @@
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -259,36 +555,26 @@
+@@ -258,193 +570,28 @@
+ # Sed expression to map a string onto a valid variable name.
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
- 
+-
 -# IFS
 -# We need space, tab and new line, in precisely that order.
 -as_nl='
@@ -34214,77 +34838,59 @@
 -$as_unset CDPATH
 -
 -
- 
- # Check that we are running under the correct shell.
+-
+-# Check that we are running under the correct shell.
  SHELL=${CONFIG_SHELL-/bin/sh}
  
 -case X$ECHO in
-+case X$lt_ECHO in
- X*--fallback-echo)
-   # Remove one level of quotation (which was required for Make).
+-X*--fallback-echo)
+-  # Remove one level of quotation (which was required for Make).
 -  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-   ;;
- esac
- 
+-  ;;
+-esac
+-
 -echo=${ECHO-echo}
-+ECHO=${lt_ECHO-echo}
- if test "X$1" = X--no-reexec; then
-   # Discard the --no-reexec flag, and continue.
-   shift
- elif test "X$1" = X--fallback-echo; then
-   # Avoid inline document here, it may be left over
-   :
+-if test "X$1" = X--no-reexec; then
+-  # Discard the --no-reexec flag, and continue.
+-  shift
+-elif test "X$1" = X--fallback-echo; then
+-  # Avoid inline document here, it may be left over
+-  :
 -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
 -  # Yippee, $echo works!
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-+  # Yippee, $ECHO works!
-   :
- else
-   # Restart under the correct shell.
-@@ -298,153 +584,145 @@
- if test "X$1" = X--fallback-echo; then
-   # used as fallback echo
-   shift
--  cat <<EOF
-+  cat <<_LT_EOF
- $*
--EOF
-+_LT_EOF
-   exit 0
- fi
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
+-  :
+-else
+-  # Restart under the correct shell.
+-  exec $SHELL "$0" --no-reexec ${1+"$@"}
+-fi
+-
+-if test "X$1" = X--fallback-echo; then
+-  # used as fallback echo
+-  shift
+-  cat <<EOF
+-$*
+-EOF
+-  exit 0
+-fi
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
 -if test -z "$ECHO"; then
 -if test "X${echo_test_string+set}" != Xset; then
 -# find a string as large as possible, as long as the shell can cope with it
 -  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
 -    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
+-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+-       echo_test_string=`eval $cmd` &&
 -       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
 -    then
 -      break
 -    fi
 -  done
 -fi
-+if test -z "$lt_ECHO"; then
-+  if test "X${echo_test_string+set}" != Xset; then
-+    # find a string as large as possible, as long as the shell can cope with it
-+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-+      then
-+        break
-+      fi
-+    done
-+  fi
- 
+-
 -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
 -   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
 -   test "X$echo_testing_string" = "X$echo_test_string"; then
@@ -34295,31 +34901,10 @@
 -  #   echo "$something" | sed 's/\\/\\\\/g'
 -  #
 -  # So, first we look for a working echo in the user's PATH.
-+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-+     test "X$echo_testing_string" = "X$echo_test_string"; then
-+    :
-+  else
-+    # The Solaris, AIX, and Digital Unix default echo programs unquote
-+    # backslashes.  This makes it impossible to quote backslashes using
-+    #   echo "$something" | sed 's/\\/\\\\/g'
-+    #
-+    # So, first we look for a working echo in the user's PATH.
- 
+-
 -  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 -  for dir in $PATH /usr/ucb; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for dir in $PATH /usr/ucb; do
-+      IFS="$lt_save_ifs"
-+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+         test "X$echo_testing_string" = "X$echo_test_string"; then
-+        ECHO="$dir/echo"
-+        break
-+      fi
-+    done
-     IFS="$lt_save_ifs"
+-    IFS="$lt_save_ifs"
 -    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
 -       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
 -       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
@@ -34329,7 +34914,7 @@
 -    fi
 -  done
 -  IFS="$lt_save_ifs"
- 
+-
 -  if test "X$echo" = Xecho; then
 -    # We didn't find a better echo, so look for alternatives.
 -    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
@@ -34365,51 +34950,12 @@
 -      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
 -	   test "X$echo_testing_string" = 'X\t' &&
 -	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+    if test "X$ECHO" = Xecho; then
-+      # We didn't find a better echo, so look for alternatives.
-+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-+         test "X$echo_testing_string" = "X$echo_test_string"; then
-+        # This shell has a builtin print -r that does the trick.
-+        ECHO='print -r'
-+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-+        # If we have ksh, try running configure again with it.
-+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+        export ORIGINAL_CONFIG_SHELL
-+        CONFIG_SHELL=/bin/ksh
-+        export CONFIG_SHELL
-+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-+      else
-+        # Try using printf.
-+        ECHO='printf %s\n'
-+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- 	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
 -	echo="$CONFIG_SHELL $0 --fallback-echo"
 -      else
 -	# maybe with a smaller string...
 -	prev=:
-+	  # Cool, printf works
-+	  :
-+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	     test "X$echo_testing_string" = 'X\t' &&
-+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	     test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	  export CONFIG_SHELL
-+	  SHELL="$CONFIG_SHELL"
-+	  export SHELL
-+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	     test "X$echo_testing_string" = 'X\t' &&
-+	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	     test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-+        else
-+	  # maybe with a smaller string...
-+	  prev=:
- 
+-
 -	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
 -	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
 -	  then
@@ -34417,14 +34963,7 @@
 -	  fi
 -	  prev="$cmd"
 -	done
-+	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-+	    then
-+	      break
-+	    fi
-+	    prev="$cmd"
-+	  done
- 
+-
 -	if test "$prev" != 'sed 50q "$0"'; then
 -	  echo_test_string=`eval $prev`
 -	  export echo_test_string
@@ -34433,34 +34972,22 @@
 -	  # Oops.  We lost completely, so just stick with echo.
 -	  echo=echo
 -	fi
-+	  if test "$prev" != 'sed 50q "$0"'; then
-+	    echo_test_string=`eval $prev`
-+	    export echo_test_string
-+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+	  else
-+	    # Oops.  We lost completely, so just stick with echo.
-+	    ECHO=echo
-+	  fi
-+        fi
-       fi
-     fi
-   fi
- fi
+-      fi
+-    fi
+-  fi
 -fi
- 
- # Copy echo and quote the copy suitably for passing to libtool from
- # the Makefile, instead of quoting the original, which is used later.
+-fi
+-
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
 -ECHO=$echo
 -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
 -   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-+lt_ECHO=$ECHO
-+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
- fi
- 
- 
- 
+-fi
+-
+-
  
+-
 -tagnames=${tagnames+${tagnames},}CXX
 -
 -tagnames=${tagnames+${tagnames},}F77
@@ -34495,9 +35022,9 @@
  
  # Identity of this package.
  PACKAGE_NAME='blcr'
-@@ -452,51 +730,321 @@
- PACKAGE_VERSION='0.8.2'
- PACKAGE_STRING='blcr 0.8.2'
+@@ -452,51 +599,324 @@
+ PACKAGE_VERSION='0.8.4'
+ PACKAGE_STRING='blcr 0.8.4'
  PACKAGE_BUGREPORT='http://ftg.lbl.gov/checkpoint'
 +PACKAGE_URL=''
  
@@ -34551,7 +35078,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CR_RELEASE_MAJOR CR_RELEASE_MINOR CR_RELEASE_PATCH CR_RELEASE_VERSION LIBCR_MAJOR LIBCR_MINOR LIBCR_PATCH LIBCR_VERSION CR_MODULE_MAJOR CR_MODULE_MINOR CR_MODULE_PATCH CR_MODULE_VERSION LIBTOOL_INTERFACE LIBTOOL_AGE LIBTOOL_REVISION CONFIGURE_ARGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot PWD_PROG TOP_BUILDDIR TOP_SRCDIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os CR_ARCH CR_CPU CRI_DEBUG_TRUE CRI_DEBUG_FALSE CR_NDEBUG LIBCR_TRACING_TRUE LIBCR_TRACING_FALSE CR_KERNEL_TRACING_TRUE CR_KERNEL_TRACING_FALSE CR_BUILD_ETC_TRUE CR_BUILD_ETC_FALSE CR_INSTALLED_LIBCR_TRUE CR_INSTALLED_LIBCR_FALSE CR_INSTALLED_UTIL_TRUE CR_INSTALLED_UTIL_FALSE CR_BUILD_TESTSUITE_TRUE CR_BUILD_TESTSUITE_FALSE PERL MAKE RPMBUILD KCC RANLIB ac_ct_RANLIB LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP ECHO AR ac_ct_AR CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CR_ENABLE_STATIC_TRUE CR_ENABLE_STATIC_FALSE CR_ENABLE_SHARED_TRUE CR_ENABLE_SHARED_FALSE HAVE_RPMBUILD_TRUE HAVE_RPMBUILD_FALSE CR_LIBCR_CFLAGS CR_CLIENT_LDADD CR_FTB_INCLUDES CR_FTB_LDFLAGS CR_FTB_LDADD CR_SIGNUM CR_LIBARCH CR_BUILD_LIBCR32_TRUE CR_BUILD_LIBCR32_FALSE NM LINUX_SRC LINUX_OBJ LINUX_VER CR_KERNEL CR_KERNEL_BASE CR_MODULE_DIR KBUILD_MAKE_ARGS LINUX_SYMTAB_FILE LINUX_SYMTAB_CMD LINUX_SYMTAB_CONF CR_HAVE_SYSTEM_MAP_TRUE CR_HAVE_SYSTEM_MAP_FALSE CR_BUILD_MAN_TRUE CR_BUILD_MAN_FALSE CR_HAVE_FTB_TRUE CR_HAVE_FTB_FALSE CR_HAVE_CXX_TRUE CR_HAVE_CXX_FALSE GMAKE_IFEQ GMAKE_IFNEQ GMAKE_ELSE GMAKE_ENDIF KBUILD_MAK BUILD_CR_INFO_TRUE BUILD_CR_INFO_FALSE BUILD_VMADLIB_TRUE BUILD_VMADLIB_FALSE CR_BUILD_MODULES_TRUE CR_BUILD_MODULES_FALSE CR_BUILD_UTIL_TRUE CR_BUILD_UTIL_FALSE CR_BUILD_LIBCR_TRUE CR_BUILD_LIBCR_FALSE CR_BUILD_INCLUDE_TRUE CR_BUILD_INCLUDE_FALSE CR_BUILD_TESTS_TRUE CR_BUILD_TESTS_FALSE CR_BUILD_EXAMPLES_TRUE CR_BUILD_EXAMPLES_FALSE CR_BUILD_CONTRIB_TRUE CR_BUILD_CONTRIB_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CR_RELEASE_MAJOR CR_RELEASE_MINOR CR_RELEASE_PATCH CR_RELEASE_VERSION LIBCR_MAJOR LIBCR_MINOR LIBCR_PATCH LIBCR_VERSION CR_MODULE_MAJOR CR_MODULE_MINOR CR_MODULE_PATCH CR_MODULE_VERSION LIBTOOL_INTERFACE LIBTOOL_AGE LIBTOOL_REVISION CONFIGURE_ARGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar PWD_PROG TOP_BUILDDIR TOP_SRCDIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os CR_ARCH CR_CPU CRI_DEBUG_TRUE CRI_DEBUG_FALSE CR_NDEBUG LIBCR_TRACING_TRUE LIBCR_TRACING_FALSE CR_KERNEL_TRACING_TRUE CR_KERNEL_TRACING_FALSE CR_BUILD_ETC_TRUE CR_BUILD_ETC_FALSE CR_INSTALLED_LIBCR_TRUE CR_INSTALLED_LIBCR_FALSE CR_INSTALLED_UTIL_TRUE CR_INSTALLED_UTIL_FALSE CR_BUILD_TESTSUITE_TRUE CR_BUILD_TESTSUITE_FALSE PERL MAKE RPMBUILD KCC RANLIB ac_ct_RANLIB LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP ECHO AR ac_ct_AR CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CR_ENABLE_STATIC_TRUE CR_ENABLE_STATIC_FALSE CR_ENABLE_SHARED_TRUE CR_ENABLE_SHARED_FALSE HAVE_RPMBUILD_TRUE HAVE_RPMBUILD_FALSE CR_LIBCR_CFLAGS CR_CLIENT_LDADD CR_FTB_INCLUDES CR_FTB_LDFLAGS CR_FTB_LDADD CR_SIGNUM CR_LIBARCH CR_BUILD_LIBCR32_TRUE CR_BUILD_LIBCR32_FALSE NM LINUX_SRC LINUX_OBJ LINUX_VER CR_KERNEL CR_KERNEL_BASE CR_MODULE_DIR LINUX_SYMTAB_FILE LINUX_SYMTAB_CMD LINUX_SYMTAB_CONF CR_KARCH KBUILD_MAKE_ARGS CR_HAVE_SYSTEM_MAP_TRUE CR_HAVE_SYSTEM_MAP_FALSE CR_BUILD_MAN_TRUE CR_BUILD_MAN_FALSE CR_HAVE_FTB_TRUE CR_HAVE_FTB_FALSE CR_HAVE_CXX_TRUE CR_HAVE_CXX_FALSE GMAKE_IFEQ GMAKE_IFNEQ GMAKE_ELSE GMAKE_ENDIF KBUILD_MAK BUILD_CR_INFO_TRUE BUILD_CR_INFO_FALSE BUILD_VMADLIB_TRUE BUILD_VMADLIB_FALSE CR_BUILD_MODULES_TRUE CR_BUILD_MODULES_FALSE CR_BUILD_UTIL_TRUE CR_BUILD_UTIL_FALSE CR_BUILD_LIBCR_TRUE CR_BUILD_LIBCR_FALSE CR_BUILD_INCLUDE_TRUE CR_BUILD_INCLUDE_FALSE CR_BUILD_TESTS_TRUE CR_BUILD_TESTS_FALSE CR_BUILD_EXAMPLES_TRUE CR_BUILD_EXAMPLES_FALSE CR_BUILD_CONTRIB_TRUE CR_BUILD_CONTRIB_FALSE LIBOBJS LTLIBOBJS'
 -ac_subst_files='CR_KSYM_IMPORT_DECLS CR_KSYM_IMPORT_CALLS'
 +ac_subst_vars='am__EXEEXT_FALSE
 +am__EXEEXT_TRUE
@@ -34588,11 +35115,11 @@
 +CR_BUILD_MAN_TRUE
 +CR_HAVE_SYSTEM_MAP_FALSE
 +CR_HAVE_SYSTEM_MAP_TRUE
++KBUILD_MAKE_ARGS
 +CR_KARCH
 +LINUX_SYMTAB_CONF
 +LINUX_SYMTAB_CMD
 +LINUX_SYMTAB_FILE
-+KBUILD_MAKE_ARGS
 +CR_MODULE_DIR
 +CR_KERNEL_BASE
 +CR_KERNEL
@@ -34627,8 +35154,10 @@
 +LIPO
 +NMEDIT
 +DSYMUTIL
-+lt_ECHO
++MANIFEST_TOOL
++ac_ct_AR
 +AR
++DLLTOOL
 +OBJDUMP
 +NM
 +ac_ct_DUMPBIN
@@ -34803,6 +35332,7 @@
 +enable_fast_install
 +enable_dependency_tracking
 +with_gnu_ld
++with_sysroot
 +enable_libtool_lock
 +'
 +      ac_precious_vars='build_alias
@@ -34832,7 +35362,7 @@
  # The variables have the same names as the options, with
  # dashes changed to underlines.
  cache_file=/dev/null
-@@ -519,34 +1067,49 @@
+@@ -519,34 +939,49 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -34889,7 +35419,7 @@
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -568,33 +1131,59 @@
+@@ -568,33 +1003,59 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -34967,7 +35497,7 @@
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -621,6 +1210,12 @@
+@@ -621,6 +1082,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -34980,7 +35510,7 @@
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -645,13 +1240,16 @@
+@@ -645,13 +1112,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -35001,7 +35531,7 @@
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -716,6 +1314,16 @@
+@@ -716,6 +1186,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -35018,7 +35548,7 @@
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -766,26 +1374,36 @@
+@@ -766,26 +1246,36 @@
      ac_init_version=: ;;
  
    -with-* | --with-*)
@@ -35070,7 +35600,7 @@
  
    --x)
      # Obsolete; use --with-x.
-@@ -805,26 +1423,25 @@
+@@ -805,27 +1295,26 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -35102,11 +35632,13 @@
 +    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 -      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
 +      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
      ;;
  
-@@ -833,31 +1450,36 @@
+   esac
+@@ -833,31 +1322,36 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -35161,7 +35693,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -871,8 +1493,8 @@
+@@ -871,8 +1365,8 @@
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
@@ -35172,7 +35704,7 @@
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
    fi
-@@ -884,110 +1506,72 @@
+@@ -884,110 +1378,72 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -35340,7 +35872,7 @@
  
  #
  # Report the --help message.
-@@ -1010,20 +1594,17 @@
+@@ -1010,20 +1466,17 @@
        --help=short        display options specific to this package
        --help=recursive    display the short help of all the included packages
    -V, --version           display version information and exit
@@ -35364,7 +35896,7 @@
  
  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -1033,18 +1614,25 @@
+@@ -1033,18 +1486,25 @@
  For better control, use the options below.
  
  Fine tuning of the installation directories:
@@ -35402,7 +35934,7 @@
  _ACEOF
  
    cat <<\_ACEOF
-@@ -1067,8 +1655,11 @@
+@@ -1067,8 +1527,11 @@
    cat <<\_ACEOF
  
  Optional Features:
@@ -35414,7 +35946,7 @@
    --enable-config-report  enable report at the conclusion of the configure
                            script (default is yes)
    --enable-kbuild-verbose enable verbose output from the kbuild facility.
-@@ -1092,10 +1683,8 @@
+@@ -1092,10 +1555,8 @@
                            examples) with -static flag (default is no)
    --enable-cr-info        build cr_info utility (default is no, because this
                            is currently broken)
@@ -35427,7 +35959,7 @@
    --enable-fast-install[=PKGS]
                            optimize for fast installation [default=yes]
    --disable-dependency-tracking  speeds up one-time build
-@@ -1133,11 +1722,9 @@
+@@ -1133,11 +1594,11 @@
                            (default /usr/local/ftb)
    --with-bug2524          request that blcr use a work around for bug 2524
                            (ppc specific)
@@ -35437,10 +35969,12 @@
 -  --with-tags[=TAGS]
 -                          include additional configurations [automatic]
 +  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
++  --with-sysroot=DIR Search for dependent libraries within DIR
++                        (or the compiler's sysroot if not specified).
  
  Some influential environment variables:
    PERL        perl interpreter (required: for configure, build and testsuite)
-@@ -1148,118 +1735,84 @@
+@@ -1148,118 +1609,84 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -35598,16 +36132,16 @@
 +test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- blcr configure 0.8.2
+ blcr configure 0.8.4
 -generated by GNU Autoconf 2.59
-+generated by GNU Autoconf 2.67
++generated by GNU Autoconf 2.68
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  
-@@ -1287,19 +1840,583 @@
+@@ -1287,19 +1714,583 @@
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
  _ACEOF
@@ -35654,7 +36188,7 @@
 +
 +	ac_retval=1
 +fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_compile
@@ -35700,7 +36234,7 @@
 +  # interfere with the next link command; also delete a directory that is
 +  # left behind by Apple's compiler.  We do this before executing the actions.
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_link
@@ -35714,7 +36248,7 @@
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
-+if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -35732,7 +36266,7 @@
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_c_check_header_compile
 +
@@ -35768,7 +36302,7 @@
 +
 +    ac_retval=1
 +fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_cpp
@@ -35810,7 +36344,7 @@
 +       ac_retval=$ac_status
 +fi
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_run
@@ -35823,7 +36357,7 @@
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
-+if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -35878,7 +36412,7 @@
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_c_check_func
 +
@@ -35915,7 +36449,7 @@
 +
 +	ac_retval=1
 +fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_compile
@@ -35952,7 +36486,7 @@
 +
 +    ac_retval=1
 +fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_cpp
@@ -35998,7 +36532,7 @@
 +  # interfere with the next link command; also delete a directory that is
 +  # left behind by Apple's compiler.  We do this before executing the actions.
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_link
@@ -36176,7 +36710,7 @@
 +rm -f conftest.val
 +
 +  fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_compute_int
@@ -36184,9 +36718,9 @@
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by blcr $as_me 0.8.2, which was
+ It was created by blcr $as_me 0.8.4, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.67.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
  
    $ $0 $@
  
@@ -36195,7 +36729,7 @@
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1318,7 +2435,7 @@
+@@ -1318,7 +2309,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -36204,7 +36738,7 @@
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1330,8 +2447,9 @@
+@@ -1330,8 +2321,9 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36216,7 +36750,7 @@
  
  } >&5
  
-@@ -1353,7 +2471,6 @@
+@@ -1353,7 +2345,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -36224,7 +36758,7 @@
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1364,13 +2481,13 @@
+@@ -1364,13 +2355,13 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -36242,7 +36776,7 @@
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1386,104 +2503,115 @@
+@@ -1386,104 +2377,115 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -36406,7 +36940,7 @@
  
  # Predefined preprocessor variables.
  
-@@ -1491,112 +2619,137 @@
+@@ -1491,112 +2493,137 @@
  #define PACKAGE_NAME "$PACKAGE_NAME"
  _ACEOF
  
@@ -36476,7 +37010,7 @@
 +      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "failed to load site script $ac_site_file
-+See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details" "$LINENO" 5; }
    fi
  done
  
@@ -36593,7 +37127,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -1606,31 +2759,6 @@
+@@ -1606,46 +2633,21 @@
  
  
  
@@ -36622,10 +37156,40 @@
 -
 -
 -
- # 2. Library version:
- # -------------------
- # Determines which versions of the library are compatible with one another.
-@@ -1700,31 +2828,36 @@
+-# 2. Library version:
+-# -------------------
+-# Determines which versions of the library are compatible with one another.
+-#
+-# 'major' number: increment if backward-compatibility has just been broken
+-#       - set MINOR and PATCH to 0 whenever MAJOR is incremented.
+-# 'minor' number: increment if added new feature, but still backward-compatible
+-#       - set PATCH to 0 whenever MINOR incremented.
+-# 'patch' number:  increment if changes are bug fixes, not interface changes.
+-#
+-# Note: automake doesn't detect changes to the interface number, so you need to
+-#       'make clean' and rebuild everything to see the new library names.
+-LIBCR_MAJOR=0
+-LIBCR_MINOR=5
+-LIBCR_PATCH=3
++# 2. Library version:
++# -------------------
++# Determines which versions of the library are compatible with one another.
++#
++# 'major' number: increment if backward-compatibility has just been broken
++#       - set MINOR and PATCH to 0 whenever MAJOR is incremented.
++# 'minor' number: increment if added new feature, but still backward-compatible
++#       - set PATCH to 0 whenever MINOR incremented.
++# 'patch' number:  increment if changes are bug fixes, not interface changes.
++#
++# Note: automake doesn't detect changes to the interface number, so you need to
++#       'make clean' and rebuild everything to see the new library names.
++LIBCR_MAJOR=0
++LIBCR_MINOR=5
++LIBCR_PATCH=3
+ 
+ # 3. Kernel module version
+ # ------------------------
+@@ -1700,31 +2702,36 @@
  ### rest of init setup
  
  ac_aux_dir=
@@ -36670,11 +37234,11 @@
 +
 +am__api_version='1.11'
  
--am__api_version="1.8"
+-am__api_version="1.9"
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
  # incompatible versions:
-@@ -1738,22 +2871,23 @@
+@@ -1738,22 +2745,23 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -36686,7 +37250,7 @@
  if test -z "$INSTALL"; then
 -if test "${ac_cv_path_install+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test "${ac_cv_path_install+set}" = set; then :
++if ${ac_cv_path_install+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -36706,7 +37270,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -1761,7 +2895,7 @@
+@@ -1761,7 +2769,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -36715,7 +37279,7 @@
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -1771,30 +2905,43 @@
+@@ -1771,30 +2779,43 @@
  	    # program-specific install script used by HP pwplus--don't use.
  	    :
  	  else
@@ -36767,7 +37331,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -1804,21 +2951,34 @@
+@@ -1804,21 +2825,34 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -36784,11 +37348,11 @@
 +'
 +case `pwd` in
 +  *[\\\"\#\$\&\'\`$am_lf]*)
-+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
++    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 +esac
 +case $srcdir in
 +  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
++    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 +esac
 +
  # Do `set' in a subshell so we don't clobber the current shell's
@@ -36806,7 +37370,7 @@
     fi
     rm -f conftest.file
     if test "$*" != "X $srcdir/configure conftest.file" \
-@@ -1828,11 +2988,8 @@
+@@ -1828,11 +2862,8 @@
        # if, for instance, CONFIG_SHELL is bash and it inherits a
        # broken ls alias from the environment.  This has actually
        # happened.  Such a system could not be considered "sane".
@@ -36820,7 +37384,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -1841,73 +2998,206 @@
+@@ -1841,81 +2872,206 @@
     # Ok.
     :
  else
@@ -36858,8 +37422,6 @@
  am_aux_dir=`cd $ac_aux_dir && pwd`
  
 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
--# Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
 +if test x"${MISSING+set}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
@@ -36868,8 +37430,8 @@
 +    MISSING="\${SHELL} $am_aux_dir/missing" ;;
 +  esac
 +fi
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
@@ -36880,13 +37442,21 @@
  fi
  
 -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # Keeping the `.' argument allows $(mkdir_p) to be used without
--  # argument.  Indeed, we sometimes output rules like
+-  # We used to keeping the `.' as first argument, in order to
+-  # allow $(mkdir_p) to be used without argument.  As in
 -  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.
--  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
--  # expensive solution, as it forces Make to start a sub-shell.)
--  mkdir_p='mkdir -p -- .'
+-  # where $(somedir) is conditionally defined.  However this is wrong
+-  # for two reasons:
+-  #  1. if the package is installed by a user who cannot write `.'
+-  #     make install will fail,
+-  #  2. the above comment should most certainly read
+-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+-  #     so it does not work when $(somedir) is undefined and
+-  #     $(DESTDIR) is not.
+-  #  To support the latter case, we have to write
+-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+-  #  so the `.' trick is pointless.
+-  mkdir_p='mkdir -p --'
 -else
 -  # On NextStep and OpenStep, the `mkdir' command does not
 -  # recognize any option.  It will interpret all options as
@@ -36914,7 +37484,7 @@
 +set dummy ${ac_tool_prefix}strip; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_STRIP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$STRIP"; then
@@ -36954,7 +37524,7 @@
 +set dummy strip; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_STRIP"; then
@@ -37007,7 +37577,7 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 +if test -z "$MKDIR_P"; then
-+  if test "${ac_cv_path_mkdir+set}" = set; then :
++  if ${ac_cv_path_mkdir+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -37066,12 +37636,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then :
++if ${ac_cv_prog_AWK+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
    ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -1917,55 +3207,59 @@
+@@ -1925,55 +3081,59 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -37117,7 +37687,7 @@
 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 +set x ${MAKE-make}
 +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
@@ -37157,7 +37727,7 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -1978,12 +3272,14 @@
+@@ -1986,12 +3146,14 @@
  fi
  rmdir .tst 2>/dev/null
  
@@ -37178,20 +37748,12 @@
  fi
  
  # test whether we have cygpath
-@@ -2026,102 +3322,40 @@
+@@ -2034,106 +3196,40 @@
  
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
- 
- AMTAR=${AMTAR-"${am_missing_run}tar"}
- 
 -install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
- 
+-
 -# Installed binaries are usually stripped using `strip' when the user
 -# run `make install-strip'.  However `strip' might not be the right
 -# tool to use in cross-compilation environments, therefore Automake
@@ -37221,6 +37783,9 @@
 -  fi
 -done
 -done
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++# Always define AMTAR for backward compatibility.
  
 -fi
 -fi
@@ -37232,6 +37797,7 @@
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 -fi
++AMTAR=${AMTAR-"${am_missing_run}tar"}
  
 -fi
 -if test -z "$ac_cv_prog_STRIP"; then
@@ -37259,6 +37825,7 @@
 -  fi
 -done
 -done
++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
  
 -  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 -fi
@@ -37273,16 +37840,29 @@
 -fi
  
 -  STRIP=$ac_ct_STRIP
-+
+-else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
+ 
+-fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+ 
+-# We need awk for the "check" target.  The system "awk" is bad on
+-# some platforms.
+-# Always define AMTAR for backward compatibility.
+ 
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
+ 
+-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+ 
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5
 +$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; }
 +    # Check whether --enable-maintainer-mode was given.
 +if test "${enable_maintainer_mode+set}" = set; then :
 +  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
- else
--  STRIP="$ac_cv_prog_STRIP"
++else
 +  USE_MAINTAINER_MODE=yes
- fi
++fi
  
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
 +$as_echo "$USE_MAINTAINER_MODE" >&6; }
@@ -37292,17 +37872,13 @@
 +else
 +  MAINTAINER_MODE_TRUE='#'
 +  MAINTAINER_MODE_FALSE=
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
--
--# We need awk for the "check" target.  The system "awk" is bad on
--# some platforms.
++fi
  
 +  MAINT=$MAINTAINER_MODE_TRUE
  
  
  
-@@ -2133,17 +3367,16 @@
+@@ -2145,17 +3241,16 @@
  
  
  
@@ -37319,12 +37895,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PWD_PROG+set}" = set; then :
++if ${ac_cv_path_PWD_PROG+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    case $PWD_PROG in
    [\\/]* | ?:[\\/]*)
-@@ -2155,29 +3388,30 @@
+@@ -2167,29 +3262,30 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -37364,7 +37940,7 @@
  TOP_BUILDDIR=`${PWD_PROG}`
  
  TOP_SRCDIR=`cd $srcdir && $PWD_PROG`
-@@ -2188,16 +3422,14 @@
+@@ -2200,16 +3296,14 @@
  ################################################################################
  
  
@@ -37382,11 +37958,11 @@
 -      { { echo "$as_me:$LINENO: error: --with-components requires an argument.  Known components are: modules util libcr include tests examples contrib" >&5
 -echo "$as_me: error: --with-components requires an argument.  Known components are: modules util libcr include tests examples contrib" >&2;}
 -   { (exit 1); exit 1; }; };
-+      as_fn_error $? "--with-components requires an argument.  Known components are: modules util libcr include tests examples contrib" "$LINENO" 5 ;
++      as_fn_error $? "--with-components requires an argument.  Known components are: modules util libcr include tests examples contrib" "$LINENO" 5;
        ;;
      x)
        for cr_lcv in modules util libcr include tests examples contrib; do
-@@ -2220,57 +3452,74 @@
+@@ -2232,57 +3326,74 @@
  # Check platform
  ################################################################################
  # Make sure we can run config.sub.
@@ -37419,7 +37995,7 @@
 -echo "${ECHO_T}$ac_cv_build" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 +$as_echo_n "checking build system type... " >&6; }
-+if test "${ac_cv_build+set}" = set; then :
++if ${ac_cv_build+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_build_alias=$build_alias
@@ -37435,7 +38011,7 @@
 +$as_echo "$ac_cv_build" >&6; }
 +case $ac_cv_build in
 +*-*-*) ;;
-+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 +esac
  build=$ac_cv_build
 -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -37470,7 +38046,7 @@
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 +$as_echo_n "checking host system type... " >&6; }
-+if test "${ac_cv_host+set}" = set; then :
++if ${ac_cv_host+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test "x$host_alias" = x; then
@@ -37487,7 +38063,7 @@
 +$as_echo "$ac_cv_host" >&6; }
 +case $ac_cv_host in
 +*-*-*) ;;
-+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 +esac
  host=$ac_cv_host
 -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -37507,7 +38083,7 @@
  
  
  case $host_os in
-@@ -2295,45 +3544,63 @@
+@@ -2307,45 +3418,74 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -37570,14 +38146,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -37592,7 +38180,7 @@
      ;;
  esac
  CR_ARCH=$host_cpu
-@@ -2360,45 +3627,63 @@
+@@ -2372,45 +3512,74 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -37655,14 +38243,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -37677,7 +38277,7 @@
      ;;
    i?86)
      CR_ARCH=i386
-@@ -2406,6 +3691,7 @@
+@@ -2418,6 +3587,7 @@
      ;;
    x86_64)
      CR_ARCH32=i686
@@ -37685,7 +38285,7 @@
      cr_wordsize=8
      ;;
    ppc64|powerpc64)
-@@ -2439,9 +3725,7 @@
+@@ -2451,9 +3621,7 @@
      cr_arch_incomplete=yes
      ;;
    *)
@@ -37696,7 +38296,7 @@
      ;;
  esac
  
-@@ -2452,98 +3736,91 @@
+@@ -2464,98 +3632,91 @@
  
  # Let user specify location of Linux kernel headers and build
  
@@ -37834,7 +38434,7 @@
    CRI_DEBUG_TRUE=
    CRI_DEBUG_FALSE='#'
  else
-@@ -2553,40 +3830,32 @@
+@@ -2565,40 +3726,32 @@
  
  
    if test x$enable_debug = xyes; then
@@ -37883,7 +38483,7 @@
    LIBCR_TRACING_TRUE=
    LIBCR_TRACING_FALSE='#'
  else
-@@ -2596,33 +3865,26 @@
+@@ -2608,33 +3761,26 @@
  
  
    if test x$enable_libcr_tracing = xyes; then
@@ -37924,7 +38524,7 @@
    CR_KERNEL_TRACING_TRUE=
    CR_KERNEL_TRACING_FALSE='#'
  else
-@@ -2632,44 +3894,37 @@
+@@ -2644,44 +3790,37 @@
  
  
    if test x$enable_kernel_tracing = xyes; then
@@ -37981,7 +38581,7 @@
    CR_BUILD_ETC_TRUE=
    CR_BUILD_ETC_FALSE='#'
  else
-@@ -2680,42 +3935,35 @@
+@@ -2692,42 +3831,35 @@
  
  # Check is restoring uid, gid and supplemental groups is requested
  
@@ -38036,7 +38636,7 @@
    CR_INSTALLED_LIBCR_TRUE=
    CR_INSTALLED_LIBCR_FALSE='#'
  else
-@@ -2726,15 +3974,13 @@
+@@ -2738,15 +3870,13 @@
  
  # Let user build/test against already installed utilities
  
@@ -38057,7 +38657,7 @@
    CR_INSTALLED_UTIL_TRUE=
    CR_INSTALLED_UTIL_FALSE='#'
  else
-@@ -2745,26 +3991,24 @@
+@@ -2757,26 +3887,24 @@
  
  # Let user build/run/test against already installed kernel modules
  
@@ -38094,7 +38694,7 @@
    CR_BUILD_TESTSUITE_TRUE=
    CR_BUILD_TESTSUITE_FALSE='#'
  else
-@@ -2775,35 +4019,35 @@
+@@ -2787,35 +3915,35 @@
  
  # Let user request static utils, tests and examples
  
@@ -38145,7 +38745,7 @@
  #XXX: HACK to disable FTB unless explictly requested
  if test x"$cr_force_ftb" != xyes; then FTB_HOME=no; fi
  
-@@ -2811,11 +4055,11 @@
+@@ -2823,11 +3951,11 @@
  # TODO: automate when building both kernel modules and libcr
  if expr $CR_ARCH : ppc >/dev/null; then
  
@@ -38162,7 +38762,7 @@
  fi
  
  ################################################################################
-@@ -2833,10 +4077,10 @@
+@@ -2845,10 +3973,10 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -38172,12 +38772,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PERL+set}" = set; then :
++if ${ac_cv_path_PERL+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    case $PERL in
    [\\/]* | ?:[\\/]*)
-@@ -2848,35 +4092,34 @@
+@@ -2860,35 +3988,34 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -38224,7 +38824,7 @@
  fi
  PERL=$PERL
  
-@@ -2886,10 +4129,10 @@
+@@ -2898,10 +4025,10 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -38234,12 +38834,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_MAKE+set}" = set; then :
++if ${ac_cv_path_MAKE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    case $MAKE in
    [\\/]* | ?:[\\/]*)
-@@ -2901,49 +4144,48 @@
+@@ -2913,49 +4040,48 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -38306,7 +38906,7 @@
  fi
  
  # What language(s) do we need
-@@ -2958,10 +4200,10 @@
+@@ -2970,10 +4096,10 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -38316,12 +38916,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
++if ${ac_cv_prog_RANLIB+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -2971,35 +4213,37 @@
+@@ -2983,35 +4109,37 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -38366,12 +38966,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
    ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -3009,52 +4253,61 @@
+@@ -3021,52 +4149,61 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -38453,7 +39053,7 @@
      case $enableval in
      yes) enable_static=yes ;;
      no) enable_static=no ;;
-@@ -3073,113 +4326,95 @@
+@@ -3085,113 +4222,164 @@
      esac
  else
    enable_static=no
@@ -38505,9 +39105,6 @@
 -      IFS="$lt_save_ifs"
 -      ;;
 -    esac
--else
--  enable_fast_install=yes
--fi;
 +
 +
 +
@@ -38522,8 +39119,8 @@
 +
 +
 +
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
++macro_version='2.4'
++macro_revision='1.3293'
 +
 +
 +
@@ -38538,6 +39135,77 @@
 +
 +
 +ltmain="$ac_aux_dir/ltmain.sh"
++
++# Backslashify metacharacters that are still active within
++# double-quoted strings.
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
++$as_echo_n "checking how to print strings... " >&6; }
++# Test print first, because it will be a builtin if present.
++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
++   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
++  ECHO='print -r --'
++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
++  ECHO='printf %s\n'
+ else
+-  enable_fast_install=yes
+-fi;
++  # Use this function as a fallback that always works.
++  func_fallback_echo ()
++  {
++    eval 'cat <<_LTECHO_EOF
++$1
++_LTECHO_EOF'
++  }
++  ECHO='func_fallback_echo'
++fi
++
++# func_echo_all arg...
++# Invoke $ECHO with all args, space-separated.
++func_echo_all ()
++{
++    $ECHO ""
++}
++
++case "$ECHO" in
++  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
++$as_echo "printf" >&6; } ;;
++  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
++$as_echo "print -r" >&6; } ;;
++  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
++$as_echo "cat" >&6; } ;;
++esac
++
++
++
++
++
++
++
++
++
++
++
++
++
  
  DEPDIR="${am__leading_dot}deps"
  
@@ -38624,7 +39292,7 @@
    AMDEP_TRUE=
    AMDEP_FALSE='#'
  else
-@@ -3188,7 +4423,6 @@
+@@ -3200,7 +4388,6 @@
  fi
  
  
@@ -38632,7 +39300,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3197,10 +4431,10 @@
+@@ -3209,10 +4396,10 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -38642,12 +39310,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3210,35 +4444,37 @@
+@@ -3222,35 +4409,37 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -38692,12 +39360,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3248,39 +4484,50 @@
+@@ -3260,39 +4449,50 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -38758,12 +39426,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3290,77 +4537,37 @@
+@@ -3302,77 +4502,37 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -38850,12 +39518,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3371,18 +4578,19 @@
+@@ -3383,18 +4543,19 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -38879,7 +39547,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -3400,24 +4608,25 @@
+@@ -3412,24 +4573,25 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -38909,12 +39577,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3427,39 +4636,41 @@
+@@ -3439,39 +4601,41 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -38964,12 +39632,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3469,66 +4680,78 @@
+@@ -3481,66 +4645,78 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -39031,7 +39699,7 @@
 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details" "$LINENO" 5; }
  
  # Provide some information about the compiler.
 -echo "$as_me:$LINENO:" \
@@ -39084,7 +39752,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3540,112 +4763,108 @@
+@@ -3552,112 +4728,108 @@
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
@@ -39197,7 +39865,7 @@
 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error 77 "C compiler cannot create executables
-+See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details" "$LINENO" 5; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
@@ -39210,7 +39878,7 @@
  ac_exeext=$ac_cv_exeext
 -echo "$as_me:$LINENO: result: $ac_file" >&5
 -echo "${ECHO_T}$ac_file" >&6
--
+ 
 -# Check the compiler produces executables we can run.  If not, either
 -# the compiler is broken, or we cross compile.
 -echo "$as_me:$LINENO: checking whether the C compiler works" >&5
@@ -39241,7 +39909,7 @@
 -fi
 -echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
- 
+-
 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
@@ -39274,7 +39942,7 @@
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3653,38 +4872,90 @@
+@@ -3665,38 +4837,90 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -39300,7 +39968,7 @@
 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details" "$LINENO" 5; }
 +fi
 +rm -f conftest conftest$ac_cv_exeext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -39368,7 +40036,7 @@
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "cannot run C compiled programs.
 +If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details" "$LINENO" 5; }
 +    fi
 +  fi
 +fi
@@ -39379,14 +40047,14 @@
 +ac_clean_files=$ac_clean_files_save
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 +$as_echo_n "checking for suffix of object files... " >&6; }
-+if test "${ac_cv_objext+set}" = set; then :
++if ${ac_cv_objext+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
-@@ -3696,45 +4967,46 @@
+@@ -3708,45 +4932,46 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -39429,7 +40097,7 @@
 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details" "$LINENO" 5; }
  fi
 -
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -39446,7 +40114,7 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -39458,7 +40126,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3748,55 +5020,34 @@
+@@ -3760,55 +4985,34 @@
    return 0;
  }
  _ACEOF
@@ -39517,7 +40185,7 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -39533,7 +40201,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3807,47 +5058,57 @@
+@@ -3819,39 +5023,49 @@
    return 0;
  }
  _ACEOF
@@ -39577,21 +40245,7 @@
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
- 
--ac_cv_prog_cc_g=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
++
 +else
 +  ac_c_werror_flag=$ac_save_c_werror_flag
 +	 CFLAGS="-g"
@@ -39601,16 +40255,20 @@
 +int
 +main ()
 +{
-+
+ 
+-ac_cv_prog_cc_g=no
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_prog_cc_g=yes
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -39618,18 +40276,10 @@
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 +$as_echo "$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
- else
-   if test "$GCC" = yes; then
-     CFLAGS="-O2"
-@@ -3855,18 +5116,14 @@
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -3867,18 +5081,14 @@
      CFLAGS=
    fi
  fi
@@ -39639,7 +40289,7 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  ac_cv_prog_cc_stdc=no
@@ -39654,7 +40304,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -3894,12 +5151,17 @@
+@@ -3906,12 +5116,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -39674,7 +40324,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -3914,205 +5176,37 @@
+@@ -3926,205 +5141,37 @@
    return 0;
  }
  _ACEOF
@@ -39899,7 +40549,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4121,10 +5215,10 @@
+@@ -4133,10 +5180,10 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -39909,12 +40559,12 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 +$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
    # We make a subdir and do the tests there.  Otherwise we can end up
-@@ -4149,6 +5243,11 @@
+@@ -4161,6 +5208,11 @@
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
    fi
@@ -39926,7 +40576,7 @@
    for depmode in $am_compiler_list; do
      # Setup a source with many dependencies, because some compilers
      # like to wrap large dependency lists on column 80 (with \), and
-@@ -4166,7 +5265,17 @@
+@@ -4178,7 +5230,17 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -39944,7 +40594,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -4176,23 +5285,33 @@
+@@ -4188,18 +5250,23 @@
  	break
        fi
        ;;
@@ -39973,21 +40623,8 @@
 +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
--      # (even with -Werror).  So we grep stderr for any message
--      # that says an option was ignored.
--      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-         am_cv_CC_dependencies_compiler_type=$depmode
-         break
-       fi
-@@ -4206,13 +5325,11 @@
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -4223,13 +5290,11 @@
  fi
  
  fi
@@ -40004,7 +40641,7 @@
    test "x$enable_dependency_tracking" != xno \
    && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
    am__fastdepCC_TRUE=
-@@ -4223,91 +5340,317 @@
+@@ -4240,93 +5305,317 @@
  fi
  
  
@@ -40018,7 +40655,7 @@
 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 +$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-+if test "${ac_cv_path_SED+set}" = set; then :
++if ${ac_cv_path_SED+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -40075,12 +40712,14 @@
      done
    done
 -done
++  done
+ IFS=$as_save_IFS
 -lt_ac_max=0
 -lt_ac_count=0
 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris
 -# along with /bin/sed that truncates output.
 -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && break
+-  test ! -f $lt_ac_sed && continue
 -  cat /dev/null > conftest.in
 -  lt_ac_count=0
 -  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -40088,11 +40727,22 @@
 -  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
 -    lt_cv_path_SED=$lt_ac_sed
 -    break
-+  done
-+IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_SED"; then
 +    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-+  fi
+   fi
+-  while true; do
+-    cat conftest.in conftest.in >conftest.tmp
+-    mv conftest.tmp conftest.in
+-    cp conftest.in conftest.nl
+-    echo >>conftest.nl
+-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+-    cmp -s conftest.out conftest.nl || break
+-    # 10000 chars as input seems more than enough
+-    test $lt_ac_count -gt 10 && break
+-    lt_ac_count=`expr $lt_ac_count + 1`
+-    if test $lt_ac_count -gt $lt_ac_max; then
+-      lt_ac_max=$lt_ac_count
+-      lt_cv_path_SED=$lt_ac_sed
 +else
 +  ac_cv_path_SED=$SED
 +fi
@@ -40118,7 +40768,7 @@
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then :
++if ${ac_cv_path_GREP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -z "$GREP"; then
@@ -40154,10 +40804,11 @@
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_GREP="$ac_path_GREP"
 +      ac_path_GREP_max=$ac_count
-+    fi
+     fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
-+  done
+   done
+-done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
 +
@@ -40168,20 +40819,7 @@
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_GREP"; then
 +    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
--  while true; do
--    cat conftest.in conftest.in >conftest.tmp
--    mv conftest.tmp conftest.in
--    cp conftest.in conftest.nl
--    echo >>conftest.nl
--    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
--    cmp -s conftest.out conftest.nl || break
--    # 10000 chars as input seems more than enough
--    test $lt_ac_count -gt 10 && break
--    lt_ac_count=`expr $lt_ac_count + 1`
--    if test $lt_ac_count -gt $lt_ac_max; then
--      lt_ac_max=$lt_ac_count
--      lt_cv_path_SED=$lt_ac_sed
++  fi
 +else
 +  ac_cv_path_GREP=$GREP
 +fi
@@ -40194,7 +40832,7 @@
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 +$as_echo_n "checking for egrep... " >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then :
++if ${ac_cv_path_EGREP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -40233,15 +40871,13 @@
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_EGREP="$ac_path_EGREP"
 +      ac_path_EGREP_max=$ac_count
-     fi
++    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
-   done
--done
--SED=$lt_cv_path_SED
++  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
-+
+ 
 +      $ac_path_EGREP_found && break 3
 +    done
 +  done
@@ -40252,10 +40888,11 @@
 +  fi
 +else
 +  ac_cv_path_EGREP=$EGREP
-+fi
+ fi
  
+-SED=$lt_cv_path_SED
 +   fi
- fi
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 +$as_echo "$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
@@ -40269,7 +40906,7 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 +$as_echo_n "checking for fgrep... " >&6; }
-+if test "${ac_cv_path_FGREP+set}" = set; then :
++if ${ac_cv_path_FGREP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
@@ -40343,13 +40980,6 @@
 +test -z "$GREP" && GREP=grep
 +
 +
- 
- 
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
 +
 +
 +
@@ -40362,6 +40992,13 @@
 +
 +
 +
+ 
+ 
+ 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
 +
 +
 +# Check whether --with-gnu-ld was given.
@@ -40382,7 +41019,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -4320,9 +5663,9 @@
+@@ -4339,9 +5628,9 @@
      [\\/]* | ?:[\\/]*)
        re_direlt='/[^/][^/]*/\.\./'
        # Canonicalize the pathname of ld
@@ -40395,7 +41032,7 @@
        done
        test -z "$LD" && LD="$ac_prog"
        ;;
-@@ -4336,14 +5679,14 @@
+@@ -4355,14 +5644,14 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -40411,21 +41048,12 @@
  fi
 -if test "${lt_cv_path_LD+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test "${lt_cv_path_LD+set}" = set; then :
++if ${lt_cv_path_LD+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -4353,7 +5696,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -4373,21 +5716,19 @@
+@@ -4392,19 +5681,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -40449,15 +41077,12 @@
 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
++if ${lt_cv_prog_gnu_ld+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
  case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -4397,77 +5738,540 @@
+@@ -4416,40 +5703,22 @@
    ;;
  esac
  fi
@@ -40483,6 +41108,15 @@
 -*) reload_flag=" $reload_flag" ;;
 -esac
 -reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-case $host_os in
+-  darwin*)
+-    if test "$GCC" = yes; then
+-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+-    else
+-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-    fi
+-    ;;
+-esac
  
 -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -40496,88 +41130,39 @@
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-+if test "${lt_cv_path_NM+set}" = set; then :
++if ${lt_cv_path_NM+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
    # Let the user override the test.
-   lt_cv_path_NM="$NM"
- else
--  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
--    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
--      # Check to see if the nm accepts a BSD-compat flag.
--      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
--      #   nm: unknown option "B" ignored
--      # Tru64's nm complains that /dev/null is an invalid object file
--      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
--      */dev/null* | *'Invalid file or object type'*)
--	lt_cv_path_NM="$tmp_nm -B"
--	break
--        ;;
--      *)
--	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
--	*/dev/null*)
--	  lt_cv_path_NM="$tmp_nm -p"
-+  lt_nm_to_check="${ac_tool_prefix}nm"
-+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+    lt_nm_to_check="$lt_nm_to_check nm"
-+  fi
-+  for lt_tmp_nm in $lt_nm_to_check; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+      IFS="$lt_save_ifs"
-+      test -z "$ac_dir" && ac_dir=.
-+      tmp_nm="$ac_dir/$lt_tmp_nm"
-+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+	#   nm: unknown option "B" ignored
-+	# Tru64's nm complains that /dev/null is an invalid object file
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
-+	  lt_cv_path_NM="$tmp_nm -B"
- 	  break
- 	  ;;
- 	*)
--	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
--	  continue # so that we can try to find one that supports BSD flags
-+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+	  */dev/null*)
-+	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
-+	    ;;
-+	  *)
-+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	    continue # so that we can try to find one that supports BSD flags
-+	    ;;
-+	  esac
- 	  ;;
- 	esac
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
-+  done
+@@ -4492,823 +5761,565 @@
+     done
+     IFS="$lt_save_ifs"
+   done
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 +  : ${lt_cv_path_NM=no}
-+fi
-+fi
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6
+-NM="$lt_cv_path_NM"
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 +$as_echo "$lt_cv_path_NM" >&6; }
 +if test "$lt_cv_path_NM" != "no"; then
 +  NM="$lt_cv_path_NM"
 +else
 +  # Didn't find any BSD compatible name lister, look for dumpbin.
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
++  if test -n "$DUMPBIN"; then :
++    # Let the user override the test.
++  else
++    if test -n "$ac_tool_prefix"; then
++  for ac_prog in dumpbin "link -dump"
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
++if ${ac_cv_prog_DUMPBIN+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$DUMPBIN"; then
@@ -40597,31 +41182,55 @@
 +done
 +  done
 +IFS=$as_save_IFS
-+
+ 
+-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
+-if test "${lt_cv_deplibs_check_method+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +fi
 +fi
 +DUMPBIN=$ac_cv_prog_DUMPBIN
 +if test -n "$DUMPBIN"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
 +$as_echo "$DUMPBIN" >&6; }
-+else
+ else
+-  lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given extended regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
-+
-+
+ 
+-case $host_os in
+-aix4* | aix5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +    test -n "$DUMPBIN" && break
 +  done
 +fi
 +if test -z "$DUMPBIN"; then
 +  ac_ct_DUMPBIN=$DUMPBIN
-+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
++  for ac_prog in dumpbin "link -dump"
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
++if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_DUMPBIN"; then
@@ -40641,7 +41250,12 @@
 +done
 +  done
 +IFS=$as_save_IFS
-+
+ 
+-bsdi[45]*)
+-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
 +fi
 +fi
 +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
@@ -40652,11 +41266,25 @@
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
-+
-+
+ 
+-cygwin*)
+-  # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='func_win32_libid'
+-  ;;
+ 
+-mingw* | pw32*)
+-  # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+-  ;;
 +  test -n "$ac_ct_DUMPBIN" && break
 +done
-+
+ 
+-darwin* | rhapsody*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +  if test "x$ac_ct_DUMPBIN" = x; then
 +    DUMPBIN=":"
 +  else
@@ -40669,51 +41297,138 @@
 +    DUMPBIN=$ac_ct_DUMPBIN
 +  fi
 +fi
-+
-+
+ 
+-freebsd* | kfreebsd*-gnu | dragonfly*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case $host_cpu in
+-    i*86 )
+-      # Not sure whether the presence of OpenBSD here was a mistake.
+-      # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+-      lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
++    *COFF*)
++      DUMPBIN="$DUMPBIN -symbols"
++      ;;
++    *)
++      DUMPBIN=:
+       ;;
+     esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+   fi
+-  ;;
+-
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-hpux10.20* | hpux11*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  case $host_cpu in
+-  ia64*)
+-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+-    ;;
+-  hppa*64*)
+-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+-    ;;
+-  *)
+-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+-    ;;
+-  esac
+-  ;;
+-
+-interix3*)
+-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+-  ;;
 +  if test "$DUMPBIN" != ":"; then
 +    NM="$DUMPBIN"
 +  fi
 +fi
 +test -z "$NM" && NM=nm
-+
-+
-+
-+
-+
-+
+ 
+-irix5* | irix6* | nonstopux*)
+-  case $LD in
+-  *-32|*"-32 ") libmagic=32-bit;;
+-  *-n32|*"-n32 ") libmagic=N32;;
+-  *-64|*"-64 ") libmagic=64-bit;;
+-  *) libmagic=never-match;;
+-  esac
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-# This must be Linux ELF.
+-linux*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-netbsd*)
+-  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
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+-  fi
+-  ;;
+ 
+-newos6*)
+-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+-  ;;
+ 
+-nto-qnx*)
+-  lt_cv_deplibs_check_method=unknown
+-  ;;
+ 
+-openbsd*)
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 +$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-+if test "${lt_cv_nm_interface+set}" = set; then :
++if ${lt_cv_nm_interface+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_nm_interface="BSD nm"
 +  echo "int some_variable = 0;" > conftest.$ac_ext
-+  (eval echo "\"\$as_me:5927: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
 +  (eval "$ac_compile" 2>conftest.err)
 +  cat conftest.err >&5
-+  (eval echo "\"\$as_me:5930: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
 +  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
 +  cat conftest.err >&5
-+  (eval echo "\"\$as_me:5933: output\"" >&5)
++  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
 +  cat conftest.out >&5
 +  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
 +    lt_cv_nm_interface="MS dumpbin"
-+  fi
+   fi
+-  ;;
 +  rm -f conftest*
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 +$as_echo "$lt_cv_nm_interface" >&6; }
-+
+ 
+-osf3* | osf4* | osf5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +# find the maximum length of command line arguments
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 +$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
++if ${lt_cv_sys_max_cmd_len+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +    i=0
 +  teststring="ABCD"
-+
+ 
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +  case $build_os in
 +  msdosdjgpp*)
 +    # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -40722,13 +41437,20 @@
 +    # check would be larger than it should be.
 +    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
 +    ;;
-+
+ 
+-sysv4 | sysv4.3*)
+-  case $host_vendor in
+-  motorola)
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
 +  gnu*)
 +    # Under GNU Hurd, this test is not required because there is
 +    # no limit to the length of command line arguments.
 +    # Libtool will interpret -1 as no limit whatsoever
 +    lt_cv_sys_max_cmd_len=-1;
-+    ;;
+     ;;
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
 +
 +  cygwin* | mingw* | cegcc*)
 +    # On Win9x/ME, this test blows up -- it succeeds, but takes
@@ -40739,13 +41461,27 @@
 +    # Instead, let's just punt: use the minimum linelength reported by
 +    # all of the supported platforms: 8192 (on NT/2K/XP).
 +    lt_cv_sys_max_cmd_len=8192;
-+    ;;
+     ;;
+-  sequent)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++
++  mint*)
++    # On MiNT this can take a long time and run out of memory.
++    lt_cv_sys_max_cmd_len=8192;
+     ;;
+-  sni)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+-    lt_cv_file_magic_test_file=/lib/libc.so
 +
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
 +    lt_cv_sys_max_cmd_len=8192;
-+    ;;
+     ;;
+-  siemens)
+-    lt_cv_deplibs_check_method=pass_all
 +
 +  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
 +    # This has been around since 386BSD, at least.  Likely further.
@@ -40759,7 +41495,9 @@
 +    # And add a safety zone
 +    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
 +    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
+     ;;
+-  pc)
+-    lt_cv_deplibs_check_method=pass_all
 +
 +  interix*)
 +    # We know the value 262144 and hardcode it with a safety zone (like BSD)
@@ -40776,8 +41514,8 @@
 +    if test -x /sbin/sysconfig; then
 +      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
 +        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-       esac
-     fi
++      esac
++    fi
 +    ;;
 +  sco3.2v5*)
 +    lt_cv_sys_max_cmd_len=102400
@@ -40805,8 +41543,8 @@
 +      # If test is not a shell built-in, we'll probably end up computing a
 +      # maximum length that is only half of the actual maximum length, but
 +      # we can't tell.
-+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
++      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
++	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 +	      test $i != 17 # 1/2 MB should be enough
 +      do
 +        i=`expr $i + 1`
@@ -40820,25 +41558,41 @@
 +      # linker.  It appears as though 1/2 is a usable value.
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
 +    fi
-+    ;;
-+  esac
-+
+     ;;
+   esac
+-  ;;
+ 
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-esac
 +fi
-+
+ 
 +if test -n $lt_cv_sys_max_cmd_len ; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
 +$as_echo "none" >&6; }
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
 +max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+
-+
-+
-+
-+
+ 
+ 
+ 
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+ 
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
 +: ${CP="cp -f"}
 +: ${MV="mv -f"}
 +: ${RM="rm -f"}
@@ -40848,8 +41602,8 @@
 +# Try some XSI features
 +xsi_shell=no
 +( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,, \
++  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
++      = c,a/b,b/c, \
 +    && eval 'test $(( 1 + 1 )) -eq 2 \
 +    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
 +  && xsi_shell=yes
@@ -40865,385 +41619,16 @@
 +  && lt_shell_append=yes
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
 +$as_echo "$lt_shell_append" >&6; }
-+
-+
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  lt_unset=unset
-+else
-+  lt_unset=false
-+fi
-+
-+
-+
-+
-+
-+# test EBCDIC or ASCII
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  lt_SP2NL='tr \040 \012'
-+  lt_NL2SP='tr \015\012 \040\040'
-+  ;;
-+ *) # EBCDIC based system
-+  lt_SP2NL='tr \100 \n'
-+  lt_NL2SP='tr \r\n \100\100'
-+  ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-+$as_echo_n "checking for $LD option to reload object files... " >&6; }
-+if test "${lt_cv_ld_reload_flag+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-+$as_echo "$lt_cv_ld_reload_flag" >&6; }
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}objdump; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OBJDUMP"; then
-+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-   done
--  IFS="$lt_save_ifs"
--  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+OBJDUMP=$ac_cv_prog_OBJDUMP
-+if test -n "$OBJDUMP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-+$as_echo "$OBJDUMP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_OBJDUMP"; then
-+  ac_ct_OBJDUMP=$OBJDUMP
-+  # Extract the first word of "objdump", so it can be a program name with args.
-+set dummy objdump; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_OBJDUMP"; then
-+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-+if test -n "$ac_ct_OBJDUMP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-+$as_echo "$ac_ct_OBJDUMP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-+
-+  if test "x$ac_ct_OBJDUMP" = x; then
-+    OBJDUMP="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    OBJDUMP=$ac_ct_OBJDUMP
-+  fi
-+else
-+  OBJDUMP="$ac_cv_prog_OBJDUMP"
- fi
--echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6
--NM="$lt_cv_path_NM"
- 
--echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
--echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
--if test "${lt_cv_deplibs_check_method+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-+if test "${lt_cv_deplibs_check_method+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -4484,7 +6288,7 @@
- # whether `pass_all' will *always* work, you probably want this one.
- 
- case $host_os in
--aix4* | aix5*)
-+aix[4-9]*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -4492,22 +6296,34 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-   lt_cv_file_magic_cmd='/usr/bin/file -L'
-   lt_cv_file_magic_test_file=/shlib/libc.so
-   ;;
- 
- cygwin*)
--  # win32_libid is a shell function defined in ltmain.sh
-+  # func_win32_libid is a shell function defined in ltmain.sh
-   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
--  lt_cv_file_magic_cmd='win32_libid'
-+  lt_cv_file_magic_cmd='func_win32_libid'
-   ;;
- 
- mingw* | pw32*)
-   # Base MSYS/MinGW do not provide the 'file' command needed by
--  # win32_libid shell function, so use a weaker test based on 'objdump'.
--  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+  # unless we find 'file', for example because we are cross-compiling.
-+  if ( file / ) >/dev/null 2>&1; then
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_file_magic_cmd='func_win32_libid'
-+  else
-+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+    lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  fi
-+  ;;
-+
-+cegcc)
-+  # use the weaker test based on 'objdump'. See mingw*.
-+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-   lt_cv_file_magic_cmd='$OBJDUMP -f'
-   ;;
- 
-@@ -4515,13 +6331,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
--  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+freebsd* | dragonfly*)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -4537,7 +6353,7 @@
- 
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
-     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -4553,6 +6369,11 @@
-   esac
-   ;;
- 
-+interix[3-9]*)
-+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-+  ;;
-+
- irix5* | irix6* | nonstopux*)
-   case $LD in
-   *-32|*"-32 ") libmagic=32-bit;;
-@@ -4564,21 +6385,12 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
--  case $host_cpu in
--  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64)
--    lt_cv_deplibs_check_method=pass_all ;;
--  *)
--    # glibc up to 2.1.1 does not perform some relocations on ARM
--    # this will be overridden with pass_all, but let us keep it just in case
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
--  esac
--  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
--  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+netbsd* | netbsdelf*-gnu)
-+  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
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-@@ -4591,17 +6403,15 @@
-   lt_cv_file_magic_test_file=/usr/lib/libnls.so
-   ;;
- 
--nto-qnx*)
--  lt_cv_deplibs_check_method=unknown
-+*nto* | *qnx*)
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   fi
-   ;;
- 
-@@ -4609,7 +6419,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--sco3.2v5*)
-+rdos*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -4617,7 +6427,11 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.3*)
-   case $host_vendor in
-   motorola)
-     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -4638,17 +6452,20 @@
-   siemens)
-     lt_cv_deplibs_check_method=pass_all
-     ;;
-+  pc)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-   esac
-   ;;
- 
--sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
-+tpf*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- esac
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-+$as_echo "$lt_cv_deplibs_check_method" >&6; }
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -4656,1840 +6473,382 @@
- 
- 
- 
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
- 
--# Allow CC to be a program name with arguments.
--compiler=$CC
  
  
 -# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
 -if test "${enable_libtool_lock+set}" = set; then
 -  enableval="$enable_libtool_lock"
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  lt_unset=unset
++else
++  lt_unset=false
++fi
  
 -fi;
 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
@@ -41272,7 +41657,7 @@
 -  ;;
 -*-*-irix6*)
 -  # Find out which ABI we are using.
--  echo '#line 4697 "configure"' > conftest.$ac_ext
+-  echo '#line 4728 "configure"' > conftest.$ac_ext
 -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -41306,7 +41691,7 @@
 -  fi
 -  rm -rf conftest*
 -  ;;
--
+ 
 -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
 -  # Find out which ABI we are using.
 -  echo 'int i;' > conftest.$ac_ext
@@ -41315,7 +41700,7 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
--    case "`/usr/bin/file conftest.o`" in
+-    case `/usr/bin/file conftest.o` in
 -    *32-bit*)
 -      case $host in
 -        x86_64-*linux*)
@@ -41352,7 +41737,7 @@
 -  fi
 -  rm -rf conftest*
 -  ;;
--
+ 
 -*-*-sco3.2v5*)
 -  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 -  SAVE_CFLAGS="$CFLAGS"
@@ -41374,6 +41759,18 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
++# test EBCDIC or ASCII
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++  lt_SP2NL='tr \040 \012'
++  lt_NL2SP='tr \015\012 \040\040'
++  ;;
++ *) # EBCDIC based system
++  lt_SP2NL='tr \100 \n'
++  lt_NL2SP='tr \r\n \100\100'
++  ;;
++esac
  
 -int
 -main ()
@@ -41406,17 +41803,10 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  lt_cv_cc_needs_belf=yes
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ar; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -lt_cv_cc_needs_belf=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -41426,7 +41816,7 @@
 -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: $lt_cv_cc_needs_belf" >&5
 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
@@ -41435,12 +41825,32 @@
 -    CFLAGS="$SAVE_CFLAGS"
 -  fi
 -  ;;
--
+-sparc*-*solaris*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-    case `/usr/bin/file conftest.o` in
+-    *64-bit*)
+-      case $lt_cv_prog_gnu_ld in
+-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+-      *)    LD="${LD-ld} -64" ;;
+-      esac
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+ 
+ 
 -esac
--
+ 
 -need_locks="$enable_libtool_lock"
--
--
+ 
+ 
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -41455,17 +41865,13 @@
 -if test -z "$CPP"; then
 -  if test "${ac_cv_prog_CPP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
- else
+-else
 -      # Double quotes because CPP needs to be expanded
 -    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
 -    do
 -      ac_preproc_ok=false
 -for ac_c_preproc_warn_flag in '' yes
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
- do
+-do
 -  # Use a header file that comes with gcc, so configuring glibc
 -  # with a fresh cross-compiler works.
 -  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -41498,31 +41904,56 @@
 -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 -  else
 -    ac_cpp_err=
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AR="${ac_tool_prefix}ar"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-   fi
+-  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 -  :
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
++$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
++if ${lt_cv_to_host_file_cmd+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+done
-+  done
-+IFS=$as_save_IFS
++  case $host in
++  *-*-mingw* )
++    case $build in
++      *-*-mingw* ) # actually msys
++        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
++        ;;
++      *-*-cygwin* )
++        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
++        ;;
++      * ) # otherwise, assume *nix
++        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
++        ;;
++    esac
++    ;;
++  *-*-cygwin* )
++    case $build in
++      *-*-mingw* ) # actually msys
++        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
++        ;;
++      *-*-cygwin* )
++        lt_cv_to_host_file_cmd=func_convert_file_noop
++        ;;
++      * ) # otherwise, assume *nix
++        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
++        ;;
++    esac
++    ;;
++  * ) # unhandled hosts (and "normal" native builds)
++    lt_cv_to_host_file_cmd=func_convert_file_noop
++    ;;
++esac
  
 -  # Broken: fails on valid input.
 -continue
  fi
 -rm -f conftest.err conftest.$ac_ext
--
+ 
 -  # OK, works on sane cases.  Now check whether non-existent headers
 -  # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -41549,59 +41980,43 @@
 -  fi
 -else
 -  ac_cpp_err=yes
- fi
+-fi
 -if test -z "$ac_cpp_err"; then
 -  # Broken: success on invalid input.
 -continue
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++to_host_file_cmd=$lt_cv_to_host_file_cmd
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
++$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+ 
 -  # Passes both tests.
 -ac_preproc_ok=:
 -break
 -fi
 -rm -f conftest.err conftest.$ac_ext
--
+ 
 -done
 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 -rm -f conftest.err conftest.$ac_ext
 -if $ac_preproc_ok; then
 -  break
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
  
 -    done
 -    ac_cv_prog_CPP=$CPP
  
- fi
+-fi
 -  CPP=$ac_cv_prog_CPP
-+if test -z "$ac_cv_prog_AR"; then
-+  ac_ct_AR=$AR
-+  # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  ac_cv_prog_CPP=$CPP
 -fi
 -echo "$as_me:$LINENO: result: $CPP" >&5
 -echo "${ECHO_T}$CPP" >&6
 -ac_preproc_ok=false
 -for ac_c_preproc_warn_flag in '' yes
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
- do
+-do
 -  # Use a header file that comes with gcc, so configuring glibc
 -  # with a fresh cross-compiler works.
 -  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -41634,31 +42049,37 @@
 -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 -  else
 -    ac_cpp_err=
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_AR="ar"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-   fi
+-  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 -  :
--else
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
++if ${lt_cv_to_tool_file_cmd+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+done
-+  done
-+IFS=$as_save_IFS
++  #assume ordinary cross tools, or native build.
++lt_cv_to_tool_file_cmd=func_convert_file_noop
++case $host in
++  *-*-mingw* )
++    case $build in
++      *-*-mingw* ) # actually msys
++        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
++        ;;
++    esac
++    ;;
++esac
  
 -  # Broken: fails on valid input.
 -continue
  fi
 -rm -f conftest.err conftest.$ac_ext
--
+ 
 -  # OK, works on sane cases.  Now check whether non-existent headers
 -  # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -41685,24 +42106,21 @@
 -  fi
 -else
 -  ac_cpp_err=yes
- fi
+-fi
 -if test -z "$ac_cpp_err"; then
 -  # Broken: success on invalid input.
 -continue
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++to_tool_file_cmd=$lt_cv_to_tool_file_cmd
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
++$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+ 
 -  # Passes both tests.
 -ac_preproc_ok=:
 -break
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
 -rm -f conftest.err conftest.$ac_ext
  
 -done
@@ -41710,34 +42128,50 @@
 -rm -f conftest.err conftest.$ac_ext
 -if $ac_preproc_ok; then
 -  :
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AR=$ac_ct_AR
-+  fi
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
++$as_echo_n "checking for $LD option to reload object files... " >&6; }
++if ${lt_cv_ld_reload_flag+:} false; then :
++  $as_echo_n "(cached) " >&6
  else
 -  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
-+  AR="$ac_cv_prog_AR"
++  lt_cv_ld_reload_flag='-r'
  fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
++$as_echo "$lt_cv_ld_reload_flag" >&6; }
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  cygwin* | mingw* | pw32* | cegcc*)
++    if test "$GCC" != yes; then
++      reload_cmds=false
++    fi
++    ;;
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
  
 -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
--
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
+ 
  
 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
@@ -41808,13 +42242,38 @@
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  $EGREP "memchr" >/dev/null 2>&1; then
 -  :
--else
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
++set dummy ${ac_tool_prefix}objdump; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_OBJDUMP+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  ac_cv_header_stdc=no
 -fi
 -rm -f conftest*
++  if test -n "$OBJDUMP"; then
++  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
--fi
- 
+ fi
+-
 -if test $ac_cv_header_stdc = yes; then
 -  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -41824,14 +42283,21 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <stdlib.h>
- 
+-
 -_ACEOF
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  $EGREP "free" >/dev/null 2>&1; then
 -  :
--else
++fi
++OBJDUMP=$ac_cv_prog_OBJDUMP
++if test -n "$OBJDUMP"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
++$as_echo "$OBJDUMP" >&6; }
+ else
 -  ac_cv_header_stdc=no
--fi
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
 -rm -f conftest*
  
 -fi
@@ -41840,12 +42306,14 @@
 -  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 -  if test "$cross_compiling" = yes; then
 -  :
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
++fi
++if test -z "$ac_cv_prog_OBJDUMP"; then
++  ac_ct_OBJDUMP=$OBJDUMP
++  # Extract the first word of "objdump", so it can be a program name with args.
++set dummy objdump; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -41890,8 +42358,8 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  :
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++  if test -n "$ac_ct_OBJDUMP"; then
++  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
  else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
@@ -41903,7 +42371,7 @@
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    ac_cv_prog_ac_ct_OBJDUMP="objdump"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
@@ -41913,38 +42381,52 @@
  
 -( exit $ac_status )
 -ac_cv_header_stdc=no
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 -echo "${ECHO_T}$ac_cv_header_stdc" >&6
 -if test $ac_cv_header_stdc = yes; then
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define STDC_HEADERS 1
 -_ACEOF
- 
- fi
 -
++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
++if test -n "$ac_ct_OBJDUMP"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
++$as_echo "$ac_ct_OBJDUMP" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_OBJDUMP" = x; then
++    OBJDUMP="false"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    OBJDUMP=$ac_ct_OBJDUMP
++  fi
++else
++  OBJDUMP="$ac_cv_prog_OBJDUMP"
+ fi
+ 
 -# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--
--
--
--
--
--
--
--
++test -z "$OBJDUMP" && OBJDUMP=objdump
+ 
+ 
+ 
+@@ -5318,1285 +6329,838 @@
+ 
+ 
+ 
 -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 -		  inttypes.h stdint.h unistd.h
 -do
@@ -41953,13 +42435,9 @@
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
++$as_echo_n "checking how to recognize dependent libraries... " >&6; }
++if ${lt_cv_deplibs_check_method+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -41969,7 +42447,20 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
--
++  lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
+ 
 -#include <$ac_header>
 -_ACEOF
 -rm -f conftest.$ac_objext
@@ -41995,28 +42486,193 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  eval "$as_ac_Header=yes"
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
++case $host_os in
++aix[4-9]*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi[45]*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    # Keep this pattern in sync with the one in func_win32_libid.
++    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
 +  fi
-+done
-+  done
-+IFS=$as_save_IFS
++  ;;
++
++cegcc*)
++  # use the weaker test based on 'objdump'. See mingw*.
++  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | dragonfly*)
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++haiku*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case $host_cpu in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
++
++interix[3-9]*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++netbsd* | netbsdelf*-gnu)
++  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
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++*nto* | *qnx*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++openbsd*)
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.3*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++
++tpf*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++esac
  
 -eval "$as_ac_Header=no"
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
@@ -42025,15 +42681,64 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
--
--fi
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
++$as_echo "$lt_cv_deplibs_check_method" >&6; }
+ 
++file_magic_glob=
++want_nocaseglob=no
++if test "$build" = "$host"; then
++  case $host_os in
++  mingw* | pw32*)
++    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
++      want_nocaseglob=yes
++    else
++      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
++    fi
++    ;;
++  esac
+ fi
+ 
 -done
--
--
--
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
+ 
+ 
+ 
 -for ac_header in dlfcn.h
--do
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dlltool; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_DLLTOOL+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$DLLTOOL"; then
++  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
+ do
 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -42079,21 +42784,63 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_header_compiler=yes
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++DLLTOOL=$ac_cv_prog_DLLTOOL
++if test -n "$DLLTOOL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
++$as_echo "$DLLTOOL" >&6; }
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_header_compiler=no
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
++fi
++
+ 
+-ac_header_compiler=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6
++if test -z "$ac_cv_prog_DLLTOOL"; then
++  ac_ct_DLLTOOL=$DLLTOOL
++  # Extract the first word of "dlltool", so it can be a program name with args.
++set dummy dlltool; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_DLLTOOL"; then
++  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
 -# Is the header present?
 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -42117,27 +42864,56 @@
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-   else
+-  else
 -    ac_cpp_err=
++fi
++fi
++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
++if test -n "$ac_ct_DLLTOOL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
++$as_echo "$ac_ct_DLLTOOL" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_DLLTOOL" = x; then
++    DLLTOOL="false"
++  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
-+    STRIP=$ac_ct_STRIP
++    DLLTOOL=$ac_ct_DLLTOOL
    fi
  else
 -  ac_cpp_err=yes
-+  STRIP="$ac_cv_prog_STRIP"
++  DLLTOOL="$ac_cv_prog_DLLTOOL"
  fi
 -if test -z "$ac_cpp_err"; then
 -  ac_header_preproc=yes
--else
++
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++
++
++
++
++
++
++
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
++$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  lt_cv_sharedlib_from_linklib_cmd='unknown'
  
 -  ac_header_preproc=no
 -fi
@@ -42175,8 +42951,24 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
++case $host_os in
++cygwin* | mingw* | pw32* | cegcc*)
++  # two different shell functions defined in ltmain.sh
++  # decide which to use based on capabilities of $DLLTOOL
++  case `$DLLTOOL --help 2>&1` in
++  *--identify-strict*)
++    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
++    ;;
++  *)
++    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+     ;;
++  esac
++  ;;
++*)
++  # fallback: assume linklib IS sharedlib
++  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
++  ;;
+ esac
 -echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -42186,15 +42978,21 @@
 -fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+test -z "$STRIP" && STRIP=:
-+
-+
  
--fi
+ fi
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
++
++
++
++
++
  
 -fi
  
@@ -42207,24 +43005,23 @@
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  if test -n "$ac_tool_prefix"; then
 -  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
--  do
--    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
--set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
++  for ac_prog in ar
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_CXX+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
++if ${ac_cv_prog_AR+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$CXX"; then
 -  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@ -42237,7 +43034,7 @@
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -42252,10 +43049,10 @@
 -if test -n "$CXX"; then
 -  echo "$as_me:$LINENO: result: $CXX" >&5
 -echo "${ECHO_T}$CXX" >&6
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&6; }
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
++$as_echo "$AR" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
@@ -42264,32 +43061,32 @@
  fi
  
 -    test -n "$CXX" && break
--  done
 +
++    test -n "$AR" && break
+   done
  fi
 -if test -z "$CXX"; then
 -  ac_ct_CXX=$CXX
 -  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
++if test -z "$AR"; then
++  ac_ct_AR=$AR
++  for ac_prog in ar
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  ac_ct_RANLIB=$RANLIB
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++if ${ac_cv_prog_ac_ct_AR+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_CXX"; then
 -  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@ -42302,7 +43099,7 @@
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    ac_cv_prog_ac_ct_AR="$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -42317,10 +43114,10 @@
 -if test -n "$ac_ct_CXX"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 -echo "${ECHO_T}$ac_ct_CXX" >&6
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&6; }
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
@@ -42329,12 +43126,14 @@
  fi
  
 -  test -n "$ac_ct_CXX" && break
--done
++
++  test -n "$ac_ct_AR" && break
+ done
 -test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
--
+ 
 -  CXX=$ac_ct_CXX
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
++  if test "x$ac_ct_AR" = x; then
++    AR="false"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
@@ -42342,13 +43141,17 @@
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
-+    RANLIB=$ac_ct_RANLIB
++    AR=$ac_ct_AR
 +  fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
  fi
  
-+test -z "$RANLIB" && RANLIB=:
++: ${AR=ar}
++: ${AR_FLAGS=cru}
++
++
++
++
++
  
 -# Provide some information about the compiler.
 -echo "$as_me:$LINENO:" \
@@ -42374,29 +43177,44 @@
 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
++$as_echo_n "checking for archiver @FILE support... " >&6; }
++if ${lt_cv_ar_at_file+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  lt_cv_ar_at_file=no
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--int
--main ()
--{
+ int
+ main ()
+ {
 -#ifndef __GNUC__
 -       choke me
 -#endif
  
--  ;
--  return 0;
--}
--_ACEOF
+   ;
+   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=$?
++if ac_fn_c_try_compile "$LINENO"; then :
++  echo conftest.$ac_objext > conftest.lst
++      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
++      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
++  (eval $lt_ar_try) 2>&5
+   ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -42412,20 +43230,35 @@
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++      if test "$ac_status" -eq 0; then
++	# Ensure the archiver fails upon bogus file names.
++	rm -f conftest.$ac_objext libconftest.a
++	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
++  (eval $lt_ar_try) 2>&5
+   ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_compiler_gnu=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++	if test "$ac_status" -ne 0; then
++          lt_cv_ar_at_file=@
++        fi
++      fi
++      rm -f conftest.* libconftest.a
+ 
 -ac_compiler_gnu=no
--fi
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
--
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
 -GXX=`test $ac_compiler_gnu = yes && echo yes`
@@ -42436,18 +43269,25 @@
 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 -if test "${ac_cv_prog_cxx_g+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
++$as_echo "$lt_cv_ar_at_file" >&6; }
++
++if test "x$lt_cv_ar_at_file" = xno; then
++  archiver_list_spec=
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++  archiver_list_spec=$lt_cv_ar_at_file
++fi
+ 
 -int
 -main ()
 -{
--
+ 
 -  ;
 -  return 0;
 -}
@@ -42475,14 +43315,43 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_prog_cxx_g=yes
--else
++
++
++
++
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_STRIP+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -ac_cv_prog_cxx_g=no
--fi
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
 -if test "$ac_test_CXXFLAGS" = set; then
@@ -42493,13 +43362,19 @@
 -  else
 -    CXXFLAGS="-g"
 -  fi
--else
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
+ else
 -  if test "$GXX" = yes; then
 -    CXXFLAGS="-O2"
 -  else
 -    CXXFLAGS=
 -  fi
--fi
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
 -for ac_declaration in \
 -   '' \
 -   'extern "C" void std::exit (int) throw (); using std::exit;' \
@@ -42547,12 +43422,40 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  :
--else
++
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -continue
--fi
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -42592,33 +43495,129 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  break
--else
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
++else
++  STRIP="$ac_cv_prog_STRIP"
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
++
++test -z "$STRIP" && STRIP=:
++
++
++
++
++
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_RANLIB+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
+ done
 -rm -f conftest*
 -if test -n "$ac_declaration"; then
 -  echo '#ifdef __cplusplus' >>confdefs.h
 -  echo $ac_declaration      >>confdefs.h
 -  echo '#endif'             >>confdefs.h
--fi
--
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
++$as_echo "$RANLIB" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
 -ac_ext=cc
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
+ 
 -depcc="$CXX"  am_compiler_list=
--
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
 -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
++$as_echo "$ac_ct_RANLIB" >&6; }
+ else
 -  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
 -  # We make a subdir and do the tests there.  Otherwise we can end up
 -  # making bogus files that we don't know about and never remove.  For
@@ -42637,11 +43636,24 @@
 -  # the current directory while Tru64 will put them in the object
 -  # directory.
 -  mkdir sub
--
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
 -  am_cv_CXX_dependencies_compiler_type=none
 -  if test "$am_compiler_list" = ""; then
 -     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
--  fi
++  if test "x$ac_ct_RANLIB" = x; then
++    RANLIB=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    RANLIB=$ac_ct_RANLIB
+   fi
 -  for depmode in $am_compiler_list; do
 -    # Setup a source with many dependencies, because some compilers
 -    # like to wrap large dependency lists on column 80 (with \), and
@@ -42683,9 +43695,14 @@
 -       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 -       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 -      # icc doesn't choke on unknown options, it will just issue warnings
--      # (even with -Werror).  So we grep stderr for any message
--      # that says an option was ignored.
--      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+-      # or remarks (even with -Werror).  So we grep stderr for any message
+-      # that says an option was ignored or not supported.
+-      # When given -MP, icc 7.0 and 7.1 complain thusly:
+-      #   icc: Command line warning: ignoring option '-M'; no argument required
+-      # The diagnosis changed in icc 8.0:
+-      #   icc: Command line remark: option '-MP' not supported
+-      if (grep 'ignoring option' conftest.err ||
+-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
 -        am_cv_CXX_dependencies_compiler_type=$depmode
 -        break
 -      fi
@@ -42694,17 +43711,19 @@
 -
 -  cd ..
 -  rm -rf conftest.dir
--else
+ else
 -  am_cv_CXX_dependencies_compiler_type=none
--fi
--
++  RANLIB="$ac_cv_prog_RANLIB"
+ fi
+ 
 -fi
 -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
 -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
--
--
--
++test -z "$RANLIB" && RANLIB=:
+ 
+ 
+ 
 -if
 -  test "x$enable_dependency_tracking" != xno \
 -  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
@@ -42714,9 +43733,18 @@
 -  am__fastdepCXX_TRUE='#'
 -  am__fastdepCXX_FALSE=
 -fi
--
--
--ac_ext=cc
+ 
+ 
+ 
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
+ 
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-    (test "X$CXX" != "Xg++"))) ; then
+-  ac_ext=cc
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -42768,7 +43796,17 @@
 -  fi
 -else
 -  ac_cpp_err=yes
--fi
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
++  *)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
 -if test -z "$ac_cpp_err"; then
 -  :
 -else
@@ -42779,6 +43817,12 @@
 -continue
 -fi
 -rm -f conftest.err conftest.$ac_ext
++case $host_os in
++  darwin*)
++    lock_old_archive_extraction=yes ;;
++  *)
++    lock_old_archive_extraction=no ;;
++esac
  
 -  # OK, works on sane cases.  Now check whether non-existent headers
 -  # can be detected and how.
@@ -42813,25 +43857,11 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
  
 -  # Passes both tests.
 -ac_preproc_ok=:
 -break
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
+-fi
 -rm -f conftest.err conftest.$ac_ext
  
 -done
@@ -42960,6 +43990,8 @@
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
+-fi
+ 
  
 -ac_ext=f
 -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
@@ -43053,7 +44085,7 @@
  
  
 -# Provide some information about the compiler.
--echo "$as_me:6264:" \
+-echo "$as_me:6327:" \
 -     "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
@@ -43208,7 +44240,7 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -    i=0
--  testring="ABCD"
+-  teststring="ABCD"
  
 -  case $build_os in
 -  msdosdjgpp*)
@@ -43243,20 +44275,64 @@
 -    lt_cv_sys_max_cmd_len=8192;
 -    ;;
  
-- *)
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+-    # This has been around since 386BSD, at least.  Likely further.
+-    if test -x /sbin/sysctl; then
+-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+-    elif test -x /usr/sbin/sysctl; then
+-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+-    else
+-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+-    fi
+-    # And add a safety zone
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+-    ;;
+ 
+-  interix*)
+-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+-    lt_cv_sys_max_cmd_len=196608
+-    ;;
+ 
+-  osf*)
+-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+-    # nice to cause kernel panics so lets avoid the loop below.
+-    # First set a reasonable default.
+-    lt_cv_sys_max_cmd_len=16384
+-    #
+-    if test -x /sbin/sysconfig; then
+-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+-      esac
+-    fi
+-    ;;
+-  sco3.2v5*)
+-    lt_cv_sys_max_cmd_len=102400
+-    ;;
+-  sysv5* | sco5v6* | sysv4.2uw2*)
+-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+-    if test -n "$kargmax"; then
+-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
+-    else
+-      lt_cv_sys_max_cmd_len=32768
+-    fi
+-    ;;
+-  *)
 -    # If test is not a shell built-in, we'll probably end up computing a
 -    # maximum length that is only half of the actual maximum length, but
 -    # we can't tell.
--    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
--	       = "XX$testring") >/dev/null 2>&1 &&
--	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+-	       = "XX$teststring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 -	    lt_cv_sys_max_cmd_len=$new_result &&
 -	    test $i != 17 # 1/2 MB should be enough
 -    do
 -      i=`expr $i + 1`
--      testring=$testring$testring
+-      teststring=$teststring$teststring
 -    done
--    testring=
+-    teststring=
 -    # 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.
@@ -43290,18 +44366,15 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
++if ${lt_cv_sys_global_symbol_pipe+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  # These are sane defaults that work on at least a few old systems.
-@@ -6501,29 +6860,18 @@
+@@ -6608,33 +7172,18 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
 -# Transform an extracted symbol line into a proper C declaration
 -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 -
@@ -43324,28 +44397,17 @@
    fi
 -  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 -  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-linux*)
+-  if test "$host_cpu" = ia64; then
+-    symcode='[ABCDGIRSTW]'
+-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  fi
    ;;
  irix* | nonstopux*)
    symcode='[BCDEGRST]'
-@@ -6531,62 +6879,102 @@
- osf*)
-   symcode='[BCDEGQRST]'
-   ;;
--solaris* | sysv5*)
-+solaris*)
-   symcode='[BDRT]'
-   ;;
-+sco3.2v5*)
-+  symcode='[DT]'
-+  ;;
-+sysv4.2uw2*)
-+  symcode='[DT]'
-+  ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+  symcode='[ABDT]'
-+  ;;
- sysv4)
-   symcode='[DFNSTU]'
+@@ -6659,57 +7208,86 @@
    ;;
  esac
  
@@ -43361,8 +44423,8 @@
 +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 +
 +# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 +
  # Handle CRLF in mingw tool chain
  opt_cr=
@@ -43383,11 +44445,11 @@
 +# Try without a prefix underscore, then with it.
  for ac_symprfx in "" "_"; do
  
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
+   # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+   symxfrm="\\1 $ac_symprfx\\2 \\2"
+ 
    # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 +  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
 +    # Fake it for dumpbin and say T for any non-static function
 +    # and D for any global variable.
@@ -43407,6 +44469,7 @@
 +  else
 +    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 +  fi
++  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  
    # Check to see that the pipe works correctly.
    pipe_works=no
@@ -43439,8 +44502,9 @@
      # Now try to grab the symbols.
      nlist=conftest.nm
 -    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
++    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
++  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && test -s "$nlist"; then
@@ -43449,7 +44513,7 @@
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -6595,53 +6983,55 @@
+@@ -6718,57 +7296,71 @@
        fi
  
        # Make sure that we snagged all the symbols we need.
@@ -43459,6 +44523,18 @@
 +      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 +	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 +	  cat <<_LT_EOF > conftest.$ac_ext
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
++   relocations are performed -- see ld's documentation on pseudo-relocs.  */
++# define LT_DLSYM_CONST
++#elif defined(__osf__)
++/* This system does not cope well with relocations in const data.  */
++# define LT_DLSYM_CONST
++#else
++# define LT_DLSYM_CONST const
++#endif
++
  #ifdef __cplusplus
  extern "C" {
  #endif
@@ -43479,8 +44555,9 @@
 +	  cat <<_LT_EOF >> conftest.$ac_ext
  
 -/* The mapping between symbol names and symbols. */
+-const struct {
 +/* The mapping between symbol names and symbols.  */
- const struct {
++LT_DLSYM_CONST struct {
    const char *name;
 -  lt_ptr_t address;
 +  void       *address;
@@ -43513,8 +44590,10 @@
 +_LT_EOF
  	  # Now try linking the two files.
  	  mv conftest.$ac_objext conftstm.$ac_objext
- 	  lt_save_LIBS="$LIBS"
- 	  lt_save_CFLAGS="$CFLAGS"
+-	  lt_save_LIBS="$LIBS"
+-	  lt_save_CFLAGS="$CFLAGS"
++	  lt_globsym_save_LIBS=$LIBS
++	  lt_globsym_save_CFLAGS=$CFLAGS
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 -	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -43527,8 +44606,14 @@
 +  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  	    pipe_works=yes
  	  fi
- 	  LIBS="$lt_save_LIBS"
-@@ -6659,7 +7049,7 @@
+-	  LIBS="$lt_save_LIBS"
+-	  CFLAGS="$lt_save_CFLAGS"
++	  LIBS=$lt_globsym_save_LIBS
++	  CFLAGS=$lt_globsym_save_CFLAGS
+ 	else
+ 	  echo "cannot find nm_test_func in $nlist" >&5
+ 	fi
+@@ -6782,7 +7374,7 @@
      echo "$progname: failed program was:" >&5
      cat conftest.$ac_ext >&5
    fi
@@ -43537,7 +44622,7 @@
  
    # Do not use the global_symbol_pipe unless it works.
    if test "$pipe_works" = yes; then
-@@ -6675,9810 +7065,1551 @@
+@@ -6798,6053 +7390,3807 @@
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -43566,7 +44651,12 @@
 -  lt_cv_objdir=_libs
 -fi
 -rmdir .libs 2>/dev/null
--fi
++# Response file support.
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++  nm_file_list_spec='@'
++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
++  nm_file_list_spec='@'
+ fi
 -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
 -echo "${ECHO_T}$lt_cv_objdir" >&6
 -objdir=$lt_cv_objdir
@@ -43589,7 +44679,7 @@
  
 -# Sed substitution that helps us do robust quoting.  It backslashifies
 -# metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
+-Xsed='sed -e 1s/^X//'
 -sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
 -# Same as above, but do not quote variable references.
@@ -43609,7 +44699,7 @@
 -default_ofile=libtool
 -can_build_shared=yes
  
--# All known linkers require a `.a' archive for static linking (except M$VC,
+-# All known linkers require a `.a' archive for static linking (except MSVC,
 -# which needs '.lib').
 -libext=a
 -ltmain="$ac_aux_dir/ltmain.sh"
@@ -43623,12 +44713,91 @@
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_AR+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$AR"; then
+-  ac_cv_prog_AR="$AR" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+ 
+-fi
+-fi
+-AR=$ac_cv_prog_AR
+-if test -n "$AR"; then
+-  echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
++
++
++
++
++
++
++
 +
 +
 +
 +
 +
 +
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
++$as_echo_n "checking for sysroot... " >&6; }
++
++# Check whether --with-sysroot was given.
++if test "${with_sysroot+set}" = set; then :
++  withval=$with_sysroot;
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  with_sysroot=no
+ fi
+ 
+-fi
+-if test -z "$ac_cv_prog_AR"; then
+-  ac_ct_AR=$AR
+-  # Extract the first word of "ar", so it can be a program name with args.
+-set dummy ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_AR"; then
+-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++
++lt_sysroot=
++case ${with_sysroot} in #(
++ yes)
++   if test "$GCC" = yes; then
++     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
++   fi
++   ;; #(
++ /*)
++   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
++   ;; #(
++ no|'')
++   ;; #(
++ *)
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
++$as_echo "${with_sysroot}" >&6; }
++   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
++   ;;
++esac
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
++$as_echo "${lt_sysroot:-no}" >&6; }
++
++
 +
 +
 +
@@ -43663,7 +44832,7 @@
 +  ;;
 +*-*-irix6*)
 +  # Find out which ABI we are using.
-+  echo '#line 7128 "configure"' > conftest.$ac_ext
++  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
@@ -43757,11 +44926,9 @@
 +  CFLAGS="$CFLAGS -belf"
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-+if test "${lt_cv_cc_needs_belf+set}" = set; then :
++if ${lt_cv_cc_needs_belf+:} false; then :
 +  $as_echo_n "(cached) " >&6
- else
--  if test -n "$AR"; then
--  ac_cv_prog_AR="$AR" # Let the user override the test.
++else
 +  ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -43827,19 +44994,16 @@
 +
 +need_locks="$enable_libtool_lock"
 +
-+
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
++set dummy ${ac_tool_prefix}mt; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+  if test -n "$DSYMUTIL"; then
-+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
++  if test -n "$MANIFEST_TOOL"; then
++  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@ -43848,11 +45012,11 @@
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    ac_cv_prog_ac_ct_AR="ar"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -43861,78 +45025,17 @@
 +  done
 +IFS=$as_save_IFS
  
+-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
  fi
  fi
--AR=$ac_cv_prog_AR
--if test -n "$AR"; then
--  echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
-+DSYMUTIL=$ac_cv_prog_DSYMUTIL
-+if test -n "$DSYMUTIL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-+$as_echo "$DSYMUTIL" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-+
- fi
--if test -z "$ac_cv_prog_AR"; then
--  ac_ct_AR=$AR
--  # Extract the first word of "ar", so it can be a program name with args.
--set dummy ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -z "$ac_cv_prog_DSYMUTIL"; then
-+  ac_ct_DSYMUTIL=$DSYMUTIL
-+  # Extract the first word of "dsymutil", so it can be a program name with args.
-+set dummy dsymutil; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  if test -n "$ac_ct_AR"; then
--  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+  if test -n "$ac_ct_DSYMUTIL"; then
-+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_AR="ar"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
- fi
- fi
--ac_ct_AR=$ac_cv_prog_ac_ct_AR
--if test -n "$ac_ct_AR"; then
--  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
-+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-+if test -n "$ac_ct_DSYMUTIL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+-ac_ct_AR=$ac_cv_prog_ac_ct_AR
+-if test -n "$ac_ct_AR"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-echo "${ECHO_T}$ac_ct_AR" >&6
++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
++if test -n "$MANIFEST_TOOL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
++$as_echo "$MANIFEST_TOOL" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
@@ -43941,21 +45044,9 @@
  fi
  
 -  AR=$ac_ct_AR
-+  if test "x$ac_ct_DSYMUTIL" = x; then
-+    DSYMUTIL=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    DSYMUTIL=$ac_ct_DSYMUTIL
-+  fi
- else
+-else
 -  AR="$ac_cv_prog_AR"
-+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
- fi
+-fi
  
 -if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
@@ -43964,18 +45055,20 @@
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_RANLIB+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
++fi
++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
++  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
++  # Extract the first word of "mt", so it can be a program name with args.
++set dummy mt; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$RANLIB"; then
 -  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+  if test -n "$NMEDIT"; then
-+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
++  if test -n "$ac_ct_MANIFEST_TOOL"; then
++  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@ -43988,7 +45081,7 @@
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
++    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -44003,18 +45096,46 @@
 -if test -n "$RANLIB"; then
 -  echo "$as_me:$LINENO: result: $RANLIB" >&5
 -echo "${ECHO_T}$RANLIB" >&6
-+NMEDIT=$ac_cv_prog_NMEDIT
-+if test -n "$NMEDIT"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-+$as_echo "$NMEDIT" >&6; }
++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
++if test -n "$ac_ct_MANIFEST_TOOL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_MANIFEST_TOOL" = x; then
++    MANIFEST_TOOL=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
++  fi
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  fi
  
-+
++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
++if ${lt_cv_path_mainfest_tool+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_path_mainfest_tool=no
++  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
++  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
++  cat conftest.err >&5
++  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
++    lt_cv_path_mainfest_tool=yes
++  fi
++  rm -f conftest*
  fi
 -if test -z "$ac_cv_prog_RANLIB"; then
 -  ac_ct_RANLIB=$RANLIB
@@ -44024,19 +45145,31 @@
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -z "$ac_cv_prog_NMEDIT"; then
-+  ac_ct_NMEDIT=$NMEDIT
-+  # Extract the first word of "nmedit", so it can be a program name with args.
-+set dummy nmedit; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
++$as_echo "$lt_cv_path_mainfest_tool" >&6; }
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
++  MANIFEST_TOOL=:
++fi
++
++
++
++
++
++
++  case $host_os in
++    rhapsody* | darwin*)
++    if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
++if ${ac_cv_prog_DSYMUTIL+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_RANLIB"; then
 -  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+  if test -n "$ac_ct_NMEDIT"; then
-+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
++  if test -n "$DSYMUTIL"; then
++  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@ -44049,7 +45182,7 @@
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
++    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -44065,10 +45198,10 @@
 -if test -n "$ac_ct_RANLIB"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 -echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-+if test -n "$ac_ct_NMEDIT"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-+$as_echo "$ac_ct_NMEDIT" >&6; }
++DSYMUTIL=$ac_cv_prog_DSYMUTIL
++if test -n "$DSYMUTIL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
++$as_echo "$DSYMUTIL" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
@@ -44077,8 +45210,49 @@
  fi
  
 -  RANLIB=$ac_ct_RANLIB
-+  if test "x$ac_ct_NMEDIT" = x; then
-+    NMEDIT=":"
++
++fi
++if test -z "$ac_cv_prog_DSYMUTIL"; then
++  ac_ct_DSYMUTIL=$DSYMUTIL
++  # Extract the first word of "dsymutil", so it can be a program name with args.
++set dummy dsymutil; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  RANLIB="$ac_cv_prog_RANLIB"
++  if test -n "$ac_ct_DSYMUTIL"; then
++  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
++if test -n "$ac_ct_DSYMUTIL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
++$as_echo "$ac_ct_DSYMUTIL" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_DSYMUTIL" = x; then
++    DSYMUTIL=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
@@ -44086,11 +45260,10 @@
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
-+    NMEDIT=$ac_ct_NMEDIT
++    DSYMUTIL=$ac_ct_DSYMUTIL
 +  fi
- else
--  RANLIB="$ac_cv_prog_RANLIB"
-+  NMEDIT="$ac_cv_prog_NMEDIT"
++else
++  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
  fi
  
 -if test -n "$ac_tool_prefix"; then
@@ -44101,17 +45274,17 @@
 -if test "${ac_cv_prog_STRIP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}lipo; ac_word=$2
++  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
++set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_LIPO+set}" = set; then :
++if ${ac_cv_prog_NMEDIT+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$STRIP"; then
 -  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+  if test -n "$LIPO"; then
-+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
++  if test -n "$NMEDIT"; then
++  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@ -44124,7 +45297,7 @@
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
++    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -44139,10 +45312,10 @@
 -if test -n "$STRIP"; then
 -  echo "$as_me:$LINENO: result: $STRIP" >&5
 -echo "${ECHO_T}$STRIP" >&6
-+LIPO=$ac_cv_prog_LIPO
-+if test -n "$LIPO"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-+$as_echo "$LIPO" >&6; }
++NMEDIT=$ac_cv_prog_NMEDIT
++if test -n "$NMEDIT"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
++$as_echo "$NMEDIT" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
@@ -44160,19 +45333,19 @@
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -z "$ac_cv_prog_LIPO"; then
-+  ac_ct_LIPO=$LIPO
-+  # Extract the first word of "lipo", so it can be a program name with args.
-+set dummy lipo; ac_word=$2
++if test -z "$ac_cv_prog_NMEDIT"; then
++  ac_ct_NMEDIT=$NMEDIT
++  # Extract the first word of "nmedit", so it can be a program name with args.
++set dummy nmedit; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
++if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_STRIP"; then
 -  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+  if test -n "$ac_ct_LIPO"; then
-+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
++  if test -n "$ac_ct_NMEDIT"; then
++  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@ -44185,7 +45358,7 @@
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_LIPO="lipo"
++    ac_cv_prog_ac_ct_NMEDIT="nmedit"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -44201,20 +45374,17 @@
 -if test -n "$ac_ct_STRIP"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
 -echo "${ECHO_T}$ac_ct_STRIP" >&6
-+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-+if test -n "$ac_ct_LIPO"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-+$as_echo "$ac_ct_LIPO" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
++if test -n "$ac_ct_NMEDIT"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
++$as_echo "$ac_ct_NMEDIT" >&6; }
++else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
- fi
- 
--  STRIP=$ac_ct_STRIP
-+  if test "x$ac_ct_LIPO" = x; then
-+    LIPO=":"
++fi
++
++  if test "x$ac_ct_NMEDIT" = x; then
++    NMEDIT=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
@@ -44222,23 +45392,28 @@
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
-+    LIPO=$ac_ct_LIPO
++    NMEDIT=$ac_ct_NMEDIT
 +  fi
  else
--  STRIP="$ac_cv_prog_STRIP"
-+  LIPO="$ac_cv_prog_LIPO"
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  NMEDIT="$ac_cv_prog_NMEDIT"
  fi
  
+-  STRIP=$ac_ct_STRIP
 +    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}otool; ac_word=$2
++  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
++set dummy ${ac_tool_prefix}lipo; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OTOOL+set}" = set; then :
++if ${ac_cv_prog_LIPO+:} false; then :
 +  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OTOOL"; then
-+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+ else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
+-
++  if test -n "$LIPO"; then
++  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
@@ -44247,7 +45422,7 @@
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
++    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
@@ -44257,13 +45432,24 @@
  
 -old_CC="$CC"
 -old_CFLAGS="$CFLAGS"
--
++fi
++fi
++LIPO=$ac_cv_prog_LIPO
++if test -n "$LIPO"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
++$as_echo "$LIPO" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
 -# Set sane defaults for various variables
 -test -z "$AR" && AR=ar
 -test -z "$AR_FLAGS" && AR_FLAGS=cru
 -test -z "$AS" && AS=as
 -test -z "$CC" && CC=cc
 -test -z "$LTCC" && LTCC=$CC
+-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 -test -z "$DLLTOOL" && DLLTOOL=dlltool
 -test -z "$LD" && LD=ld
 -test -z "$LN_S" && LN_S="ln -s"
@@ -44274,34 +45460,110 @@
 -test -z "$RANLIB" && RANLIB=:
 -test -z "$STRIP" && STRIP=:
 -test -z "$ac_objext" && ac_objext=o
-+fi
-+fi
-+OTOOL=$ac_cv_prog_OTOOL
-+if test -n "$OTOOL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-+$as_echo "$OTOOL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
  
 -# Determine commands to create old-style static archives.
 -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
 -old_postinstall_cmds='chmod 644 $oldlib'
 -old_postuninstall_cmds=
++fi
++if test -z "$ac_cv_prog_LIPO"; then
++  ac_ct_LIPO=$LIPO
++  # Extract the first word of "lipo", so it can be a program name with args.
++set dummy lipo; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_LIPO"; then
++  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_LIPO="lipo"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
 -if test -n "$RANLIB"; then
 -  case $host_os in
 -  openbsd*)
--    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
 -    ;;
 -  *)
--    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
 -    ;;
 -  esac
 -  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++fi
++ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
++if test -n "$ac_ct_LIPO"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
++$as_echo "$ac_ct_LIPO" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_LIPO" = x; then
++    LIPO=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    LIPO=$ac_ct_LIPO
++  fi
++else
++  LIPO="$ac_cv_prog_LIPO"
  fi
+ 
+-for cc_temp in $compiler""; do
+-  case $cc_temp in
+-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
++    if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
++set dummy ${ac_tool_prefix}otool; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_OTOOL+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$OTOOL"; then
++  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
+ done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 -
++  done
++IFS=$as_save_IFS
+ 
 -# Only perform the check for file, if the check method requires it
 -case $deplibs_check_method in
 -file_magic*)
@@ -44310,14 +45572,12 @@
 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -z "$ac_cv_prog_OTOOL"; then
-+  ac_ct_OTOOL=$OTOOL
-+  # Extract the first word of "otool", so it can be a program name with args.
-+set dummy otool; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
++fi
++fi
++OTOOL=$ac_cv_prog_OTOOL
++if test -n "$OTOOL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
++$as_echo "$OTOOL" >&6; }
  else
 -  case $MAGIC_CMD in
 -[\\/*] |  ?:[\\/]*)
@@ -44335,13 +45595,42 @@
 -      if test -n "$file_magic_test_file"; then
 -	case $deplibs_check_method in
 -	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 -	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 -	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 -	    $EGREP "$file_magic_regex" > /dev/null; then
 -	    :
 -	  else
 -	    cat <<EOF 1>&2
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
+ 
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
++fi
++if test -z "$ac_cv_prog_OTOOL"; then
++  ac_ct_OTOOL=$OTOOL
++  # Extract the first word of "otool", so it can be a program name with args.
++set dummy otool; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
 +  if test -n "$ac_ct_OTOOL"; then
 +  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
 +else
@@ -44357,17 +45646,12 @@
 +    break 2
 +  fi
 +done
-+  done
+   done
+-  IFS="$lt_save_ifs"
+-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+-  ;;
 +IFS=$as_save_IFS
- 
--*** Warning: the command libtool uses to detect shared libraries,
--*** $file_magic_cmd, produces output that libtool cannot recognize.
--*** The result is that libtool may fail to recognize shared libraries
--*** as such.  This will affect the creation of libtool libraries that
--*** depend on shared libraries, but programs linked with such libtool
--*** libraries will work regardless of this problem.  Nevertheless, you
--*** may want to report the problem to your system manager and/or to
--*** bug-libtool@gnu.org
++
 +fi
 +fi
 +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
@@ -44378,17 +45662,7 @@
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
- 
--EOF
--	  fi ;;
--	esac
--      fi
--      break
--    fi
--  done
--  IFS="$lt_save_ifs"
--  MAGIC_CMD="$lt_save_MAGIC_CMD"
--  ;;
++
 +  if test "x$ac_ct_OTOOL" = x; then
 +    OTOOL=":"
 +  else
@@ -44413,7 +45687,7 @@
 +set dummy ${ac_tool_prefix}otool64; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
++if ${ac_cv_prog_OTOOL64+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  echo "$as_me:$LINENO: result: no" >&5
@@ -44466,7 +45740,7 @@
 -      if test -n "$file_magic_test_file"; then
 -	case $deplibs_check_method in
 -	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 -	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 -	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 -	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -44498,15 +45772,23 @@
 -  ;;
 -esac
  fi
+-
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
 +if test -z "$ac_cv_prog_OTOOL64"; then
 +  ac_ct_OTOOL64=$OTOOL64
 +  # Extract the first word of "otool64", so it can be a program name with args.
 +set dummy otool64; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
 +  $as_echo_n "(cached) " >&6
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
 +  if test -n "$ac_ct_OTOOL64"; then
 +  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
 +else
@@ -44525,27 +45807,22 @@
 +  done
 +IFS=$as_save_IFS
  
--MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--if test -n "$MAGIC_CMD"; then
--  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
+-  else
+-    MAGIC_CMD=:
 +fi
 +fi
 +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 +if test -n "$ac_ct_OTOOL64"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
 +$as_echo "$ac_ct_OTOOL64" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
- fi
- 
++fi
++
 +  if test "x$ac_ct_OTOOL64" = x; then
 +    OTOOL64=":"
-   else
--    MAGIC_CMD=:
++  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
@@ -44561,7 +45838,7 @@
 -  fi
 -  ;;
 -esac
--
+ 
 -enable_dlopen=no
 -enable_win32_dll=no
  
@@ -44609,68 +45886,25 @@
 -# If no C compiler was specified, use CC.
 -LTCC=${LTCC-"$CC"}
  
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
  
  
--#
--# Check for any special shared library compilation flags.
--#
--lt_prog_cc_shlib=
--if test "$GCC" = no; then
--  case $host_os in
--  sco3.2v5*)
--    lt_prog_cc_shlib='-belf'
--    ;;
--  esac
--fi
--if test -n "$lt_prog_cc_shlib"; then
--  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
--echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
--  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
--  else
--    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
--echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
--    lt_cv_prog_cc_can_build_shared=no
--  fi
--fi
- 
- 
--#
--# Check to make sure the static flag actually works.
--#
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
--if test "${lt_prog_compiler_static_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_prog_compiler_static_works=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
--   printf "$lt_simple_link_test_code" > conftest.$ac_ext
--   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test -s conftest.err; then
--       # Append any errors to the config.log.
--       cat conftest.err 1>&5
--     else
--       lt_prog_compiler_static_works=yes
--     fi
--   fi
--   $rm conftest*
--   LDFLAGS="$save_LDFLAGS"
- 
--fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
- 
--if test x"$lt_prog_compiler_static_works" = xyes; then
--    :
--else
--    lt_prog_compiler_static=
--fi
- 
+-# save warnings/boilerplate of simple test code
+-ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_compiler_boilerplate=`cat conftest.err`
+-$rm conftest*
+ 
+-ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
  
  
  
@@ -44684,9 +45918,11 @@
 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
 -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 +$as_echo_n "checking for -single_module linker flag... " >&6; }
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
++if ${lt_cv_apple_cc_single_mod+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  lt_cv_prog_compiler_rtti_exceptions=no
@@ -44699,18 +45935,20 @@
 -   # with a dollar sign (not a hyphen), so the echo should work correctly.
 -   # The option is referenced via a variable to avoid confusing sed.
 -   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7298: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7390: $lt_compile\"" >&5)
 -   (eval "$lt_compile" 2>conftest.err)
 -   ac_status=$?
 -   cat conftest.err >&5
--   echo "$as_me:7302: \$? = $ac_status" >&5
+-   echo "$as_me:7394: \$? = $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
--     if test ! -s conftest.err; then
+-     # So say no if there are warnings other than the usual output.
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
 -       lt_cv_prog_compiler_rtti_exceptions=yes
 -     fi
 -   fi
@@ -44744,7 +45982,7 @@
 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
++if ${lt_cv_ld_exported_symbols_list+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_ld_exported_symbols_list=no
@@ -44787,15 +46025,40 @@
 -    lt_prog_compiler_wl='-Wl,'
 -    lt_prog_compiler_static='-static'
 -
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-     case $host_os in
+-    case $host_os in
 -      aix*)
 -      # All AIX code is PIC.
 -      if test "$host_cpu" = ia64; then
 -	# AIX 5 now supports IA64 processor
 -	lt_prog_compiler_static='-Bstatic'
--      fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
++$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
++$as_echo_n "checking for -force_load linker flag... " >&6; }
++if ${lt_cv_ld_force_load+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_ld_force_load=no
++      cat > conftest.c << _LT_EOF
++int forced_loaded() { return 2;}
++_LT_EOF
++      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
++      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
++      echo "$AR cru libconftest.a conftest.o" >&5
++      $AR cru libconftest.a conftest.o 2>&5
++      echo "$RANLIB libconftest.a" >&5
++      $RANLIB libconftest.a 2>&5
++      cat > conftest.c << _LT_EOF
++int main() { return 0;}
++_LT_EOF
++      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
++      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
++      _lt_result=$?
++      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
++	lt_cv_ld_force_load=yes
++      else
++	cat conftest.err >&5
+       fi
 -      ;;
 -
 -    amigaos*)
@@ -44804,10 +46067,16 @@
 -      # like `-m68040'.
 -      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
 -      ;;
--
++        rm -f conftest.err libconftest.a conftest conftest.c
++        rm -rf conftest.dSYM
+ 
 -    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 -      # PIC is the default for these OSes.
 -      ;;
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
++$as_echo "$lt_cv_ld_force_load" >&6; }
++    case $host_os in
 +    rhapsody* | darwin1.[012])
 +      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
 +    darwin1.*)
@@ -44834,7 +46103,7 @@
 +    else
 +      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +    fi
-+    if test "$DSYMUTIL" != ":"; then
++    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
 +      _lt_dsymutil='~$DSYMUTIL $lib || :'
 +    else
 +      _lt_dsymutil=
@@ -44859,7 +46128,7 @@
 +  CPP=
 +fi
 +if test -z "$CPP"; then
-+  if test "${ac_cv_prog_CPP+set}" = set; then :
++  if ${ac_cv_prog_CPP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +      # Double quotes because CPP needs to be expanded
@@ -44896,11 +46165,9 @@
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
  
--    msdosdjgpp*)
--      # Just because we use GCC doesn't mean we suddenly get shared libraries
--      # on systems that don't support them.
--      lt_prog_compiler_can_build_shared=no
--      enable_shared=no
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
 -      ;;
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
@@ -44918,10 +46185,11 @@
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
  
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	lt_prog_compiler_pic=-Kconform_pic
--      fi
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      lt_prog_compiler_can_build_shared=no
+-      enable_shared=no
 -      ;;
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
@@ -44930,10 +46198,18 @@
 +  break
 +fi
  
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic=-Kconform_pic
+-      fi
+-      ;;
++    done
++    ac_cv_prog_CPP=$CPP
+ 
 -    hpux*)
 -      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 -      # not for PA HP-UX.
--      case "$host_cpu" in
+-      case $host_cpu in
 -      hppa*64*|ia64*)
 -	# +Z the default
 -	;;
@@ -44942,25 +46218,6 @@
 -	;;
 -      esac
 -      ;;
-+    done
-+    ac_cv_prog_CPP=$CPP
- 
--    *)
--      lt_prog_compiler_pic='-fPIC'
--      ;;
--    esac
--  else
--    # PORTME Check for flag to pass linker flags through the system compiler.
--    case $host_os in
--    aix*)
--      lt_prog_compiler_wl='-Wl,'
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static='-Bstatic'
--      else
--	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
--      fi
--      ;;
 +fi
 +  CPP=$ac_cv_prog_CPP
 +else
@@ -44988,31 +46245,42 @@
 +_ACEOF
 +if ac_fn_c_try_cpp "$LINENO"; then :
  
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic='-DDLL_EXPORT'
+-    *)
+-      lt_prog_compiler_pic='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      lt_prog_compiler_wl='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static='-Bstatic'
+-      else
+-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+-      fi
 -      ;;
+-      darwin*)
+-        # PIC is the default on this platform
+-        # Common symbols not allowed in MH_DYLIB files
+-       case $cc_basename in
+-         xlc*)
+-         lt_prog_compiler_pic='-qnocommon'
+-         lt_prog_compiler_wl='-Wl,'
+-         ;;
+-       esac
+-       ;;
 +else
 +  # Broken: fails on valid input.
 +continue
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
  
--    hpux9* | hpux10* | hpux11*)
--      lt_prog_compiler_wl='-Wl,'
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
--      case "$host_cpu" in
--      hppa*64*|ia64*)
--	# +Z the default
--	;;
--      *)
--	lt_prog_compiler_pic='+Z'
--	;;
--      esac
--      # Is there a better lt_prog_compiler_static that works with the bundled CC?
--      lt_prog_compiler_static='${wl}-a ${wl}archive'
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic='-DDLL_EXPORT'
 -      ;;
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
@@ -45030,34 +46298,62 @@
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
  
--    irix5* | irix6* | nonstopux*)
+-    hpux9* | hpux10* | hpux11*)
 -      lt_prog_compiler_wl='-Wl,'
--      # PIC (with -KPIC) is the default.
--      lt_prog_compiler_static='-non_shared'
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	lt_prog_compiler_pic='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      lt_prog_compiler_static='${wl}-a ${wl}archive'
 -      ;;
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
  
--    newsos6)
--      lt_prog_compiler_pic='-KPIC'
--      lt_prog_compiler_static='-Bstatic'
+-    irix5* | irix6* | nonstopux*)
+-      lt_prog_compiler_wl='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      lt_prog_compiler_static='-non_shared'
 -      ;;
 +else
 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details" "$LINENO" 5; }
 +fi
  
+-    newsos6)
+-      lt_prog_compiler_pic='-KPIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
++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
+ 
 -    linux*)
--      case $CC in
+-      case $cc_basename in
 -      icc* | ecc*)
 -	lt_prog_compiler_wl='-Wl,'
 -	lt_prog_compiler_pic='-KPIC'
 -	lt_prog_compiler_static='-static'
 -        ;;
+-      pgcc* | pgf77* | pgf90* | pgf95*)
+-        # Portland Group compilers (*not* the Pentium gcc compiler,
+-	# which looks to be a dead project)
+-	lt_prog_compiler_wl='-Wl,'
+-	lt_prog_compiler_pic='-fpic'
+-	lt_prog_compiler_static='-Bstatic'
+-        ;;
 -      ccc*)
 -        lt_prog_compiler_wl='-Wl,'
 -        # All Alpha code is PIC.
@@ -45065,25 +46361,15 @@
 -        ;;
 -      esac
 -      ;;
-+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
  
 -    osf3* | osf4* | osf5*)
 -      lt_prog_compiler_wl='-Wl,'
 -      # All OSF/1 code is PIC.
 -      lt_prog_compiler_static='-non_shared'
 -      ;;
- 
--    sco3.2v5*)
--      lt_prog_compiler_pic='-Kpic'
--      lt_prog_compiler_static='-dn'
--      ;;
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 +$as_echo_n "checking for ANSI C header files... " >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then :
++if ${ac_cv_header_stdc+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -45094,9 +46380,14 @@
 +#include <float.h>
  
 -    solaris*)
--      lt_prog_compiler_wl='-Wl,'
 -      lt_prog_compiler_pic='-KPIC'
 -      lt_prog_compiler_static='-Bstatic'
+-      case $cc_basename in
+-      f77* | f90* | f95*)
+-	lt_prog_compiler_wl='-Qoption ld ';;
+-      *)
+-	lt_prog_compiler_wl='-Wl,';;
+-      esac
 -      ;;
 +int
 +main ()
@@ -45118,7 +46409,7 @@
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-    sysv4 | sysv4.2uw2* | sysv4.3*)
 -      lt_prog_compiler_wl='-Wl,'
 -      lt_prog_compiler_pic='-KPIC'
 -      lt_prog_compiler_static='-Bstatic'
@@ -45139,8 +46430,9 @@
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "memchr" >/dev/null 2>&1; then :
  
--    uts4*)
--      lt_prog_compiler_pic='-pic'
+-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-      lt_prog_compiler_wl='-Wl,'
+-      lt_prog_compiler_pic='-KPIC'
 -      lt_prog_compiler_static='-Bstatic'
 -      ;;
 +else
@@ -45148,33 +46440,52 @@
 +fi
 +rm -f conftest*
  
--    *)
+-    unicos*)
+-      lt_prog_compiler_wl='-Wl,'
 -      lt_prog_compiler_can_build_shared=no
 -      ;;
--    esac
--  fi
 +fi
  
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic" >&6
+-    uts4*)
+-      lt_prog_compiler_pic='-pic'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
 +if test $ac_cv_header_stdc = yes; then
 +  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdlib.h>
  
+-    *)
+-      lt_prog_compiler_can_build_shared=no
+-      ;;
+-    esac
+-  fi
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then :
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
+ 
 -#
 -# Check to make sure the PIC flag actually works.
 -#
 -if test -n "$lt_prog_compiler_pic"; then
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "free" >/dev/null 2>&1; then :
++fi
  
 -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
 -if test "${lt_prog_compiler_pic_works+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then :
++  :
  else
 -  lt_prog_compiler_pic_works=no
 -  ac_outfile=conftest.$ac_objext
@@ -45186,42 +46497,24 @@
 -   # with a dollar sign (not a hyphen), so the echo should work correctly.
 -   # The option is referenced via a variable to avoid confusing sed.
 -   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7531: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7658: $lt_compile\"" >&5)
 -   (eval "$lt_compile" 2>conftest.err)
 -   ac_status=$?
 -   cat conftest.err >&5
--   echo "$as_me:7535: \$? = $ac_status" >&5
+-   echo "$as_me:7662: \$? = $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
--     if test ! -s conftest.err; then
+-     # So say no if there are warnings other than the usual output.
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
 -       lt_prog_compiler_pic_works=yes
 -     fi
 -   fi
 -   $rm conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
- 
--if test x"$lt_prog_compiler_pic_works" = xyes; then
--    case $lt_prog_compiler_pic in
--     "" | " "*) ;;
--     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
--     esac
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then :
-+  :
- else
--    lt_prog_compiler_pic=
--     lt_prog_compiler_can_build_shared=no
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <ctype.h>
@@ -45236,7 +46529,10 @@
 +		     || ('s' <= (c) && (c) <= 'z'))
 +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 +#endif
-+
+ 
+-fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 +int
 +main ()
@@ -45250,8 +46546,15 @@
 +}
 +_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
-+
-+else
+ 
+-if test x"$lt_prog_compiler_pic_works" = xyes; then
+-    case $lt_prog_compiler_pic in
+-     "" | " "*) ;;
+-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+-     esac
+ else
+-    lt_prog_compiler_pic=
+-     lt_prog_compiler_can_build_shared=no
 +  ac_cv_header_stdc=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -45259,7 +46562,7 @@
  fi
  
  fi
--case "$host_os" in
+-case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
 -  *djgpp*)
 -    lt_prog_compiler_pic=
@@ -45273,6 +46576,62 @@
 +$as_echo "$ac_cv_header_stdc" >&6; }
 +if test $ac_cv_header_stdc = yes; then
  
+-#
+-# Check to make sure the static flag actually works.
+-#
+-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_static_works+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_prog_compiler_static_works=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The linker can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&5
+-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-       if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works=yes
+-       fi
+-     else
+-       lt_prog_compiler_static_works=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+ 
+-if test x"$lt_prog_compiler_static_works" = xyes; then
+-    :
+-else
+-    lt_prog_compiler_static=
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
+ 
++done
+ 
 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 -if test "${lt_cv_prog_compiler_c_o+set}" = set; then
@@ -45284,7 +46643,6 @@
 -   cd conftest
 -   mkdir out
 -   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
  
 -   lt_compiler_flag="-o out/conftest2.$ac_objext"
 -   # Insert the option either (1) after the last *FLAGS variable, or
@@ -45292,23 +46650,25 @@
 -   # Note that $ac_compile itself does not contain backslashes and begins
 -   # with a dollar sign (not a hyphen), so the echo should work correctly.
 -   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7591: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7762: $lt_compile\"" >&5)
 -   (eval "$lt_compile" 2>out/conftest.err)
 -   ac_status=$?
 -   cat out/conftest.err >&5
--   echo "$as_me:7595: \$? = $ac_status" >&5
+-   echo "$as_me:7766: \$? = $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
 -     # So say no if there are warnings
--     if test ! -s out/conftest.err; then
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 -       lt_cv_prog_compiler_c_o=yes
 -     fi
 -   fi
--   chmod u+w .
+-   chmod u+w . 2>&5
 -   $rm conftest*
 -   # SGI C++ compiler will create directory out/ii_files/ for
 -   # template instantiation
@@ -45317,18 +46677,13 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
-+fi
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
++for ac_header in dlfcn.h
 +do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 +"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_DLFCN_H 1
 +_ACEOF
  
  fi
@@ -45336,16 +46691,6 @@
 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
  
 +done
-+
-+
-+for ac_header in dlfcn.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DLFCN_H 1
-+_ACEOF
  
 -hard_links="nottested"
 -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
@@ -45367,11 +46712,10 @@
 -  fi
 -else
 -  need_locks=no
- fi
+-fi
  
 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+done
  
 -  runpath_var=
 -  allow_undefined_flag=
@@ -45409,6 +46753,16 @@
 -  # rely on this symbol name, it's probably fine to never include it in
 -  # preloaded symbol tables.
 -  extract_expsyms_cmds=
+-  # Just being paranoid about ensuring that cc_basename is set.
+-  for cc_temp in $compiler""; do
+-  case $cc_temp in
+-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  
 -  case $host_os in
 -  cygwin* | mingw* | pw32*)
@@ -45419,6 +46773,10 @@
 -      with_gnu_ld=no
 -    fi
 -    ;;
+-  interix*)
+-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+-    with_gnu_ld=yes
+-    ;;
 -  openbsd*)
 -    with_gnu_ld=no
 -    ;;
@@ -45430,6 +46788,27 @@
 -    wlarc='${wl}'
 +# Set options
  
+-    # Set some defaults for GNU ld with shared library support. These
+-    # are reset later if shared libraries are not supported. Putting them
+-    # here allows them to be overridden if necessary.
+-    runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-    export_dynamic_flag_spec='${wl}--export-dynamic'
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec=
+-    fi
+-    supports_anon_versioning=no
+-    case `$LD -v 2>/dev/null` in
+-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-      *\ 2.11.*) ;; # other 2.11 versions
+-      *) supports_anon_versioning=yes ;;
+-    esac
+ 
 -    # See if GNU ld supports shared libraries.
 -    case $host_os in
 -    aix3* | aix4* | aix5*)
@@ -45443,16 +46822,17 @@
 -*** Therefore, libtool is disabling shared libraries support.  If you
 -*** really care for shared libraries, you may want to modify your PATH
 -*** so that a non-GNU linker is found, and then restart.
++        enable_dlopen=no
  
 -EOF
 -      fi
 -      ;;
-+        enable_dlopen=no
  
 -    amigaos*)
 -      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
 -      hardcode_libdir_flag_spec='-L$libdir'
 -      hardcode_minus_L=yes
++  enable_win32_dll=no
  
 -      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
 -      # that the semantics of dynamic libraries on AmigaOS, at least up
@@ -45462,7 +46842,6 @@
 -      # them.
 -      ld_shlibs=no
 -      ;;
-+  enable_win32_dll=no
  
 -    beos*)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -45473,7 +46852,6 @@
 -      else
 -	ld_shlibs=no
 -      fi
-+
 +            # Check whether --enable-shared was given.
 +if test "${enable_shared+set}" = set; then :
 +  enableval=$enable_shared; p=${PACKAGE-default}
@@ -45504,10 +46882,10 @@
 -      allow_undefined_flag=unsupported
 -      always_export_symbols=no
 -      enable_shared_with_static_runtimes=yes
--      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
  
 -      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -	# 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
@@ -45516,7 +46894,53 @@
 -	  echo EXPORTS > $output_objdir/$soname.def;
 -	  cat $export_symbols >> $output_objdir/$soname.def;
 -	fi~
--	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-      else
+-	ld_shlibs=no
+-      fi
+-      ;;
+ 
+-    interix3*)
+-      hardcode_direct=no
+-      hardcode_shlibpath_var=no
+-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-      export_dynamic_flag_spec='${wl}-E'
+-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-      # Instead, shared libraries are loaded at an image base (0x10000000 by
+-      # default) and relocated if they conflict, which is a slow very memory
+-      # consuming and fragmenting process.  To avoid this, we pick a random,
+-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-      ;;
+ 
+-    linux*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	tmp_addflag=
+-	case $cc_basename,$host_cpu in
+-	pgcc*)				# Portland Group C compiler
+-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag'
+-	  ;;
+-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag -Mnomain' ;;
+-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+-	  tmp_addflag=' -i_dynamic' ;;
+-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+-	ifc* | ifort*)			# Intel Fortran compiler
+-	  tmp_addflag=' -nofor_main' ;;
+-	esac
+-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+-	if test $supports_anon_versioning = yes; then
+-	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-  $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-	fi
 -      else
 -	ld_shlibs=no
 -      fi
@@ -45532,7 +46956,7 @@
 -      fi
 -      ;;
  
--    solaris* | sysv5*)
+-    solaris*)
 -      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 -	ld_shlibs=no
 -	cat <<EOF 1>&2
@@ -45553,50 +46977,47 @@
 -      fi
 -      ;;
  
--    sunos4*)
--      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      hardcode_direct=yes
--      hardcode_shlibpath_var=no
--      ;;
- 
--  linux*)
--    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds="$tmp_archive_cmds"
--      fi
--    else
--      ld_shlibs=no
--    fi
--    ;;
+-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+-      case `$LD -v 2>&1` in
+-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+-	ld_shlibs=no
+-	cat <<_LT_EOF 1>&2
  
-+
-+
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+-*** reliably create shared libraries on SCO systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
 +# Check whether --with-pic was given.
 +if test "${with_pic+set}" = set; then :
 +  withval=$with_pic; pic_mode="$withval"
 +else
 +  pic_mode=default
 +fi
-+
-+
+ 
+-_LT_EOF
+-	;;
+-	*)
+-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+-	  else
+-	    ld_shlibs=no
+-	  fi
+-	;;
+-      esac
+-      ;;
+ 
+-    sunos4*)
+-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
+-      ;;
 +test -z "$pic_mode" && pic_mode=default
-+
+ 
 +
 +
 +
@@ -45632,16 +47053,11 @@
 +  enable_fast_install=yes
 +fi
  
--    if test "$ld_shlibs" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec=
--      fi
+-    if test "$ld_shlibs" = no; then
+-      runpath_var=
+-      hardcode_libdir_flag_spec=
+-      export_dynamic_flag_spec=
+-      whole_archive_flag_spec=
 -    fi
 -  else
 -    # PORTME fill in a description of your system's linker (not GNU ld)
@@ -45653,13 +47069,13 @@
 -      # Note: this linker hardcodes the directories in LIBPATH if there
 -      # are no directories specified by -L.
 -      hardcode_minus_L=yes
--      if test "$GCC" = yes && test -z "$link_static_flag"; then
+-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 -	# Neither direct hardcoding nor static linking is supported with a
 -	# broken collect2.
 -	hardcode_direct=unsupported
 -      fi
 -      ;;
--
+ 
 -    aix4* | aix5*)
 -      if test "$host_cpu" = ia64; then
 -	# On IA64, the linker does run time linking by default, so we don't
@@ -45687,6 +47103,7 @@
 -  	    break
 -  	  fi
 -	  done
+-	  ;;
 -	esac
  
 -	exp_sym_flag='-bexport'
@@ -45705,7 +47122,7 @@
 -      link_all_deplibs=yes
  
 -      if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
+-	case $host_os in aix4.[012]|aix4.[012].*)
 -	# We only want to do this on AIX 4.2 and lower, the check
 -	# below for broken collect2 doesn't work under 4.3+
 -	  collect2name=`${CC} -print-prog-name=collect2`
@@ -45724,8 +47141,12 @@
 -  	  hardcode_libdir_flag_spec='-L$libdir'
 -  	  hardcode_libdir_separator=
 -	  fi
+-	  ;;
 -	esac
 -	shared_flag='-shared'
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag="$shared_flag "'${wl}-G'
+-	fi
 -      else
 -	# not using gcc
 -	if test "$host_cpu" = ia64; then
@@ -45733,11 +47154,11 @@
 -  	# chokes on -Wl,-G. The following line is correct:
 -	  shared_flag='-G'
 -	else
--  	if test "$aix_use_runtimelinking" = yes; then
+-	  if test "$aix_use_runtimelinking" = yes; then
 -	    shared_flag='${wl}-G'
 -	  else
 -	    shared_flag='${wl}-bM:SRE'
--  	fi
+-	  fi
 -	fi
 -      fi
  
@@ -45795,21 +47216,23 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ltmain"
  
 -fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
 -       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
--	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 -       else
 -	if test "$host_cpu" = ia64; then
 -	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
 -	  allow_undefined_flag="-z nodefs"
--	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 -	else
 -	 # Determine the default libpath from the value encoded in an empty executable.
 -	 cat >conftest.$ac_ext <<_ACEOF
@@ -45818,8 +47241,6 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
 -int
 -main ()
@@ -45871,13 +47292,11 @@
 -	  # -berok will link without error, but may produce a broken library.
 -	  no_undefined_flag=' ${wl}-bernotok'
 -	  allow_undefined_flag=' ${wl}-berok'
--	  # -bexpall does not export symbols beginning with underscore (_)
--	  always_export_symbols=yes
 -	  # Exported symbols can be pulled into shared objects from archives
--	  whole_archive_flag_spec=' '
+-	  whole_archive_flag_spec='$convenience'
 -	  archive_cmds_need_lc=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
--	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	  # This is similar to how AIX traditionally builds its shared libraries.
+-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 -	fi
 -      fi
 -      ;;
@@ -45890,7 +47309,7 @@
 -      ld_shlibs=no
 -      ;;
  
--    bsdi4*)
+-    bsdi[45]*)
 -      export_dynamic_flag_spec=-rdynamic
 -      ;;
  
@@ -45904,7 +47323,7 @@
 -      # Tell ltmain to make .lib files, not .a files.
 -      libext=lib
 -      # Tell ltmain to make .dll files, not .so files.
--      shrext=".dll"
+-      shrext_cmds=".dll"
 -      # FIXME: Setting linknames here is a bad hack.
 -      archive_cmds='$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.
@@ -45916,52 +47335,52 @@
 -      ;;
  
 -    darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
--      archive_cmds_need_lc=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
+-      case $host_os in
+-        rhapsody* | darwin1.[012])
+-         allow_undefined_flag='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[012])
+-               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
 -      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      archive_cmds_need_lc=no
 -      hardcode_direct=no
 -      hardcode_automatic=yes
 -      hardcode_shlibpath_var=unsupported
--      whole_archive_flag_spec='-all_load $convenience'
+-      whole_archive_flag_spec=''
 -      link_all_deplibs=yes
+-    if test "$GCC" = yes ; then
+-    	output_verbose_link_cmd='echo'
+-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -    else
--      ld_shlibs=no
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         ld_shlibs=no
+-          ;;
+-      esac
 -    fi
 -      ;;
  
@@ -45995,7 +47414,7 @@
 -      ;;
  
 -    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
 -      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
 -      hardcode_libdir_flag_spec='-R$libdir'
 -      hardcode_direct=yes
@@ -46018,47 +47437,62 @@
 -      export_dynamic_flag_spec='${wl}-E'
 -      ;;
  
--    hpux10* | hpux11*)
+-    hpux10*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*|ia64*)
+-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_separator=:
+ 
+-	hardcode_direct=yes
+-	export_dynamic_flag_spec='${wl}-E'
+ 
+-	# hardcode_minus_L: Not really in the search PATH,
+-	# but as the default location of the library.
+-	hardcode_minus_L=yes
+-      fi
+-      ;;
+ 
+-    hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case $host_cpu in
+-	hppa*64*)
 -	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
+-	ia64*)
+-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
 -	*)
 -	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
 -	esac
 -      else
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	case $host_cpu in
+-	hppa*64*)
+-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
 -	*)
--	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
 -	esac
 -      fi
 -      if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*)
--	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_separator=:
+ 
+-	case $host_cpu in
+-	hppa*64*|ia64*)
 -	  hardcode_libdir_flag_spec_ld='+b $libdir'
--	  hardcode_libdir_separator=:
--	  hardcode_direct=no
--	  hardcode_shlibpath_var=no
--	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec='-L$libdir'
 -	  hardcode_direct=no
 -	  hardcode_shlibpath_var=no
- 
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  hardcode_minus_L=yes
 -	  ;;
 -	*)
--	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
--	  hardcode_libdir_separator=:
 -	  hardcode_direct=yes
 -	  export_dynamic_flag_spec='${wl}-E'
  
@@ -46100,12 +47534,14 @@
 -      hardcode_libdir_separator=:
 -      hardcode_shlibpath_var=no
 -      ;;
++test -z "$LN_S" && LN_S="ln -s"
  
 -    openbsd*)
 -      hardcode_direct=yes
 -      hardcode_shlibpath_var=no
 -      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 -	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 -	export_dynamic_flag_spec='${wl}-E'
 -      else
@@ -46141,7 +47577,6 @@
 -      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 -      hardcode_libdir_separator=:
 -      ;;
-+test -z "$LN_S" && LN_S="ln -s"
  
 -    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 -      if test "$GCC" = yes; then
@@ -46152,7 +47587,7 @@
 -	allow_undefined_flag=' -expect_unresolved \*'
 -	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 -	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
  
 -	# Both c and cxx compiler support -rpath directly
 -	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -46160,21 +47595,15 @@
 -      hardcode_libdir_separator=:
 -      ;;
  
--    sco3.2v5*)
--      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var=no
--      export_dynamic_flag_spec='${wl}-Bexport'
--      runpath_var=LD_RUN_PATH
--      hardcode_runpath_var=yes
--      ;;
- 
 -    solaris*)
 -      no_undefined_flag=' -z text'
 -      if test "$GCC" = yes; then
+-	wlarc='${wl}'
 -	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
 -      else
+-	wlarc=''
 -	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -46183,8 +47612,18 @@
 -      hardcode_shlibpath_var=no
 -      case $host_os in
 -      solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+-      *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
 -      esac
 -      link_all_deplibs=yes
 -      ;;
@@ -46241,63 +47680,58 @@
 -      fi
 -      ;;
  
--    sysv4.2uw2*)
--      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct=yes
--      hardcode_minus_L=no
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+-      no_undefined_flag='${wl}-z,text'
+-      archive_cmds_need_lc=no
 -      hardcode_shlibpath_var=no
--      hardcode_runpath_var=yes
--      runpath_var=LD_RUN_PATH
--      ;;
+-      runpath_var='LD_RUN_PATH'
  
--   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
--      no_undefined_flag='${wl}-z ${wl}text'
 -      if test "$GCC" = yes; then
--	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      else
--	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      fi
--      runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var=no
 -      ;;
  
--    sysv5*)
--      no_undefined_flag=' -z text'
--      # $CC -shared without GNU ld will not create a library from C++
--      # object files and a static libstdc++, better avoid it by now
--      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'
--      hardcode_libdir_flag_spec=
+-    sysv5* | sco3.2v5* | sco5v6*)
+-      # Note: We can NOT use -z defs as we might desire, because we do not
+-      # link with -lc, and that would cause any symbols used from libc to
+-      # always be unresolved, which means just about no library would
+-      # ever link correctly.  If we're not using GNU ld we use -z text
+-      # though, which does catch some bad symbols but isn't as heavy-handed
+-      # as -z defs.
+-      no_undefined_flag='${wl}-z,text'
+-      allow_undefined_flag='${wl}-z,nodefs'
+-      archive_cmds_need_lc=no
 -      hardcode_shlibpath_var=no
+-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-      hardcode_libdir_separator=':'
+-      link_all_deplibs=yes
+-      export_dynamic_flag_spec='${wl}-Bexport'
 -      runpath_var='LD_RUN_PATH'
+ 
+-      if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
 -      ;;
++if test -n "${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
  
 -    uts4*)
 -      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_libdir_flag_spec='-L$libdir'
 -      hardcode_shlibpath_var=no
 -      ;;
- 
--    *)
--      ld_shlibs=no
--      ;;
--    esac
--  fi
- 
--echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--echo "${ECHO_T}$ld_shlibs" >&6
--test "$ld_shlibs" = no && can_build_shared=no
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
- 
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
--  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 +$as_echo_n "checking for objdir... " >&6; }
-+if test "${lt_cv_objdir+set}" = set; then :
++if ${lt_cv_objdir+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  rm -f .libs 2>/dev/null
@@ -46307,13 +47741,23 @@
 +else
 +  # MS-DOS does not allow filenames that begin with a dot.
 +  lt_cv_objdir=_libs
- fi
++fi
 +rmdir .libs 2>/dev/null
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
 +$as_echo "$lt_cv_objdir" >&6; }
 +objdir=$lt_cv_objdir
  
+-    *)
+-      ld_shlibs=no
+-      ;;
+-    esac
+-  fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-echo "${ECHO_T}$ld_shlibs" >&6
+-test "$ld_shlibs" = no && can_build_shared=no
+ 
 -#
 -# Do we need to explicitly link libc?
 -#
@@ -46346,6 +47790,7 @@
 -        libobjs=conftest.$ac_objext
 -        deplibs=
 -        wl=$lt_prog_compiler_wl
+-	pic_flag=$lt_prog_compiler_pic
 -        compiler_flags=-v
 -        linker_flags=-v
 -        verstring=
@@ -46372,16 +47817,31 @@
 -echo "${ECHO_T}$archive_cmds_need_lc" >&6
 -      ;;
 -    esac
--  fi
--  ;;
--esac
--
++cat >>confdefs.h <<_ACEOF
++#define LT_OBJDIR "$lt_cv_objdir/"
++_ACEOF
++
++
++
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
+   fi
+   ;;
+ esac
+ 
 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 -library_names_spec=
 -libname_spec='lib$name'
 -soname_spec=
--shrext=".so"
+-shrext_cmds=".so"
 -postinstall_cmds=
 -postuninstall_cmds=
 -finish_cmds=
@@ -46407,21 +47867,81 @@
 -fi
 -need_lib_prefix=unknown
 -hardcode_into_libs=no
--
++# Global variables:
++ofile=libtool
++can_build_shared=yes
+ 
 -# when you set need_version to no, make sure it does not cause -set_version
 -# flags to be left without arguments
 -need_version=unknown
--
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
+ 
 -case $host_os in
 -aix3*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
 -  shlibpath_var=LIBPATH
--
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
 -  # AIX 3 has no versioning support, so we append a major version to the name.
 -  soname_spec='${libname}${release}${shared_ext}$major'
--  ;;
--
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$LD" && LD=ld
++test -z "$ac_objext" && ac_objext=o
++
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++
++
++# Only perform the check for file, if the check method requires it
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
++$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+   ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<_LT_EOF 1>&2
+ 
 -aix4* | aix5*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -46445,7 +47965,19 @@
 -	:
 -      else
 -	can_build_shared=no
--      fi
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++_LT_EOF
++	  fi ;;
++	esac
+       fi
 -      ;;
 -    esac
 -    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
@@ -46461,24 +47993,38 @@
 -      # and later when we are not doing run time linking.
 -      library_names_spec='${libname}${release}.a $libname.a'
 -      soname_spec='${libname}${release}${shared_ext}$major'
--    fi
++      break
+     fi
 -    shlibpath_var=LIBPATH
 -  fi
--  ;;
--
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
+   ;;
++esac
++fi
+ 
 -amigaos*)
 -  library_names_spec='$libname.ixlibrary $libname.a'
 -  # Create ${libname}_ixlibrary.a entries in /sys/libs.
 -  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 -  ;;
--
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
++$as_echo "$MAGIC_CMD" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
 -beos*)
 -  library_names_spec='${libname}${shared_ext}'
 -  dynamic_linker="$host_os ld.so"
 -  shlibpath_var=LIBRARY_PATH
 -  ;;
--
--bsdi4*)
+ 
+-bsdi[45]*)
 -  version_type=linux
 -  need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -46491,13 +48037,13 @@
 -  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
 -  # libtool to hard-code these into programs
 -  ;;
--
+ 
 -cygwin* | mingw* | pw32*)
 -  version_type=windows
--  shrext=".dll"
+-  shrext_cmds=".dll"
 -  need_version=no
 -  need_lib_prefix=no
--
+ 
 -  case $GCC,$host_os in
 -  yes,cygwin* | yes,mingw* | yes,pw32*)
 -    library_names_spec='$libname.dll.a'
@@ -46506,12 +48052,13 @@
 -      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
 -      dldir=$destdir/`dirname \$dlpath`~
 -      test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
+-      $install_prog $dir/$dlname \$dldir/$dlname~
+-      chmod a+x \$dldir/$dlname'
 -    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 -      dlpath=$dir/\$dldll~
 -       $rm \$dlpath'
 -    shlibpath_overrides_runpath=yes
--
+ 
 -    case $host_os in
 -    cygwin*)
 -      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
@@ -46536,11 +48083,41 @@
 -      ;;
 -    pw32*)
 -      # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 -      ;;
 -    esac
 -    ;;
--
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
++$as_echo_n "checking for file... " >&6; }
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<_LT_EOF 1>&2
+ 
 -  *)
 -    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
 -    ;;
@@ -46548,8 +48125,38 @@
 -  dynamic_linker='Win32 ld.exe'
 -  # FIXME: first we should search . and the directory the executable is in
 -  shlibpath_var=PATH
--  ;;
--
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++_LT_EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
+   ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
++$as_echo "$MAGIC_CMD" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
+ 
 -darwin* | rhapsody*)
 -  dynamic_linker="$host_os dyld"
 -  version_type=darwin
@@ -46559,16 +48166,18 @@
 -  soname_spec='${libname}${release}${major}$shared_ext'
 -  shlibpath_overrides_runpath=yes
 -  shlibpath_var=DYLD_LIBRARY_PATH
--  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 -  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
 -  if test "$GCC" = yes; then
 -    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
--  else
+   else
 -    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
--  fi
++    MAGIC_CMD=:
+   fi
 -  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 -  ;;
--
++fi
+ 
 -dgux*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -46576,12 +48185,15 @@
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
++  fi
+   ;;
++esac
+ 
 -freebsd1*)
 -  dynamic_linker=no
 -  ;;
--
++# Use C for the default configuration in the libtool script
+ 
 -kfreebsd*-gnu)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -46593,9 +48205,24 @@
 -  hardcode_into_libs=yes
 -  dynamic_linker='GNU ld.so'
 -  ;;
--
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++lt_save_CC="$CC"
++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
+ 
+-freebsd* | dragonfly*)
+-  # DragonFly does not have aout.  When/if they implement a new
+-  # versioning mechanism, adjust this.
+-  if test -x /usr/bin/objformat; then
+-    objformat=`/usr/bin/objformat`
+-  else
+-    case $host_os in
+-    freebsd[123]*) objformat=aout ;;
+-    *) objformat=elf ;;
+-    esac
+-  fi
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
@@ -46613,14 +48240,19 @@
 -  freebsd2*)
 -    shlibpath_overrides_runpath=yes
 -    ;;
--  freebsd3.01* | freebsdelf3.01*)
+-  freebsd3.[01]* | freebsdelf3.[01]*)
 -    shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
 -    ;;
--  *) # from 3.2 on
+-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
 -    shlibpath_overrides_runpath=no
 -    hardcode_into_libs=yes
 -    ;;
+-  freebsd*) # from 4.6 on
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
 -  esac
 -  ;;
 -
@@ -46640,9 +48272,9 @@
 -  version_type=sunos
 -  need_lib_prefix=no
 -  need_version=no
--  case "$host_cpu" in
+-  case $host_cpu in
 -  ia64*)
--    shrext='.so'
+-    shrext_cmds='.so'
 -    hardcode_into_libs=yes
 -    dynamic_linker="$host_os dld.so"
 -    shlibpath_var=LD_LIBRARY_PATH
@@ -46657,7 +48289,7 @@
 -    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 -    ;;
 -   hppa*64*)
--     shrext='.sl'
+-     shrext_cmds='.sl'
 -     hardcode_into_libs=yes
 -     dynamic_linker="$host_os dld.sl"
 -     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -46668,7 +48300,7 @@
 -     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 -     ;;
 -   *)
--    shrext='.sl'
+-    shrext_cmds='.sl'
 -    dynamic_linker="$host_os dld.sl"
 -    shlibpath_var=SHLIB_PATH
 -    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -46680,6 +48312,18 @@
 -  postinstall_cmds='chmod 555 $lib'
 -  ;;
 -
+-interix3*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  ;;
+-
 -irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -    nonstopux*) version_type=nonstopux ;;
@@ -46716,12 +48360,14 @@
 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 -  hardcode_into_libs=yes
 -  ;;
--
+ 
 -# No shared lib support for Linux oldld, aout, or coff.
 -linux*oldld* | linux*aout* | linux*coff*)
 -  dynamic_linker=no
 -  ;;
--
++# Source file extension for C test sources.
++ac_ext=c
+ 
 -# This must be Linux ELF.
 -linux*)
 -  version_type=linux
@@ -46736,13 +48382,41 @@
 -  # Some rework will be needed to allow for fast_install
 -  # before this can be enabled.
 -  hardcode_into_libs=yes
--
++# Object file extension for compiled C test sources.
++objext=o
++objext=$objext
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 9231 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
 -  # Append ld.so.conf contents to the search path
 -  if test -f /etc/ld.so.conf; then
--    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
 -  fi
--
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
+ 
 -  # 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,
@@ -46751,7 +48425,7 @@
 -  # assume the GNU/Linux dynamic linker is in use.
 -  dynamic_linker='GNU/Linux ld.so'
 -  ;;
--
+ 
 -knetbsd*-gnu)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -46763,7 +48437,7 @@
 -  hardcode_into_libs=yes
 -  dynamic_linker='GNU ld.so'
 -  ;;
--
+ 
 -netbsd*)
 -  version_type=sunos
 -  need_lib_prefix=no
@@ -46781,14 +48455,14 @@
 -  shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
 -  ;;
--
+ 
 -newsos6)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  ;;
--
+ 
 -nto-qnx*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -46798,11 +48472,16 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  ;;
--
+ 
 -openbsd*)
 -  version_type=sunos
+-  sys_lib_dlsearch_path_spec="/usr/lib"
 -  need_lib_prefix=no
--  need_version=yes
+-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+-  case $host_os in
+-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+-    *)                         need_version=no  ;;
+-  esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 -  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 -  shlibpath_var=LD_LIBRARY_PATH
@@ -46819,16 +48498,18 @@
 -    shlibpath_overrides_runpath=yes
 -  fi
 -  ;;
--
+ 
 -os2*)
 -  libname_spec='$name'
--  shrext=".dll"
+-  shrext_cmds=".dll"
 -  need_lib_prefix=no
 -  library_names_spec='$libname${shared_ext} $libname.a'
 -  dynamic_linker='OS/2 ld.exe'
 -  shlibpath_var=LIBPATH
 -  ;;
--
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
 -osf3* | osf4* | osf5*)
 -  version_type=osf
 -  need_lib_prefix=no
@@ -46839,14 +48520,9 @@
 -  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
 -  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
 -  ;;
--
--sco3.2v5*)
--  version_type=osf
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
 -solaris*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -46859,7 +48535,9 @@
 -  # ldd complains unless libraries are executable
 -  postinstall_cmds='chmod +x $lib'
 -  ;;
--
++# Allow CC to be a program name with arguments.
++compiler=$CC
+ 
 -sunos4*)
 -  version_type=sunos
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -46871,8 +48549,11 @@
 -  fi
 -  need_version=yes
 -  ;;
--
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++# Save the default compiler, since it gets overwritten when the other
++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
++compiler_DEFAULT=$CC
+ 
+-sysv4 | sysv4.3*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -  soname_spec='${libname}${release}${shared_ext}$major'
@@ -46895,7 +48576,13 @@
 -      ;;
 -  esac
 -  ;;
--
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$RM conftest*
+ 
 -sysv4*MP*)
 -  if test -d /usr/nec ;then
 -    version_type=linux
@@ -46904,14 +48591,43 @@
 -    shlibpath_var=LD_LIBRARY_PATH
 -  fi
 -  ;;
--
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$RM -r conftest*
+ 
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  version_type=freebsd-elf
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  if test "$with_gnu_ld" = yes; then
+-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+-    shlibpath_overrides_runpath=no
+-  else
+-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+-    shlibpath_overrides_runpath=yes
+-    case $host_os in
+-      sco3.2v5*)
+-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+-	;;
+-    esac
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/lib'
+-  ;;
+ 
 -uts4*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
--
++if test -n "$compiler"; then
+ 
 -*)
 -  dynamic_linker=no
 -  ;;
@@ -46919,14 +48635,26 @@
 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6
 -test "$dynamic_linker" = no && can_build_shared=no
++lt_prog_compiler_no_builtin_flag=
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
 -
 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 -hardcode_action=
 -if test -n "$hardcode_libdir_flag_spec" || \
--   test -n "$runpath_var " || \
--   test "X$hardcode_automatic"="Xyes" ; then
--
+-   test -n "$runpath_var" || \
+-   test "X$hardcode_automatic" = "Xyes" ; then
++  case $cc_basename in
++  nvcc*)
++    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
++  *)
++    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
++  esac
+ 
 -  # We can hardcode non-existant directories.
 -  if test "$hardcode_direct" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -46940,14 +48668,46 @@
 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 -    hardcode_action=immediate
 -  fi
--else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
++if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  # We cannot hardcode anything, or else we can only hardcode existing
 -  # directories.
 -  hardcode_action=unsupported
 -fi
 -echo "$as_me:$LINENO: result: $hardcode_action" >&5
 -echo "${ECHO_T}$hardcode_action" >&6
--
++  lt_cv_prog_compiler_rtti_exceptions=no
++   ac_outfile=conftest.$ac_objext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -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:$LINENO: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $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 other than the usual output.
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $RM conftest*
+ 
 -if test "$hardcode_action" = relink; then
 -  # Fast installation is not supported
 -  enable_fast_install=no
@@ -46955,8 +48715,10 @@
 -     test "$enable_shared" = no; then
 -  # Fast installation is not necessary
 -  enable_fast_install=needless
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ 
 -striplib=
 -old_striplib=
 -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
@@ -46966,7 +48728,9 @@
 -  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
 -  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
--else
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+ else
 -# FIXME - insert some real tests, host_os isn't really good enough
 -  case $host_os in
 -   darwin*)
@@ -46977,15 +48741,17 @@
 -       else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
--fi
++    :
+ fi
 -       ;;
 -   *)
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 -    ;;
 -  esac
--fi
--
++
+ fi
+ 
 -if test "x$enable_dlopen" != xyes; then
 -  enable_dlopen=unknown
 -  enable_dlopen_self=unknown
@@ -46993,24 +48759,24 @@
 -else
 -  lt_cv_dlopen=no
 -  lt_cv_dlopen_libs=
--
+ 
 -  case $host_os in
 -  beos*)
 -    lt_cv_dlopen="load_add_on"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
 -    ;;
--
+ 
 -  mingw* | pw32*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
 -   ;;
--
+ 
 -  cygwin*)
 -    lt_cv_dlopen="dlopen"
 -    lt_cv_dlopen_libs=
 -   ;;
--
+ 
 -  darwin*)
 -  # if libdl is installed we need to link against it
 -    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
@@ -47026,7 +48792,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -47068,7 +48834,10 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  lt_prog_compiler_wl=
++lt_prog_compiler_pic=
++lt_prog_compiler_static=
+ 
 -ac_cv_lib_dl_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -47080,15 +48849,40 @@
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
--
+ 
 -    lt_cv_dlopen="dyld"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
--
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl='-Wl,'
++    lt_prog_compiler_static='-static'
+ 
 -fi
--
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
+ 
 -   ;;
--
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            lt_prog_compiler_pic='-fPIC'
++        ;;
++      m68k)
++            # FIXME: we need at least 68020 code to build shared libraries, but
++            # adding the `-m68020' flag to GCC prevents building anything better,
++            # like `-m68040'.
++            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
++        ;;
++      esac
++      ;;
+ 
 -  *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
@@ -47104,20 +48898,40 @@
 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define shl_load innocuous_shl_load
--
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shl_load (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic='-fno-common'
++      ;;
+ 
 -#undef shl_load
--
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      lt_prog_compiler_static=
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -47137,7 +48951,20 @@
 -#ifdef __cplusplus
 -}
 -#endif
--
++    hpux*)
++      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
++      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
++      # sets the default TLS model and affects inlining.
++      case $host_cpu in
++      hppa*64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='-fPIC'
++	;;
++      esac
++      ;;
+ 
 -int
 -main ()
 -{
@@ -47172,7 +48999,11 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    interix[3-9]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+ 
 -ac_cv_func_shl_load=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -47196,7 +49027,13 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared=no
++      enable_shared=no
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -47238,7 +49075,12 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      lt_prog_compiler_pic='-fPIC -shared'
++      ;;
+ 
 -ac_cv_lib_dld_shl_load=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -47264,20 +49106,52 @@
 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define dlopen innocuous_dlopen
--
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic=-Kconform_pic
++      fi
++      ;;
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++    *)
++      lt_prog_compiler_pic='-fPIC'
++      ;;
++    esac
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++    case $cc_basename in
++    nvcc*) # Cuda Compiler Driver 2.2
++      lt_prog_compiler_wl='-Xlinker '
++      lt_prog_compiler_pic='-Xcompiler -fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
++      else
++	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
+ 
 -#undef dlopen
--
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -47297,7 +49171,22 @@
 -#ifdef __cplusplus
 -}
 -#endif
--
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static='${wl}-a ${wl}archive'
++      ;;
+ 
 -int
 -main ()
 -{
@@ -47332,7 +49221,12 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static='-non_shared'
++      ;;
+ 
 -ac_cv_func_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -47356,7 +49250,70 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
++      case $cc_basename in
++      # old Intel for x86_64 which still supported -KPIC.
++      ecc*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-KPIC'
++	lt_prog_compiler_static='-static'
++        ;;
++      # icc used to be incompatible with GCC.
++      # ICC 10 doesn't accept -KPIC any more.
++      icc* | ifort*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fPIC'
++	lt_prog_compiler_static='-static'
++        ;;
++      # Lahey Fortran 8.1.
++      lf95*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='--shared'
++	lt_prog_compiler_static='--static'
++	;;
++      nagfor*)
++	# NAG Fortran compiler
++	lt_prog_compiler_wl='-Wl,-Wl,,'
++	lt_prog_compiler_pic='-PIC'
++	lt_prog_compiler_static='-Bstatic'
++	;;
++      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fpic'
++	lt_prog_compiler_static='-Bstatic'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static='-non_shared'
++        ;;
++      xl* | bgxl* | bgf* | mpixl*)
++	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-qpic'
++	lt_prog_compiler_static='-qstaticlink'
++	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ F* | *Sun*Fortran*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl=''
++	  ;;
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl='-Wl,'
++	  ;;
++	esac
++	;;
++      esac
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -47398,7 +49355,11 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    newsos6)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
 -ac_cv_lib_dl_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -47423,7 +49384,12 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      lt_prog_compiler_pic='-fPIC -shared'
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -47465,7 +49431,12 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static='-non_shared'
++      ;;
+ 
 -ac_cv_lib_svld_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -47490,7 +49461,10 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    rdos*)
++      lt_prog_compiler_static='-non_shared'
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -47532,7 +49506,17 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    solaris*)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
++	lt_prog_compiler_wl='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl='-Wl,';;
++      esac
++      ;;
+ 
 -ac_cv_lib_dld_dld_link=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -47544,42 +49528,144 @@
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
--
--
--fi
--
--
++    sunos4*)
++      lt_prog_compiler_wl='-Qoption ld '
++      lt_prog_compiler_pic='-PIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
 -fi
--
--
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic='-Kconform_pic'
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
+ 
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
 -fi
--
--
++    unicos*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_can_build_shared=no
++      ;;
+ 
++    uts4*)
++      lt_prog_compiler_pic='-pic'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
 -fi
--
--
++    *)
++      lt_prog_compiler_can_build_shared=no
++      ;;
++    esac
++  fi
+ 
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic=
++    ;;
++  *)
++    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
++    ;;
++esac
+ 
 -fi
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
++$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++if ${lt_cv_prog_compiler_pic+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
++$as_echo "$lt_cv_prog_compiler_pic" >&6; }
++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+ 
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
++if ${lt_cv_prog_compiler_pic_works+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_prog_compiler_pic_works=no
++   ac_outfile=conftest.$ac_objext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -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:$LINENO: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $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 other than the usual output.
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_pic_works=yes
++     fi
++   fi
++   $RM conftest*
+ 
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
++$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+ 
 -    ;;
 -  esac
--
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
++    case $lt_prog_compiler_pic in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
++     esac
++else
++    lt_prog_compiler_pic=
++     lt_prog_compiler_can_build_shared=no
++fi
+ 
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
 -    enable_dlopen=no
 -  fi
--
++fi
+ 
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
 -    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
+ 
 -    save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
+-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
--
+ 
 -    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
 -if test "${lt_cv_dlopen_self+set}" = set; then
@@ -47591,15 +49677,15 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 9775 "configure"
+-#line 10128 "configure"
 -#include "confdefs.h"
--
+ 
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
--
+ 
 -#include <stdio.h>
--
+ 
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -47609,7 +49695,7 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
--
+ 
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -47631,24 +49717,56 @@
 -#    endif
 -#  endif
 -#endif
--
+ 
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
--
+ 
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
--
+ 
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
--
+-  else
+-    puts (dlerror ());
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++if ${lt_cv_prog_compiler_static_works+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_prog_compiler_static_works=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_cv_prog_compiler_static_works=yes
++       fi
++     else
++       lt_cv_prog_compiler_static_works=yes
++     fi
++   fi
++   $RM -r conftest*
++   LDFLAGS="$save_LDFLAGS"
+ 
 -    exit (status);
 -}
 -EOF
@@ -47657,27 +49775,33 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
+-    (./conftest; exit; ) >&5 2>/dev/null
 -    lt_status=$?
 -    case x$lt_status in
 -      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
 -      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
 -    esac
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self=no
 -  fi
--fi
+ fi
 -rm -fr conftest*
 -
--
--fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
++$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+ 
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
++    :
++else
++    lt_prog_compiler_static=
+ fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6
--
+ 
 -    if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
+-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 -      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
 -if test "${lt_cv_dlopen_self_static+set}" = set; then
@@ -47689,15 +49813,15 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 9873 "configure"
+-#line 10228 "configure"
 -#include "confdefs.h"
--
+ 
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
--
+ 
 -#include <stdio.h>
--
+ 
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -47707,7 +49831,7 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
--
+ 
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -47746,7 +49870,9 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
--
+-  else
+-    puts (dlerror ());
+ 
 -    exit (status);
 -}
 -EOF
@@ -47755,12 +49881,12 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
+-    (./conftest; exit; ) >&5 2>/dev/null
 -    lt_status=$?
 -    case x$lt_status in
 -      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
 -      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
 -    esac
 -  else :
 -    # compilation failed
@@ -47768,8 +49894,19 @@
 -  fi
 -fi
 -rm -fr conftest*
--
--
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++if ${lt_cv_prog_compiler_c_o+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $RM -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
@@ -47785,15 +49922,50 @@
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
--
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $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
++     # So say no if there are warnings
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_c_o=yes
++     fi
++   fi
++   chmod u+w . 2>&5
++   $RM conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++   $RM out/* && rmdir out
++   cd ..
++   $RM -r conftest
++   $RM conftest*
+ 
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
 -  esac
--fi
--
--
--# Report which librarie types wil actually be built
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
++$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ 
+ 
+-# Report which library types will actually be built
 -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
 -echo "$as_me:$LINENO: result: $can_build_shared" >&5
@@ -47805,7 +49977,7 @@
 -
 -# On AIX, shared libraries and static libraries use the same namespace, and
 -# are all built from PIC.
--case "$host_os" in
+-case $host_os in
 -aix3*)
 -  test "$enable_shared" = yes && enable_static=no
 -  if test -n "$RANLIB"; then
@@ -47814,47 +49986,10 @@
 -  fi
 -  ;;
 -
--aix4*)
+-aix4* | aix5*)
 -  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 -    test "$enable_shared" = yes && enable_static=no
 -  fi
--  ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    archive_cmds_need_lc=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--      ;;
--    esac
--    output_verbose_link_cmd='echo'
--    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct=no
--    hardcode_automatic=yes
--    hardcode_shlibpath_var=unsupported
--    whole_archive_flag_spec='-all_load $convenience'
--    link_all_deplibs=yes
--  else
--    ld_shlibs=no
--  fi
 -    ;;
 -esac
 -echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -47880,7 +50015,7 @@
 -  # 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.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
 -    SED SHELL STRIP \
 -    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
 -    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -47946,13 +50081,13 @@
 -      ;;
 -    esac
 -  done
--
+ 
 -  case $lt_echo in
 -  *'\$0 --fallback-echo"')
 -    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
 -    ;;
 -  esac
--
+ 
 -cfgfile="${ofile}T"
 -  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
 -  $rm -f "$cfgfile"
@@ -47961,7 +50096,7 @@
 -
 -  cat <<__EOF__ >> "$cfgfile"
 -#! $SHELL
--
+ 
 -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 -# NOTE: Changes made to this file will be lost: look at ltmain.sh.
@@ -47984,350 +50119,1492 @@
 -#
 -# You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 -#
 -# As a special exception to the GNU General Public License, if you
 -# distribute this file as part of a program that contains a
 -# configuration script generated by Autoconf, you may include it under
 -# the same distribution terms that you use for the rest of that program.
--
+ 
 -# A sed program that does not truncate output.
 -SED=$lt_SED
--
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++if ${lt_cv_prog_compiler_c_o+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $RM -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
 -# Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
--
+-Xsed="$SED -e 1s/^X//"
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $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
++     # So say no if there are warnings
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_c_o=yes
++     fi
++   fi
++   chmod u+w . 2>&5
++   $RM conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++   $RM out/* && rmdir out
++   cd ..
++   $RM -r conftest
++   $RM conftest*
+ 
 -# The HP-UX ksh and POSIX shell print the target directory to stdout
 -# if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
--
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
++$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ 
 -# The names of the tagged configurations supported by this script.
 -available_tags=
--
+ 
 -# ### BEGIN LIBTOOL CONFIG
--
+ 
 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--
+ 
 -# Shell to use when invoking shell scripts.
 -SHELL=$lt_SHELL
--
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
++$as_echo_n "checking if we can lock with hard links... " >&6; }
++  hard_links=yes
++  $RM conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
++$as_echo "$hard_links" >&6; }
++  if test "$hard_links" = no; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
+ 
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
--
+ 
 -# Whether or not to build static libraries.
 -build_old_libs=$enable_static
--
+ 
 -# Whether or not to add -lc for building shared libraries.
 -build_libtool_need_lc=$archive_cmds_need_lc
--
+ 
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
--
+ 
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
--
+ 
 -# The host system.
 -host_alias=$host_alias
 -host=$host
--
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
--
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
--
--# A C compiler.
--LTCC=$lt_LTCC
--
--# A language-specific compiler.
--CC=$lt_compiler
--
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC
--
--# An ERE matcher.
--EGREP=$lt_EGREP
--
--# The linker used to build libraries.
--LD=$lt_LD
--
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
--
+-host_os=$host_os
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+ 
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
++  runpath_var=
++  allow_undefined_flag=
++  always_export_symbols=no
++  archive_cmds=
++  archive_expsym_cmds=
++  compiler_needs_object=no
++  enable_shared_with_static_runtimes=no
++  export_dynamic_flag_spec=
++  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  hardcode_automatic=no
++  hardcode_direct=no
++  hardcode_direct_absolute=no
++  hardcode_libdir_flag_spec=
++  hardcode_libdir_flag_spec_ld=
++  hardcode_libdir_separator=
++  hardcode_minus_L=no
++  hardcode_shlibpath_var=unsupported
++  inherit_rpath=no
++  link_all_deplibs=unknown
++  module_cmds=
++  module_expsym_cmds=
++  old_archive_from_new_cmds=
++  old_archive_from_expsyms_cmds=
++  thread_safe_flag_spec=
++  whole_archive_flag_spec=
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
++  extract_expsyms_cmds=
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++  case $host_os in
++  cygwin* | mingw* | pw32* | cegcc*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  linux* | k*bsd*-gnu | gnu*)
++    link_all_deplibs=no
++    ;;
++  esac
+ 
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
++  ld_shlibs=yes
+ 
+-# A C compiler.
+-LTCC=$lt_LTCC
++  # On some targets, GNU ld is compatible enough with the native linker
++  # that we're better off using the native interface for both.
++  lt_use_gnu_ld_interface=no
++  if test "$with_gnu_ld" = yes; then
++    case $host_os in
++      aix*)
++	# The AIX port of GNU ld has always aspired to compatibility
++	# with the native linker.  However, as the warning in the GNU ld
++	# block says, versions before 2.19.5* couldn't really create working
++	# shared libraries, regardless of the interface used.
++	case `$LD -v 2>&1` in
++	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
++	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
++	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
++	  *)
++	    lt_use_gnu_ld_interface=yes
++	    ;;
++	esac
++	;;
++      *)
++	lt_use_gnu_ld_interface=yes
++	;;
++    esac
++  fi
+ 
+-# LTCC compiler flags.
+-LTCFLAGS=$lt_LTCFLAGS
++  if test "$lt_use_gnu_ld_interface" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
+-# A language-specific compiler.
+-CC=$lt_compiler
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
++      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      whole_archive_flag_spec=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>&1` in
++      *GNU\ gold*) supports_anon_versioning=yes ;;
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
+ 
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix[3-9]*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
+ 
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
++*** Warning: the GNU linker, at least up to release 2.19, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to install binutils
++*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
++*** You will then need to restart the configuration process.
+ 
+-# An ERE matcher.
+-EGREP=$lt_EGREP
++_LT_EOF
++      fi
++      ;;
+ 
+-# The linker used to build libraries.
+-LD=$lt_LD
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            archive_expsym_cmds=''
++        ;;
++      m68k)
++            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++            hardcode_libdir_flag_spec='-L$libdir'
++            hardcode_minus_L=yes
++        ;;
++      esac
++      ;;
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
++    beos*)
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
+ 
 -# A BSD-compatible nm program.
 -NM=$lt_NM
--
++    cygwin* | mingw* | pw32* | cegcc*)
++      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec='-L$libdir'
++      export_dynamic_flag_spec='${wl}--export-all-symbols'
++      allow_undefined_flag=unsupported
++      always_export_symbols=no
++      enable_shared_with_static_runtimes=yes
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
++      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+ 
 -# A symbol stripping program
 -STRIP=$lt_STRIP
--
++      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# 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
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
+ 
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
--
++    haiku*)
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      link_all_deplibs=yes
++      ;;
+ 
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
--
++    interix[3-9]*)
++      hardcode_direct=no
++      hardcode_shlibpath_var=no
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
+ 
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
--
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
++      tmp_diet=no
++      if test "$host_os" = linux-dietlibc; then
++	case $cc_basename in
++	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
++	esac
++      fi
++      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
++	 && test "$tmp_diet" = no
++      then
++	tmp_addflag=' $pic_flag'
++	tmp_sharedflag='-shared'
++	case $cc_basename,$host_cpu in
++        pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95* | pgfortran*)
++					# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	lf95*)				# Lahey Fortran 8.1
++	  whole_archive_flag_spec=
++	  tmp_sharedflag='--shared' ;;
++	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
++	  tmp_sharedflag='-qmkshrobj'
++	  tmp_addflag= ;;
++	nvcc*)	# Cuda Compiler Driver 2.2
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  compiler_needs_object=yes
++	  ;;
++	esac
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  compiler_needs_object=yes
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	esac
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
 -# Used on cygwin: assembler.
--AS=$lt_AS
--
+-AS="$AS"
++        if test "x$supports_anon_versioning" = xyes; then
++          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
++	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++	    echo "local: *; };" >> $output_objdir/$libname.ver~
++	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++        fi
+ 
 -# The name of the directory that contains temporary libtool files.
 -objdir=$objdir
--
++	case $cc_basename in
++	xlf* | bgf* | bgxlf* | mpixlf*)
++	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
++	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
++	  hardcode_libdir_flag_spec=
++	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
++	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
++	  if test "x$supports_anon_versioning" = xyes; then
++	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
++	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++	      echo "local: *; };" >> $output_objdir/$libname.ver~
++	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++	  fi
++	  ;;
++	esac
++      else
++        ld_shlibs=no
++      fi
++      ;;
+ 
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
--
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
+ 
 -# How to pass a linker flag through the compiler.
 -wl=$lt_lt_prog_compiler_wl
--
++    solaris*)
++      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
+ 
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
--
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
+ 
 -# Old archive suffix (normally "a").
 -libext="$libext"
--
++_LT_EOF
++      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
+ 
 -# Shared library suffix (normally ".so").
--shrext='$shrext'
--
+-shrext_cmds='$shrext_cmds'
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
+ 
 -# Executable file suffix (normally "").
 -exeext="$exeext"
--
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
+ 
 -# Additional compiler flags for building library objects.
 -pic_flag=$lt_lt_prog_compiler_pic
 -pic_mode=$pic_mode
--
++_LT_EOF
++	;;
++	*)
++	  # For security reasons, it is highly recommended that you always
++	  # use absolute paths for naming shared libraries, and exclude the
++	  # DT_RUNPATH tag from executables and libraries.  But doing so
++	  # requires that you compile everything twice, which is a pain.
++	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  else
++	    ld_shlibs=no
++	  fi
++	;;
++      esac
++      ;;
+ 
 -# What is the maximum length of a command?
 -max_cmd_len=$lt_cv_sys_max_cmd_len
--
++    sunos4*)
++      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Does compiler simultaneously support -c and -o options?
 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o
--
--# Must we lock files when doing compilation ?
++    *)
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++    esac
+ 
+-# Must we lock files when doing compilation?
 -need_locks=$lt_need_locks
--
++    if test "$ld_shlibs" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec=
++      export_dynamic_flag_spec=
++      whole_archive_flag_spec=
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag=unsupported
++      always_export_symbols=yes
++      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L=yes
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct=unsupported
++      fi
++      ;;
+ 
 -# Do we need the lib prefix for modules?
 -need_lib_prefix=$need_lib_prefix
--
++    aix[4-9]*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	# Also, AIX nm treats weak defined symbols like other global
++	# defined symbols, whereas GNU nm marks them as "W".
++	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
++	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	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
++	aix_use_runtimelinking=no
+ 
 -# Do we need a version for libraries?
 -need_version=$need_version
--
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
++	  for ld_flag in $LDFLAGS; do
++	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++	    aix_use_runtimelinking=yes
++	    break
++	  fi
++	  done
++	  ;;
++	esac
+ 
 -# Whether dlopen is supported.
 -dlopen_support=$enable_dlopen
--
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
+ 
 -# Whether dlopen of programs is supported.
 -dlopen_self=$enable_dlopen_self
--
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
 -# Whether dlopen of statically linked programs is supported.
 -dlopen_self_static=$enable_dlopen_self_static
--
++      archive_cmds=''
++      hardcode_direct=yes
++      hardcode_direct_absolute=yes
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++      file_list_spec='${wl}-f,'
+ 
 -# Compiler flag to prevent dynamic linking.
 -link_static_flag=$lt_lt_prog_compiler_static
--
++      if test "$GCC" = yes; then
++	case $host_os in aix4.[012]|aix4.[012].*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" &&
++	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
++	  then
++	  # We have reworked collect2
++	  :
++	  else
++	  # We have old collect2
++	  hardcode_direct=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  hardcode_minus_L=yes
++	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_libdir_separator=
++	  fi
++	  ;;
++	esac
++	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
++	link_all_deplibs=no
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++	  fi
++	fi
++      fi
+ 
 -# Compiler flag to turn off builtin functions.
 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
--
++      export_dynamic_flag_spec='${wl}-bexpall'
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols=yes
++      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.
++	allow_undefined_flag='-berok'
++        # Determine the default libpath from the value encoded in an
++        # empty executable.
++        if test "${lt_cv_aix_libpath+set}" = set; then
++  aix_libpath=$lt_cv_aix_libpath
++else
++  if ${lt_cv_aix_libpath_+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 -# Compiler flag to allow reflexive dlopens.
 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
--
++int
++main ()
++{
+ 
 -# Compiler flag to generate shared objects directly from archives.
 -whole_archive_flag_spec=$lt_whole_archive_flag_spec
--
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
+ 
 -# Compiler flag to generate thread-safe objects.
 -thread_safe_flag_spec=$lt_thread_safe_flag_spec
--
++  lt_aix_libpath_sed='
++      /Import File Strings/,/^$/ {
++	  /^0/ {
++	      s/^0  *\([^ ]*\) *$/\1/
++	      p
++	  }
++      }'
++  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  # Check for a 64-bit object if we didn't find anything.
++  if test -z "$lt_cv_aix_libpath_"; then
++    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  fi
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++  if test -z "$lt_cv_aix_libpath_"; then
++    lt_cv_aix_libpath_="/usr/lib:/lib"
++  fi
+ 
 -# Library versioning type.
 -version_type=$version_type
--
--# Format of library name prefix.
++fi
+ 
+-# Format of library name prefix.
 -libname_spec=$lt_libname_spec
--
++  aix_libpath=$lt_cv_aix_libpath_
++fi
+ 
 -# List of archive names.  First name is the real one, the rest are links.
 -# The last name is the one that the linker finds with -lNAME.
 -library_names_spec=$lt_library_names_spec
--
++        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++      else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag="-z nodefs"
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an
++	 # empty executable.
++	 if test "${lt_cv_aix_libpath+set}" = set; then
++  aix_libpath=$lt_cv_aix_libpath
++else
++  if ${lt_cv_aix_libpath_+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 -# The coded name of the library, if different from the real name.
 -soname_spec=$lt_soname_spec
--
++int
++main ()
++{
+ 
 -# Commands used to build and install an old-style archive.
 -RANLIB=$lt_RANLIB
 -old_archive_cmds=$lt_old_archive_cmds
 -old_postinstall_cmds=$lt_old_postinstall_cmds
 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
--
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
+ 
 -# Create an old-style archive from a shared archive.
 -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
--
++  lt_aix_libpath_sed='
++      /Import File Strings/,/^$/ {
++	  /^0/ {
++	      s/^0  *\([^ ]*\) *$/\1/
++	      p
++	  }
++      }'
++  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  # Check for a 64-bit object if we didn't find anything.
++  if test -z "$lt_cv_aix_libpath_"; then
++    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  fi
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++  if test -z "$lt_cv_aix_libpath_"; then
++    lt_cv_aix_libpath_="/usr/lib:/lib"
++  fi
+ 
 -# Create a temporary old-style archive to link instead of a shared archive.
 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
--
++fi
+ 
 -# Commands used to build and install a shared archive.
 -archive_cmds=$lt_archive_cmds
 -archive_expsym_cmds=$lt_archive_expsym_cmds
 -postinstall_cmds=$lt_postinstall_cmds
 -postuninstall_cmds=$lt_postuninstall_cmds
--
++  aix_libpath=$lt_cv_aix_libpath_
++fi
+ 
 -# Commands used to build a loadable module (assumed same as above if empty)
 -module_cmds=$lt_module_cmds
 -module_expsym_cmds=$lt_module_expsym_cmds
--
++	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag=' ${wl}-bernotok'
++	  allow_undefined_flag=' ${wl}-berok'
++	  if test "$with_gnu_ld" = yes; then
++	    # We only use this code for GNU lds that support --whole-archive.
++	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	  else
++	    # Exported symbols can be pulled into shared objects from archives
++	    whole_archive_flag_spec='$convenience'
++	  fi
++	  archive_cmds_need_lc=yes
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
+ 
 -# Commands to strip libraries.
 -old_striplib=$lt_old_striplib
 -striplib=$lt_striplib
--
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            archive_expsym_cmds=''
++        ;;
++      m68k)
++            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++            hardcode_libdir_flag_spec='-L$libdir'
++            hardcode_minus_L=yes
++        ;;
++      esac
++      ;;
+ 
 -# Dependencies to place before the objects being linked to create a
 -# shared library.
--predep_objects=$lt_predep_objects
+-predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 -
 -# Dependencies to place after the objects being linked to create a
 -# shared library.
--postdep_objects=$lt_postdep_objects
--
+-postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++    bsdi[45]*)
++      export_dynamic_flag_spec=-rdynamic
++      ;;
+ 
 -# Dependencies to place before the objects being linked to create a
 -# shared library.
 -predeps=$lt_predeps
--
++    cygwin* | mingw* | pw32* | cegcc*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      case $cc_basename in
++      cl*)
++	# Native MSVC
++	hardcode_libdir_flag_spec=' '
++	allow_undefined_flag=unsupported
++	always_export_symbols=yes
++	file_list_spec='@'
++	# Tell ltmain to make .lib files, not .a files.
++	libext=lib
++	# Tell ltmain to make .dll files, not .so files.
++	shrext_cmds=".dll"
++	# FIXME: Setting linknames here is a bad hack.
++	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++	  else
++	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++	  fi~
++	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++	  linknames='
++	# The linker will not automatically build a static lib if we build a DLL.
++	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
++	enable_shared_with_static_runtimes=yes
++	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
++	# Don't use ranlib
++	old_postinstall_cmds='chmod 644 $oldlib'
++	postlink_cmds='lt_outputfile="@OUTPUT@"~
++	  lt_tool_outputfile="@TOOL_OUTPUT@"~
++	  case $lt_outputfile in
++	    *.exe|*.EXE) ;;
++	    *)
++	      lt_outputfile="$lt_outputfile.exe"
++	      lt_tool_outputfile="$lt_tool_outputfile.exe"
++	      ;;
++	  esac~
++	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++	    $RM "$lt_outputfile.manifest";
++	  fi'
++	;;
++      *)
++	# Assume MSVC wrapper
++	hardcode_libdir_flag_spec=' '
++	allow_undefined_flag=unsupported
++	# Tell ltmain to make .lib files, not .a files.
++	libext=lib
++	# Tell ltmain to make .dll files, not .so files.
++	shrext_cmds=".dll"
++	# FIXME: Setting linknames here is a bad hack.
++	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
++	# 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.
++	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
++	enable_shared_with_static_runtimes=yes
++	;;
++      esac
++      ;;
+ 
 -# Dependencies to place after the objects being linked to create a
 -# shared library.
 -postdeps=$lt_postdeps
--
++    darwin* | rhapsody*)
+ 
 -# The library search path used internally by the compiler when linking
 -# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path
--
+-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+ 
 -# Method to check whether dependent libraries are shared objects.
 -deplibs_check_method=$lt_deplibs_check_method
--
++  archive_cmds_need_lc=no
++  hardcode_direct=no
++  hardcode_automatic=yes
++  hardcode_shlibpath_var=unsupported
++  if test "$lt_cv_ld_force_load" = "yes"; then
++    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++  else
++    whole_archive_flag_spec=''
++  fi
++  link_all_deplibs=yes
++  allow_undefined_flag="$_lt_dar_allow_undefined"
++  case $cc_basename in
++     ifort*) _lt_dar_can_shared=yes ;;
++     *) _lt_dar_can_shared=$GCC ;;
++  esac
++  if test "$_lt_dar_can_shared" = "yes"; then
++    output_verbose_link_cmd=func_echo_all
++    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ 
 -# Command to use when deplibs_check_method == file_magic.
 -file_magic_cmd=$lt_file_magic_cmd
--
++  else
++  ld_shlibs=no
++  fi
+ 
 -# Flag that allows shared libraries with undefined symbols to be built.
 -allow_undefined_flag=$lt_allow_undefined_flag
--
++      ;;
+ 
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_no_undefined_flag
--
++    dgux*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Commands used to finish a libtool library installation in a directory.
 -finish_cmds=$lt_finish_cmds
--
++    freebsd1*)
++      ld_shlibs=no
++      ;;
+ 
 -# Same as above, but a single script fragment to be evaled but not shown.
 -finish_eval=$lt_finish_eval
--
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Take the output of nm and produce a listing of raw symbols and C names.
 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Transform the output of nm in a proper C declaration
 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | dragonfly*)
++      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Transform the output of nm in a C name address pair
 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      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
++      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_direct=yes
+ 
 -# This is the shared library runtime path variable.
 -runpath_var=$runpath_var
--
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L=yes
++      export_dynamic_flag_spec='${wl}-E'
++      ;;
+ 
 -# This is the shared library path variable.
 -shlibpath_var=$shlibpath_var
--
++    hpux10*)
++      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	hardcode_libdir_flag_spec_ld='+b $libdir'
++	hardcode_libdir_separator=:
++	hardcode_direct=yes
++	hardcode_direct_absolute=yes
++	export_dynamic_flag_spec='${wl}-E'
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	hardcode_minus_L=yes
++      fi
++      ;;
+ 
 -# Is shlibpath searched before the hard-coded library search path?
 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--
++    hpux11*)
++      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
+ 
 -# How to hardcode a shared library path into an executable.
 -hardcode_action=$hardcode_action
--
++	  # Older versions of the 11.00 compiler do not understand -b yet
++	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
++$as_echo_n "checking if $CC understands -b... " >&6; }
++if ${lt_cv_prog_compiler__b+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_prog_compiler__b=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS -b"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_cv_prog_compiler__b=yes
++       fi
++     else
++       lt_cv_prog_compiler__b=yes
++     fi
++   fi
++   $RM -r conftest*
++   LDFLAGS="$save_LDFLAGS"
+ 
 -# Whether we should hardcode library paths into libraries.
 -hardcode_into_libs=$hardcode_into_libs
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
++$as_echo "$lt_cv_prog_compiler__b" >&6; }
+ 
 -# Flag to hardcode \$libdir into a binary during linking.
 -# This must work even if \$libdir does not exist.
 -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
--
++if test x"$lt_cv_prog_compiler__b" = xyes; then
++    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++else
++    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++fi
+ 
 -# If ld is used when linking, flag to hardcode \$libdir into
 -# a binary during linking. This must work even if \$libdir does
 -# not exist.
 -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
--
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator=:
+ 
 -# Whether we need a single -rpath flag with a separated argument.
 -hardcode_libdir_separator=$lt_hardcode_libdir_separator
--
++	case $host_cpu in
++	hppa*64*|ia64*)
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++	  ;;
++	*)
++	  hardcode_direct=yes
++	  hardcode_direct_absolute=yes
++	  export_dynamic_flag_spec='${wl}-E'
+ 
 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
 -# resulting binary.
 -hardcode_direct=$hardcode_direct
--
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	esac
++      fi
++      ;;
+ 
 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 -# resulting binary.
 -hardcode_minus_L=$hardcode_minus_L
--
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	# Try to use the -exported_symbol ld option, if it does not
++	# work, assume that -exports_file does not work either and
++	# implicitly export all symbols.
++	# This should be the same for all languages, so no per-tag cache variable.
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
++if ${lt_cv_irix_exported_symbol+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  save_LDFLAGS="$LDFLAGS"
++	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++int foo (void) { return 0; }
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  lt_cv_irix_exported_symbol=yes
++else
++  lt_cv_irix_exported_symbol=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++           LDFLAGS="$save_LDFLAGS"
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
++$as_echo "$lt_cv_irix_exported_symbol" >&6; }
++	if test "$lt_cv_irix_exported_symbol" = yes; then
++          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++	fi
++      else
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++      fi
++      archive_cmds_need_lc='no'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      inherit_rpath=yes
++      link_all_deplibs=yes
++      ;;
+ 
 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 -# the resulting binary.
 -hardcode_shlibpath_var=$hardcode_shlibpath_var
--
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Set to yes if building a shared library automatically hardcodes DIR into the library
 -# and all subsequent libraries and executables linked against it.
 -hardcode_automatic=$hardcode_automatic
--
++    newsos6)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Variables whose values should be saved in libtool wrapper scripts and
 -# restored at relink time.
 -variables_saved_for_relink="$variables_saved_for_relink"
--
++    *nto* | *qnx*)
++      ;;
+ 
 -# Whether libtool must link a program against all its dependency libraries.
 -link_all_deplibs=$link_all_deplibs
--
++    openbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	hardcode_direct_absolute=yes
++	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++	fi
++      else
++	ld_shlibs=no
++      fi
++      ;;
+ 
 -# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
--
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++    os2*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      allow_undefined_flag=unsupported
++      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
+ 
 -# Run-time system search path for libraries
 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      archive_cmds_need_lc='no'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
+ 
 -# Fix the shell variable \$srcfile for the compiler.
 -fix_srcfile_path="$fix_srcfile_path"
--
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
++	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ 
 -# Set to yes if exported symbols are required.
 -always_export_symbols=$always_export_symbols
--
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      archive_cmds_need_lc='no'
++      hardcode_libdir_separator=:
++      ;;
+ 
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_export_symbols_cmds
--
++    solaris*)
++      no_undefined_flag=' -z defs'
++      if test "$GCC" = yes; then
++	wlarc='${wl}'
++	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++      else
++	case `$CC -V 2>&1` in
++	*"Compilers 5.0"*)
++	  wlarc=''
++	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++	  ;;
++	*)
++	  wlarc='${wl}'
++	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++	  ;;
++	esac
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_shlibpath_var=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *)
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
++	fi
++	;;
++      esac
++      link_all_deplibs=yes
++      ;;
+ 
 -# The commands to extract the exported symbol list from a shared archive.
 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
--
++    sunos4*)
++      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.
++	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Symbols that should not be listed in the preloaded symbols.
 -exclude_expsyms=$lt_exclude_expsyms
--
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds='$CC -r -o $output$reload_objs'
++	  hardcode_direct=no
++        ;;
++	motorola)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms
--
++    sysv4.3*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='-Bexport'
++      ;;
+ 
 -# ### END LIBTOOL CONFIG
--
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs=yes
++      fi
++      ;;
+ 
 -__EOF__
--
--
--  case $host_os in
--  aix3*)
--    cat <<\EOF >> "$cfgfile"
--
--# AIX sometimes has problems with the GCC collect2 program.  For some
--# reason, if we set the COLLECT_NAMES environment variable, the problems
--# vanish in a puff of smoke.
--if test "X${COLLECT_NAMES+set}" != Xset; then
--  COLLECT_NAMES=
--  export COLLECT_NAMES
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++      no_undefined_flag='${wl}-z,text'
++      archive_cmds_need_lc=no
++      hardcode_shlibpath_var=no
++      runpath_var='LD_RUN_PATH'
+ 
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
+ 
+-  case $host_os in
+-  aix3*)
+-    cat <<\EOF >> "$cfgfile"
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      no_undefined_flag='${wl}-z,text'
++      allow_undefined_flag='${wl}-z,nodefs'
++      archive_cmds_need_lc=no
++      hardcode_shlibpath_var=no
++      hardcode_libdir_flag_spec='${wl}-R,$libdir'
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++      export_dynamic_flag_spec='${wl}-Bexport'
++      runpath_var='LD_RUN_PATH'
+ 
+-# AIX sometimes has problems with the GCC collect2 program.  For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+-  COLLECT_NAMES=
+-  export COLLECT_NAMES
 -fi
 -EOF
 -    ;;
 -  esac
--
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
+ 
 -  # We use sed instead of cat because bash on DJGPP gets confused if
 -  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
 -  # text mode, it properly converts lines to CR/LF.  This bash problem
 -  # is reportedly fixed, but why not run on old versions too?
 -  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
--
++    uts4*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -  mv -f "$cfgfile" "$ofile" || \
 -    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 -  chmod +x "$ofile"
--
++    *)
++      ld_shlibs=no
++      ;;
++    esac
+ 
 -else
 -  # If there is no Makefile yet, we rely on a make rule to execute
 -  # `config.status --recheck' to rerun these tests and create the
@@ -48335,31 +51612,42 @@
 -  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 -  if test -f "$ltmain_in"; then
 -    test -f Makefile && make "$ltmain"
--  fi
++    if test x$host_vendor = xsni; then
++      case $host in
++      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++	export_dynamic_flag_spec='${wl}-Blargedynsym'
++	;;
++      esac
++    fi
+   fi
 -fi
--
--
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
++$as_echo "$ld_shlibs" >&6; }
++test "$ld_shlibs" = no && can_build_shared=no
+ 
 -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
--
++with_gnu_ld=$with_gnu_ld
+ 
 -CC="$lt_save_CC"
--
--
+ 
+ 
 -# Check whether --with-tags or --without-tags was given.
 -if test "${with_tags+set}" = set; then
 -  withval="$with_tags"
 -  tagnames="$withval"
 -fi;
--
+ 
 -if test -f "$ltmain" && test -n "$tagnames"; then
 -  if test ! -f "${ofile}"; then
 -    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
 -echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
 -  fi
--
+ 
 -  if test -z "$LTCC"; then
 -    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
 -    if test -z "$LTCC"; then
@@ -48370,11 +51658,14 @@
 -echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
 -    fi
 -  fi
--
+-  if test -z "$LTCFLAGS"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+-  fi
+ 
 -  # Extract list of available tagged configurations in $ofile.
 -  # Note that this assumes the entire list is on one line.
 -  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
--
+ 
 -  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 -  for tagname in $tagnames; do
 -    IFS="$lt_save_ifs"
@@ -48386,7 +51677,7 @@
 -   { (exit 1); exit 1; }; }
 -	;;
 -    esac
--
+ 
 -    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
 -    then
 -      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
@@ -48400,16 +51691,18 @@
 -
 -      case $tagname in
 -      CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-	    (test "X$CXX" != "Xg++"))) ; then
 -	  ac_ext=cc
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--
+ 
+ 
+ 
+ 
 -archive_cmds_need_lc_CXX=no
 -allow_undefined_flag_CXX=
 -always_export_symbols_CXX=no
@@ -48420,6 +51713,7 @@
 -hardcode_libdir_flag_spec_ld_CXX=
 -hardcode_libdir_separator_CXX=
 -hardcode_minus_L_CXX=no
+-hardcode_shlibpath_var_CXX=unsupported
 -hardcode_automatic_CXX=no
 -module_cmds_CXX=
 -module_expsym_cmds_CXX=
@@ -48428,36 +51722,118 @@
 -no_undefined_flag_CXX=
 -whole_archive_flag_spec_CXX=
 -enable_shared_with_static_runtimes_CXX=no
--
+ 
 -# Dependencies to place before and after the object being linked:
 -predep_objects_CXX=
 -postdep_objects_CXX=
 -predeps_CXX=
 -postdeps_CXX=
 -compiler_lib_search_path_CXX=
--
+ 
 -# Source file extension for C++ test sources.
--ac_ext=cc
--
+-ac_ext=cpp
+ 
 -# Object file extension for compiled C++ test sources.
 -objext=o
 -objext_CXX=$objext
--
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc=yes
+ 
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code="int some_variable = 0;\n"
--
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
++$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++if ${lt_cv_archive_cmds_need_lc+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  $RM conftest*
++	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
 -# Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
--
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } 2>conftest.err; then
++	  soname=conftest
++	  lib=conftest
++	  libobjs=conftest.$ac_objext
++	  deplibs=
++	  wl=$lt_prog_compiler_wl
++	  pic_flag=$lt_prog_compiler_pic
++	  compiler_flags=-v
++	  linker_flags=-v
++	  verstring=
++	  output_objdir=.
++	  libname=conftest
++	  lt_save_allow_undefined_flag=$allow_undefined_flag
++	  allow_undefined_flag=
++	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++	  then
++	    lt_cv_archive_cmds_need_lc=no
++	  else
++	    lt_cv_archive_cmds_need_lc=yes
++	  fi
++	  allow_undefined_flag=$lt_save_allow_undefined_flag
++	else
++	  cat conftest.err 1>&5
++	fi
++	$RM conftest*
+ 
 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
++$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
++      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
++      ;;
++    esac
++  fi
++  ;;
++esac
+ 
 -# If no C compiler was specified, use CC.
 -LTCC=${LTCC-"$CC"}
--
+ 
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
--
--
+ 
+ 
+-# save warnings/boilerplate of simple test code
+-ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_compiler_boilerplate=`cat conftest.err`
+-$rm conftest*
+ 
+-ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
+ 
+ 
 -# Allow CC to be a program name with arguments.
 -lt_save_CC=$CC
 -lt_save_LD=$LD
@@ -48468,19 +51844,28 @@
 -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
 -  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 -else
--  unset lt_cv_prog_gnu_ld
+-  $as_unset lt_cv_prog_gnu_ld
 -fi
 -if test -n "${lt_cv_path_LDCXX+set}"; then
 -  lt_cv_path_LD=$lt_cv_path_LDCXX
 -else
--  unset lt_cv_path_LD
+-  $as_unset lt_cv_path_LD
 -fi
 -test -z "${LDCXX+set}" || LD=$LDCXX
 -CC=${CXX-"c++"}
 -compiler=$CC
 -compiler_CXX=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
--
+-for cc_temp in $compiler""; do
+-  case $cc_temp in
+-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+ 
 -# We don't want -fno-exception wen compiling C++ code, so set the
 -# no_builtin_flag separately
 -if test "$GXX" = yes; then
@@ -48488,11 +51873,11 @@
 -else
 -  lt_prog_compiler_no_builtin_flag_CXX=
 -fi
--
+ 
 -if test "$GXX" = yes; then
 -  # Set up default GNU C++ configuration
--
--
+ 
+ 
 -# Check whether --with-gnu-ld or --without-gnu-ld was given.
 -if test "${with_gnu_ld+set}" = set; then
 -  withval="$with_gnu_ld"
@@ -48550,7 +51935,7 @@
 -    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
 -      lt_cv_path_LD="$ac_dir/$ac_prog"
 -      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
+-      # but apparently some variants of GNU ld only accept -v.
 -      # Break only if it was the GNU/non-GNU ld that we prefer.
 -      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 -      *GNU* | *'with BFD'*)
@@ -48567,7 +51952,7 @@
 -  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 -fi
 -fi
--
+ 
 -LD="$lt_cv_path_LD"
 -if test -n "$LD"; then
 -  echo "$as_me:$LINENO: result: $LD" >&5
@@ -48584,7 +51969,7 @@
 -if test "${lt_cv_prog_gnu_ld+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 -case `$LD -v 2>&1 </dev/null` in
 -*GNU* | *'with BFD'*)
 -  lt_cv_prog_gnu_ld=yes
@@ -48597,23 +51982,23 @@
 -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
 -with_gnu_ld=$lt_cv_prog_gnu_ld
--
--
--
+ 
+ 
+ 
 -  # 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
 -    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--
+ 
 -    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
 -    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
--
+ 
 -    # If archive_cmds runs LD, not CC, wlarc should be empty
 -    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
 -    #     investigate it a little bit more. (MM)
 -    wlarc='${wl}'
--
+ 
 -    # ancient GNU ld didn't support --whole-archive et. al.
 -    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
 -	grep 'no-whole-archive' > /dev/null; then
@@ -48624,7 +52009,7 @@
 -  else
 -    with_gnu_ld=no
 -    wlarc=
--
+ 
 -    # A generic and very simple default shared library creation
 -    # command for GNU C++ for the case where it uses the native
 -    # linker, instead of GNU ld.  If possible, this setting should
@@ -48632,18 +52017,18 @@
 -    # the platform it is being used on.
 -    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
 -  fi
--
+ 
 -  # Commands to make compiler produce verbose output that lists
 -  # what "hidden" libraries, object files and flags are used when
 -  # linking a shared library.
 -  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--
+ 
 -else
 -  GXX=no
 -  with_gnu_ld=no
 -  wlarc=
 -fi
--
+ 
 -# PORTME: fill in a description of your system's C++ link characteristics
 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
@@ -48675,12 +52060,13 @@
 -	    ;;
 -	  esac
 -	done
+-	;;
 -      esac
--
+ 
 -      exp_sym_flag='-bexport'
 -      no_entry_flag='-bnoentry'
 -    fi
--
+ 
 -    # When large executables or shared objects are built, AIX ld can
 -    # have problems creating the table of contents.  If linking a library
 -    # or program results in "error TOC overflow" add -mminimal-toc to
@@ -48691,9 +52077,9 @@
 -    hardcode_direct_CXX=yes
 -    hardcode_libdir_separator_CXX=':'
 -    link_all_deplibs_CXX=yes
--
+ 
 -    if test "$GXX" = yes; then
--      case $host_os in aix4.012|aix4.012.*)
+-      case $host_os in aix4.[012]|aix4.[012].*)
 -      # We only want to do this on AIX 4.2 and lower, the check
 -      # below for broken collect2 doesn't work under 4.3+
 -	collect2name=`${CC} -print-prog-name=collect2`
@@ -48712,8 +52098,12 @@
 -	  hardcode_libdir_flag_spec_CXX='-L$libdir'
 -	  hardcode_libdir_separator_CXX=
 -	fi
+-	;;
 -      esac
 -      shared_flag='-shared'
+-      if test "$aix_use_runtimelinking" = yes; then
+-	shared_flag="$shared_flag "'${wl}-G'
+-      fi
 -    else
 -      # not using gcc
 -      if test "$host_cpu" = ia64; then
@@ -48728,7 +52118,7 @@
 -	fi
 -      fi
 -    fi
--
+ 
 -    # It seems that -bexpall does not export symbols beginning with
 -    # underscore (_), so it is better to generate a list of symbols to export.
 -    always_export_symbols_CXX=yes
@@ -48743,11 +52133,11 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -int
 -main ()
 -{
--
+ 
 -  ;
 -  return 0;
 -}
@@ -48774,7 +52164,7 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--
+ 
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
 -# Check for a 64-bit object if we didn't find anything.
@@ -48783,20 +52173,20 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--
+ 
 -      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
--
--      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ 
+-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 -     else
 -      if test "$host_cpu" = ia64; then
 -	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
 -	allow_undefined_flag_CXX="-z nodefs"
--	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 -      else
 -	# Determine the default libpath from the value encoded in an empty executable.
 -	cat >conftest.$ac_ext <<_ACEOF
@@ -48805,11 +52195,11 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -int
 -main ()
 -{
--
+ 
 -  ;
 -  return 0;
 -}
@@ -48836,7 +52226,7 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--
+ 
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
 -# Check for a 64-bit object if we didn't find anything.
@@ -48845,27 +52235,37 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--
+ 
 -	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	# Warning - without using the other run time loading flags,
 -	# -berok will link without error, but may produce a broken library.
 -	no_undefined_flag_CXX=' ${wl}-bernotok'
 -	allow_undefined_flag_CXX=' ${wl}-berok'
--	# -bexpall does not export symbols beginning with underscore (_)
--	always_export_symbols_CXX=yes
 -	# Exported symbols can be pulled into shared objects from archives
--	whole_archive_flag_spec_CXX=' '
+-	whole_archive_flag_spec_CXX='$convenience'
 -	archive_cmds_need_lc_CXX=yes
--	# This is similar to how AIX traditionally builds it's shared libraries.
--	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	# This is similar to how AIX traditionally builds its shared libraries.
+-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 -      fi
 -    fi
 -    ;;
+ 
+-  beos*)
+-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-      allow_undefined_flag_CXX=unsupported
+-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-      # support --undefined.  This deserves some investigation.  FIXME
+-      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    else
+-      ld_shlibs_CXX=no
+-    fi
+-    ;;
+ 
 -  chorus*)
 -    case $cc_basename in
 -      *)
@@ -48874,7 +52274,7 @@
 -	;;
 -    esac
 -    ;;
--
+ 
 -  cygwin* | mingw* | pw32*)
 -    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
 -    # as there is no search path for DLLs.
@@ -48884,7 +52284,7 @@
 -    enable_shared_with_static_runtimes_CXX=yes
 -
 -    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -      # 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
@@ -48893,70 +52293,81 @@
 -	echo EXPORTS > $output_objdir/$soname.def;
 -	cat $export_symbols >> $output_objdir/$soname.def;
 -      fi~
--      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -    else
 -      ld_shlibs_CXX=no
 -    fi
 -  ;;
+-      darwin* | rhapsody*)
+-        case $host_os in
+-        rhapsody* | darwin1.[012])
+-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[012])
+-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-        esac
+-      archive_cmds_need_lc_CXX=no
+-      hardcode_direct_CXX=no
+-      hardcode_automatic_CXX=yes
+-      hardcode_shlibpath_var_CXX=unsupported
+-      whole_archive_flag_spec_CXX=''
+-      link_all_deplibs_CXX=yes
 -
--  darwin* | rhapsody*)
--  if test "$GXX" = yes; then
--    archive_cmds_need_lc_CXX=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag_CXX='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
+-    if test "$GXX" = yes ; then
+-      lt_int_apple_cc_single_mod=no
+-      output_verbose_link_cmd='echo'
+-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+-       lt_int_apple_cc_single_mod=yes
+-      fi
+-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
 -      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_CXX='-undefined dynamic_lookup'
--            ;;
--        esac
+-          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-        fi
+-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          else
+-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          fi
+-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      else
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         ld_shlibs_CXX=no
+-          ;;
+-      esac
 -      fi
--      ;;
--    esac
--    lt_int_apple_cc_single_mod=no
--    output_verbose_link_cmd='echo'
--    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--      lt_int_apple_cc_single_mod=yes
--    fi
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    else
--      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    fi
--    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct_CXX=no
--    hardcode_automatic_CXX=yes
--    hardcode_shlibpath_var_CXX=unsupported
--    whole_archive_flag_spec_CXX='-all_load $convenience'
--    link_all_deplibs_CXX=yes
--  else
--    ld_shlibs_CXX=no
--  fi
--    ;;
--
+-        ;;
+ 
 -  dgux*)
 -    case $cc_basename in
--      ec++)
+-      ec++*)
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
 -	;;
--      ghcx)
+-      ghcx*)
 -	# Green Hills C++ Compiler
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
@@ -48967,14 +52378,14 @@
 -	;;
 -    esac
 -    ;;
--  freebsd12*)
+-  freebsd[12]*)
 -    # C++ shared libraries reported to be fairly broken before switch to ELF
 -    ld_shlibs_CXX=no
 -    ;;
 -  freebsd-elf*)
 -    archive_cmds_need_lc_CXX=no
 -    ;;
--  freebsd* | kfreebsd*-gnu)
+-  freebsd* | kfreebsd*-gnu | dragonfly*)
 -    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
 -    # conventions
 -    ld_shlibs_CXX=yes
@@ -48989,13 +52400,13 @@
 -    hardcode_minus_L_CXX=yes # Not in the search PATH,
 -				# but as the default
 -				# location of the library.
--
+ 
 -    case $cc_basename in
--    CC)
+-    CC*)
 -      # FIXME: insert proper C++ library support
 -      ld_shlibs_CXX=no
 -      ;;
--    aCC)
+-    aCC*)
 -      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 -      # Commands to make compiler produce verbose output that lists
 -      # what "hidden" libraries, object files and flags are used when
@@ -49005,7 +52416,7 @@
 -      # explicitly linking system object files so we need to strip them
 -      # from the output so that they don't get included in the library
 -      # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 -      ;;
 -    *)
 -      if test "$GXX" = yes; then
@@ -49019,33 +52430,22 @@
 -    ;;
 -  hpux10*|hpux11*)
 -    if test $with_gnu_ld = no; then
--      case "$host_cpu" in
--      hppa*64*)
--	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+-      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+-      hardcode_libdir_separator_CXX=:
+ 
+-      case $host_cpu in
+-      hppa*64*|ia64*)
 -	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
--	hardcode_libdir_separator_CXX=:
--        ;;
--      ia64*)
--	hardcode_libdir_flag_spec_CXX='-L$libdir'
 -        ;;
 -      *)
--	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
--	hardcode_libdir_separator_CXX=:
 -	export_dynamic_flag_spec_CXX='${wl}-E'
 -        ;;
 -      esac
 -    fi
--    case "$host_cpu" in
--    hppa*64*)
--      hardcode_direct_CXX=no
--      hardcode_shlibpath_var_CXX=no
--      ;;
--    ia64*)
+-    case $host_cpu in
+-    hppa*64*|ia64*)
 -      hardcode_direct_CXX=no
 -      hardcode_shlibpath_var_CXX=no
--      hardcode_minus_L_CXX=yes # Not in the search PATH,
--					      # but as the default
--					      # location of the library.
 -      ;;
 -    *)
 -      hardcode_direct_CXX=yes
@@ -49054,16 +52454,19 @@
 -					      # location of the library.
 -      ;;
 -    esac
--
+ 
 -    case $cc_basename in
--      CC)
+-      CC*)
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
 -	;;
--      aCC)
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+-      aCC*)
+-	case $host_cpu in
+-	hppa*64*)
+-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 -	  ;;
 -	*)
 -	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -49082,9 +52485,12 @@
 -      *)
 -	if test "$GXX" = yes; then
 -	  if test $with_gnu_ld = no; then
--	    case "$host_cpu" in
--	    ia64*|hppa*64*)
--	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+-	    case $host_cpu in
+-	    hppa*64*)
+-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    ia64*)
+-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 -	      ;;
 -	    *)
 -	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -49098,11 +52504,25 @@
 -	;;
 -    esac
 -    ;;
+-  interix3*)
+-    hardcode_direct_CXX=no
+-    hardcode_shlibpath_var_CXX=no
+-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+-    export_dynamic_flag_spec_CXX='${wl}-E'
+-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-    # Instead, shared libraries are loaded at an image base (0x10000000 by
+-    # default) and relocated if they conflict, which is a slow very memory
+-    # consuming and fragmenting process.  To avoid this, we pick a random,
+-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-    ;;
 -  irix5* | irix6*)
 -    case $cc_basename in
--      CC)
+-      CC*)
 -	# SGI C++
--	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+-	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 -
 -	# Archives containing C++ object files must be created using
 -	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -49113,7 +52533,7 @@
 -      *)
 -	if test "$GXX" = yes; then
 -	  if test "$with_gnu_ld" = no; then
--	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 -	  else
 -	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 -	  fi
@@ -49126,9 +52546,9 @@
 -    ;;
 -  linux*)
 -    case $cc_basename in
--      KCC)
+-      KCC*)
 -	# Kuck and Associates, Inc. (KAI) C++ Compiler
--
+ 
 -	# KCC will only create a shared library if the output file
 -	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 -	# to its proper name (with version) after linking.
@@ -49151,25 +52571,49 @@
 -	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 -	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 -	;;
--      icpc)
+-      icpc*)
 -	# Intel C++
 -	with_gnu_ld=yes
+-	# version 8.0 and above of icpc choke on multiply defined symbols
+-	# if we add $predep_objects and $postdep_objects, however 7.1 and
+-	# earlier do not add the objects themselves.
+-	case `$CC -V 2>&1` in
+-	*"Version 7."*)
+-  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	  ;;
+-	*)  # Version 8.0 or newer
+-	  tmp_idyn=
+-	  case $host_cpu in
+-	    ia64*) tmp_idyn=' -i_dynamic';;
+-	  esac
+-  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	  ;;
+-	esac
 -	archive_cmds_need_lc_CXX=no
--	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 -	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 -	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 -	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 -	;;
--      cxx)
+-      pgCC*)
+-        # Portland Group C++ compiler
+-	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+-  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+-
+-	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+-	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-        ;;
+-      cxx*)
 -	# Compaq C++
 -	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
--
+ 
 -	runpath_var=LD_RUN_PATH
 -	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
 -	hardcode_libdir_separator_CXX=:
--
+ 
 -	# Commands to make compiler produce verbose output that lists
 -	# what "hidden" libraries, object files and flags are used when
 -	# linking a shared library.
@@ -49192,7 +52636,7 @@
 -    ;;
 -  mvs*)
 -    case $cc_basename in
--      cxx)
+-      cxx*)
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
 -	;;
@@ -49213,32 +52657,48 @@
 -    # Workaround some broken pre-1.5 toolchains
 -    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 -    ;;
+-  openbsd2*)
+-    # C++ shared libraries are fairly broken
+-    ld_shlibs_CXX=no
+-    ;;
+-  openbsd*)
+-    hardcode_direct_CXX=yes
+-    hardcode_shlibpath_var_CXX=no
+-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+-      export_dynamic_flag_spec_CXX='${wl}-E'
+-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-    fi
+-    output_verbose_link_cmd='echo'
+-    ;;
 -  osf3*)
 -    case $cc_basename in
--      KCC)
+-      KCC*)
 -	# Kuck and Associates, Inc. (KAI) C++ Compiler
--
+ 
 -	# KCC will only create a shared library if the output file
 -	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 -	# to its proper name (with version) after linking.
 -	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
+ 
 -	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 -	hardcode_libdir_separator_CXX=:
--
+ 
 -	# Archives containing C++ object files must be created using
 -	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 -	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
--
+ 
 -	;;
--      RCC)
+-      RCC*)
 -	# Rational C++ 2.4.1
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
 -	;;
--      cxx)
+-      cxx*)
 -	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 -
 -	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 -	hardcode_libdir_separator_CXX=:
@@ -49256,16 +52716,16 @@
 -      *)
 -	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 -	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
--
+-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
 -	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 -	  hardcode_libdir_separator_CXX=:
--
+ 
 -	  # Commands to make compiler produce verbose output that lists
 -	  # what "hidden" libraries, object files and flags are used when
 -	  # linking a shared library.
 -	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--
+ 
 -	else
 -	  # FIXME: insert proper C++ library support
 -	  ld_shlibs_CXX=no
@@ -49275,32 +52735,32 @@
 -    ;;
 -  osf4* | osf5*)
 -    case $cc_basename in
--      KCC)
+-      KCC*)
 -	# Kuck and Associates, Inc. (KAI) C++ Compiler
--
+ 
 -	# KCC will only create a shared library if the output file
 -	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 -	# to its proper name (with version) after linking.
 -	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
+ 
 -	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 -	hardcode_libdir_separator_CXX=:
--
+ 
 -	# Archives containing C++ object files must be created using
 -	# the KAI C++ compiler.
 -	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
 -	;;
--      RCC)
+-      RCC*)
 -	# Rational C++ 2.4.1
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
 -	;;
--      cxx)
+-      cxx*)
 -	allow_undefined_flag_CXX=' -expect_unresolved \*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 -	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 -	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 -	  $rm $lib.exp'
 -
 -	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -49319,16 +52779,16 @@
 -      *)
 -	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 -	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
--
+-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
 -	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 -	  hardcode_libdir_separator_CXX=:
--
+ 
 -	  # Commands to make compiler produce verbose output that lists
 -	  # what "hidden" libraries, object files and flags are used when
 -	  # linking a shared library.
 -	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--
+ 
 -	else
 -	  # FIXME: insert proper C++ library support
 -	  ld_shlibs_CXX=no
@@ -49340,27 +52800,14 @@
 -    # FIXME: insert proper C++ library support
 -    ld_shlibs_CXX=no
 -    ;;
--  sco*)
--    archive_cmds_need_lc_CXX=no
--    case $cc_basename in
--      CC)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--    esac
--    ;;
 -  sunos4*)
 -    case $cc_basename in
--      CC)
+-      CC*)
 -	# Sun C++ 4.x
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
 -	;;
--      lcc)
+-      lcc*)
 -	# Lucid
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
@@ -49373,47 +52820,44 @@
 -    ;;
 -  solaris*)
 -    case $cc_basename in
--      CC)
+-      CC*)
 -	# Sun C++ 4.2, 5.x and Centerline C++
+-        archive_cmds_need_lc_CXX=yes
 -	no_undefined_flag_CXX=' -zdefs'
--	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 -	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
+-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
 -	hardcode_libdir_flag_spec_CXX='-R$libdir'
 -	hardcode_shlibpath_var_CXX=no
 -	case $host_os in
--	  solaris2.0-5 | solaris2.0-5.*) ;;
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 -	  *)
 -	    # The C++ compiler is used as linker so we must use $wl
 -	    # flag to pass the commands to the underlying system
--	    # linker.
+-	    # linker. We must also pass each convience library through
+-	    # to the system linker between allextract/defaultextract.
+-	    # The C++ compiler will combine linker options so we
+-	    # cannot just pass the convience library names through
+-	    # without $wl.
 -	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 -	    ;;
 -	esac
 -	link_all_deplibs_CXX=yes
--
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--
+ 
+-	output_verbose_link_cmd='echo'
+ 
 -	# Archives containing C++ object files must be created using
 -	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
 -	# necessary to make sure instantiated templates are included
 -	# in the archive.
 -	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
 -	;;
--      gcx)
+-      gcx*)
 -	# Green Hills C++ Compiler
 -	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--
+ 
 -	# The C++ compiler must be used to create the archive.
 -	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 -	;;
@@ -49425,7 +52869,7 @@
 -	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 -	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
+ 
 -	    # Commands to make compiler produce verbose output that lists
 -	    # what "hidden" libraries, object files and flags are used when
 -	    # linking a shared library.
@@ -49436,24 +52880,75 @@
 -	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 -	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
+ 
 -	    # Commands to make compiler produce verbose output that lists
 -	    # what "hidden" libraries, object files and flags are used when
 -	    # linking a shared library.
 -	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
 -	  fi
--
+ 
 -	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
 -	fi
 -	;;
 -    esac
 -    ;;
--  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+-    no_undefined_flag_CXX='${wl}-z,text'
+-    archive_cmds_need_lc_CXX=no
+-    hardcode_shlibpath_var_CXX=no
+-    runpath_var='LD_RUN_PATH'
+ 
+-    case $cc_basename in
+-      CC*)
+-	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-      *)
+-	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-    esac
+-    ;;
+-  sysv5* | sco3.2v5* | sco5v6*)
+-    # Note: We can NOT use -z defs as we might desire, because we do not
+-    # link with -lc, and that would cause any symbols used from libc to
+-    # always be unresolved, which means just about no library would
+-    # ever link correctly.  If we're not using GNU ld we use -z text
+-    # though, which does catch some bad symbols but isn't as heavy-handed
+-    # as -z defs.
+-    # For security reasons, it is highly recommended that you always
+-    # use absolute paths for naming shared libraries, and exclude the
+-    # DT_RUNPATH tag from executables and libraries.  But doing so
+-    # requires that you compile everything twice, which is a pain.
+-    # So that behaviour is only enabled if SCOABSPATH is set to a
+-    # non-empty value in the environment.  Most likely only useful for
+-    # creating official distributions of packages.
+-    # This is a hack until libtool officially supports absolute path
+-    # names for shared libraries.
+-    no_undefined_flag_CXX='${wl}-z,text'
+-    allow_undefined_flag_CXX='${wl}-z,nodefs'
 -    archive_cmds_need_lc_CXX=no
+-    hardcode_shlibpath_var_CXX=no
+-    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-    hardcode_libdir_separator_CXX=':'
+-    link_all_deplibs_CXX=yes
+-    export_dynamic_flag_spec_CXX='${wl}-Bexport'
+-    runpath_var='LD_RUN_PATH'
+ 
+-    case $cc_basename in
+-      CC*)
+-	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-      *)
+-	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-    esac
 -    ;;
 -  tandem*)
 -    case $cc_basename in
--      NCC)
+-      NCC*)
 -	# NonStop-UX NCC 3.20
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
@@ -49476,11 +52971,11 @@
 -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 -echo "${ECHO_T}$ld_shlibs_CXX" >&6
 -test "$ld_shlibs_CXX" = no && can_build_shared=no
--
+ 
 -GCC_CXX="$GXX"
 -LD_CXX="$LD"
--
--
+ 
+ 
 -cat > conftest.$ac_ext <<EOF
 -class Foo
 -{
@@ -49490,7 +52985,7 @@
 -  int a;
 -};
 -EOF
--
+ 
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -49498,19 +52993,19 @@
 -  (exit $ac_status); }; then
 -  # Parse the compiler output and extract the necessary
 -  # objects, libraries and library flags.
--
+ 
 -  # Sentinel used to keep track of whether or not we are before
 -  # the conftest object file.
 -  pre_test_object_deps_done=no
--
+ 
 -  # The `*' in the case matches for architectures that use `case' in
 -  # $output_verbose_cmd can trigger glob expansion during the loop
 -  # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
--
+-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
 -  for p in `eval $output_verbose_link_cmd`; do
 -    case $p in
--
+ 
 -    -L* | -R* | -l*)
 -       # Some compilers place space between "-{L,R}" and the path.
 -       # Remove the space.
@@ -49521,7 +53016,7 @@
 -       else
 -	 prev=
 -       fi
--
+ 
 -       if test "$pre_test_object_deps_done" = no; then
 -	 case $p in
 -	 -L* | -R*)
@@ -49545,7 +53040,7 @@
 -	 fi
 -       fi
 -       ;;
--
+ 
 -    *.$objext)
 -       # This assumes that the test object file only shows up
 -       # once in the compiler output.
@@ -49553,7 +53048,7 @@
 -	 pre_test_object_deps_done=yes
 -	 continue
 -       fi
--
+ 
 -       if test "$pre_test_object_deps_done" = no; then
 -	 if test -z "$predep_objects_CXX"; then
 -	   predep_objects_CXX="$p"
@@ -49568,36 +53063,59 @@
 -	 fi
 -       fi
 -       ;;
--
+ 
 -    *) ;; # Ignore the rest.
--
+ 
 -    esac
 -  done
--
+ 
 -  # Clean up.
 -  rm -f a.out a.exe
 -else
 -  echo "libtool.m4: error: problem compiling CXX test program"
 -fi
--
+ 
 -$rm -f confest.$objext
--
+ 
+-# PORTME: override above test on systems where it is broken
+-case $host_os in
+-interix3*)
+-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+-  # hack all around it, let's just trust "g++" to DTRT.
+-  predep_objects_CXX=
+-  postdep_objects_CXX=
+-  postdeps_CXX=
+-  ;;
+ 
+-solaris*)
+-  case $cc_basename in
+-  CC*)
+-    # Adding this requires a known-good setup of shared libraries for
+-    # Sun compiler versions before 5.6, else PIC objects from an old
+-    # archive will be linked into the output, leading to subtle bugs.
+-    postdeps_CXX='-lCstd -lCrun'
+-    ;;
+-  esac
+-  ;;
+-esac
+ 
+ 
 -case " $postdeps_CXX " in
 -*" -lc "*) archive_cmds_need_lc_CXX=no ;;
 -esac
--
+ 
 -lt_prog_compiler_wl_CXX=
 -lt_prog_compiler_pic_CXX=
 -lt_prog_compiler_static_CXX=
--
+ 
 -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
--
+ 
 -  # C++ specific cases for pic, static, wl, etc.
 -  if test "$GXX" = yes; then
 -    lt_prog_compiler_wl_CXX='-Wl,'
 -    lt_prog_compiler_static_CXX='-static'
--
+ 
 -    case $host_os in
 -    aix*)
 -      # All AIX code is PIC.
@@ -49629,6 +53147,10 @@
 -      # DJGPP does not support shared libraries at all
 -      lt_prog_compiler_pic_CXX=
 -      ;;
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
+-      ;;
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
 -	lt_prog_compiler_pic_CXX=-Kconform_pic
@@ -49637,7 +53159,7 @@
 -    hpux*)
 -      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 -      # not for PA HP-UX.
--      case "$host_cpu" in
+-      case $host_cpu in
 -      hppa*64*|ia64*)
 -	;;
 -      *)
@@ -49662,18 +53184,28 @@
 -	;;
 -      chorus*)
 -	case $cc_basename in
--	cxch68)
+-	cxch68*)
 -	  # Green Hills C++ Compiler
 -	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 -	  ;;
 -	esac
 -	;;
+-       darwin*)
+-         # PIC is the default on this platform
+-         # Common symbols not allowed in MH_DYLIB files
+-         case $cc_basename in
+-           xlc*)
+-           lt_prog_compiler_pic_CXX='-qnocommon'
+-           lt_prog_compiler_wl_CXX='-Wl,'
+-           ;;
+-         esac
+-       ;;
 -      dgux*)
 -	case $cc_basename in
--	  ec++)
+-	  ec++*)
 -	    lt_prog_compiler_pic_CXX='-KPIC'
 -	    ;;
--	  ghcx)
+-	  ghcx*)
 -	    # Green Hills C++ Compiler
 -	    lt_prog_compiler_pic_CXX='-pic'
 -	    ;;
@@ -49681,22 +53213,22 @@
 -	    ;;
 -	esac
 -	;;
--      freebsd* | kfreebsd*-gnu)
+-      freebsd* | kfreebsd*-gnu | dragonfly*)
 -	# FreeBSD uses GNU C++
 -	;;
 -      hpux9* | hpux10* | hpux11*)
 -	case $cc_basename in
--	  CC)
+-	  CC*)
 -	    lt_prog_compiler_wl_CXX='-Wl,'
--	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
 -	    if test "$host_cpu" != ia64; then
 -	      lt_prog_compiler_pic_CXX='+Z'
 -	    fi
 -	    ;;
--	  aCC)
+-	  aCC*)
 -	    lt_prog_compiler_wl_CXX='-Wl,'
--	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
--	    case "$host_cpu" in
+-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+-	    case $host_cpu in
 -	    hppa*64*|ia64*)
 -	      # +Z the default
 -	      ;;
@@ -49709,9 +53241,13 @@
 -	    ;;
 -	esac
 -	;;
+-      interix*)
+-	# This is c89, which is MS Visual C++ (no shared libs)
+-	# Anyone wants to do a port?
+-	;;
 -      irix5* | irix6* | nonstopux*)
 -	case $cc_basename in
--	  CC)
+-	  CC*)
 -	    lt_prog_compiler_wl_CXX='-Wl,'
 -	    lt_prog_compiler_static_CXX='-non_shared'
 -	    # CC pic flag -KPIC is the default.
@@ -49722,18 +53258,24 @@
 -	;;
 -      linux*)
 -	case $cc_basename in
--	  KCC)
+-	  KCC*)
 -	    # KAI C++ Compiler
 -	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 -	    lt_prog_compiler_pic_CXX='-fPIC'
 -	    ;;
--	  icpc)
+-	  icpc* | ecpc*)
 -	    # Intel C++
 -	    lt_prog_compiler_wl_CXX='-Wl,'
 -	    lt_prog_compiler_pic_CXX='-KPIC'
 -	    lt_prog_compiler_static_CXX='-static'
 -	    ;;
--	  cxx)
+-	  pgCC*)
+-	    # Portland Group C++ compiler.
+-	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_pic_CXX='-fpic'
+-	    lt_prog_compiler_static_CXX='-Bstatic'
+-	    ;;
+-	  cxx*)
 -	    # Compaq C++
 -	    # Make sure the PIC flag is empty.  It appears that all Alpha
 -	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -49750,7 +53292,7 @@
 -	;;
 -      mvs*)
 -	case $cc_basename in
--	  cxx)
+-	  cxx*)
 -	    lt_prog_compiler_pic_CXX='-W c,exportall'
 -	    ;;
 -	  *)
@@ -49761,14 +53303,14 @@
 -	;;
 -      osf3* | osf4* | osf5*)
 -	case $cc_basename in
--	  KCC)
+-	  KCC*)
 -	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 -	    ;;
--	  RCC)
+-	  RCC*)
 -	    # Rational C++ 2.4.1
 -	    lt_prog_compiler_pic_CXX='-pic'
 -	    ;;
--	  cxx)
+-	  cxx*)
 -	    # Digital/Compaq C++
 -	    lt_prog_compiler_wl_CXX='-Wl,'
 -	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -49782,24 +53324,15 @@
 -	;;
 -      psos*)
 -	;;
--      sco*)
--	case $cc_basename in
--	  CC)
--	    lt_prog_compiler_pic_CXX='-fPIC'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
 -      solaris*)
 -	case $cc_basename in
--	  CC)
+-	  CC*)
 -	    # Sun C++ 4.2, 5.x and Centerline C++
 -	    lt_prog_compiler_pic_CXX='-KPIC'
 -	    lt_prog_compiler_static_CXX='-Bstatic'
 -	    lt_prog_compiler_wl_CXX='-Qoption ld '
 -	    ;;
--	  gcx)
+-	  gcx*)
 -	    # Green Hills C++ Compiler
 -	    lt_prog_compiler_pic_CXX='-PIC'
 -	    ;;
@@ -49809,12 +53342,12 @@
 -	;;
 -      sunos4*)
 -	case $cc_basename in
--	  CC)
+-	  CC*)
 -	    # Sun C++ 4.x
 -	    lt_prog_compiler_pic_CXX='-pic'
 -	    lt_prog_compiler_static_CXX='-Bstatic'
 -	    ;;
--	  lcc)
+-	  lcc*)
 -	    # Lucid
 -	    lt_prog_compiler_pic_CXX='-pic'
 -	    ;;
@@ -49824,7 +53357,7 @@
 -	;;
 -      tandem*)
 -	case $cc_basename in
--	  NCC)
+-	  NCC*)
 -	    # NonStop-UX NCC 3.20
 -	    lt_prog_compiler_pic_CXX='-KPIC'
 -	    ;;
@@ -49832,7 +53365,14 @@
 -	    ;;
 -	esac
 -	;;
--      unixware*)
+-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-	case $cc_basename in
+-	  CC*)
+-	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_pic_CXX='-KPIC'
+-	    lt_prog_compiler_static_CXX='-Bstatic'
+-	    ;;
+-	esac
 -	;;
 -      vxworks*)
 -	;;
@@ -49841,15 +53381,15 @@
 -	;;
 -    esac
 -  fi
--
+ 
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
--
+ 
 -#
 -# Check to make sure the PIC flag actually works.
 -#
 -if test -n "$lt_prog_compiler_pic_CXX"; then
--
+ 
 -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
 -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
@@ -49865,27 +53405,29 @@
 -   # with a dollar sign (not a hyphen), so the echo should work correctly.
 -   # The option is referenced via a variable to avoid confusing sed.
 -   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12052: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:12571: $lt_compile\"" >&5)
 -   (eval "$lt_compile" 2>conftest.err)
 -   ac_status=$?
 -   cat conftest.err >&5
--   echo "$as_me:12056: \$? = $ac_status" >&5
+-   echo "$as_me:12575: \$? = $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
--     if test ! -s conftest.err; then
+-     # So say no if there are warnings other than the usual output.
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
 -       lt_prog_compiler_pic_works_CXX=yes
 -     fi
 -   fi
 -   $rm conftest*
--
+ 
 -fi
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
--
+ 
 -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
 -    case $lt_prog_compiler_pic_CXX in
 -     "" | " "*) ;;
@@ -49895,9 +53437,9 @@
 -    lt_prog_compiler_pic_CXX=
 -     lt_prog_compiler_can_build_shared_CXX=no
 -fi
--
+ 
 -fi
--case "$host_os" in
+-case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
 -  *djgpp*)
 -    lt_prog_compiler_pic_CXX=
@@ -49906,42 +53448,86 @@
 -    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
 -    ;;
 -esac
--
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+ 
+-#
+-# Check to make sure the static flag actually works.
+-#
+-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--  lt_cv_prog_compiler_c_o_CXX=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--   lt_compiler_flag="-o out/conftest2.$ac_objext"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-  lt_prog_compiler_static_works_CXX=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The linker can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&5
+-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-       if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works_CXX=yes
+-       fi
+-     else
+-       lt_prog_compiler_static_works_CXX=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
+ 
+-fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
+ 
+-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+-    :
+-else
+-    lt_prog_compiler_static_CXX=
+-fi
+ 
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_prog_compiler_c_o_CXX=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
 -   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12112: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:12675: $lt_compile\"" >&5)
 -   (eval "$lt_compile" 2>out/conftest.err)
 -   ac_status=$?
 -   cat out/conftest.err >&5
--   echo "$as_me:12116: \$? = $ac_status" >&5
+-   echo "$as_me:12679: \$? = $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
 -     # So say no if there are warnings
--     if test ! -s out/conftest.err; then
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 -       lt_cv_prog_compiler_c_o_CXX=yes
 -     fi
 -   fi
--   chmod u+w .
+-   chmod u+w . 2>&5
 -   $rm conftest*
 -   # SGI C++ compiler will create directory out/ii_files/ for
 -   # template instantiation
@@ -49950,12 +53536,12 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
--
+ 
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
--
--
+ 
+ 
 -hard_links="nottested"
 -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
 -  # do not overwrite the value of need_locks provided by the user
@@ -49977,10 +53563,10 @@
 -else
 -  need_locks=no
 -fi
--
+ 
 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
--
+ 
 -  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 -  case $host_os in
 -  aix4* | aix5*)
@@ -49996,22 +53582,17 @@
 -    export_symbols_cmds_CXX="$ltdll_cmds"
 -  ;;
 -  cygwin* | mingw*)
--    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 -  ;;
 -  *)
 -    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 -  ;;
 -  esac
--
+ 
 -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 -echo "${ECHO_T}$ld_shlibs_CXX" >&6
 -test "$ld_shlibs_CXX" = no && can_build_shared=no
--
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
--  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
--
+ 
 -#
 -# Do we need to explicitly link libc?
 -#
@@ -50019,7 +53600,7 @@
 -x|xyes)
 -  # Assume -lc should be added
 -  archive_cmds_need_lc_CXX=yes
--
+ 
 -  if test "$enable_shared" = yes && test "$GCC" = yes; then
 -    case $archive_cmds_CXX in
 -    *'~'*)
@@ -50033,7 +53614,7 @@
 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
 -      $rm conftest*
 -      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
+ 
 -      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -50044,6 +53625,7 @@
 -        libobjs=conftest.$ac_objext
 -        deplibs=
 -        wl=$lt_prog_compiler_wl_CXX
+-	pic_flag=$lt_prog_compiler_pic_CXX
 -        compiler_flags=-v
 -        linker_flags=-v
 -        verstring=
@@ -50073,13 +53655,13 @@
 -  fi
 -  ;;
 -esac
--
+ 
 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 -library_names_spec=
 -libname_spec='lib$name'
 -soname_spec=
--shrext=".so"
+-shrext_cmds=".so"
 -postinstall_cmds=
 -postuninstall_cmds=
 -finish_cmds=
@@ -50101,124 +53683,217 @@
 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 -  fi
 -else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
--need_lib_prefix=unknown
--hardcode_into_libs=no
--
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--need_version=unknown
--
--case $host_os in
--aix3*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
--  shlibpath_var=LIBPATH
--
--  # AIX 3 has no versioning support, so we append a major version to the name.
--  soname_spec='${libname}${release}${shared_ext}$major'
--  ;;
--
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
++$as_echo_n "checking dynamic linker characteristics... " >&6; }
++
++if test "$GCC" = yes; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  case $host_os in
++    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
++    *) lt_sed_strip_eq="s,=/,/,g" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
++  case $lt_search_path_spec in
++  *\;*)
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
++    ;;
++  *)
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
++    ;;
++  esac
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[lt_foo]++; }
++  if (lt_freq[lt_foo] == 1) { print lt_foo; }
++}'`
++  # AWK program above erroneously prepends '/' to C:/dos/paths
++  # for these hosts.
++  case $host_os in
++    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
++      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
++  esac
++  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
++else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -12862,7 +11208,7 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
 -aix4* | aix5*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  hardcode_into_libs=yes
--  if test "$host_cpu" = ia64; then
--    # AIX 5 supports IA64
--    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
--    shlibpath_var=LD_LIBRARY_PATH
--  else
--    # With GCC up to 2.95.x, collect2 would create an import file
--    # for dependence libraries.  The import file would start with
--    # the line `#! .'.  This would cause the generated library to
--    # depend on `.', always an invalid library.  This was fixed in
--    # development snapshots of GCC prior to 3.0.
--    case $host_os in
--      aix4 | aix4.[01] | aix4.[01].*)
--      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
--	   echo ' yes '
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -12881,7 +11227,7 @@
+       aix4 | aix4.[01] | aix4.[01].*)
+       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ 	   echo ' yes '
 -	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
--	:
--      else
--	can_build_shared=no
--      fi
--      ;;
--    esac
--    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
--    # soname into executable. Probably we can add versioning support to
--    # collect2, so additional links can be useful in future.
--    if test "$aix_use_runtimelinking" = yes; then
--      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
--      # instead of lib<name>.a to let people know that these are not
--      # typical AIX shared libraries.
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    else
--      # We preserve .a as extension for shared libraries through AIX4.2
--      # and later when we are not doing run time linking.
--      library_names_spec='${libname}${release}.a $libname.a'
--      soname_spec='${libname}${release}${shared_ext}$major'
--    fi
--    shlibpath_var=LIBPATH
--  fi
--  ;;
--
--amigaos*)
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ 	:
+       else
+ 	can_build_shared=no
+@@ -12907,9 +11253,18 @@
+   ;;
+ 
+ amigaos*)
 -  library_names_spec='$libname.ixlibrary $libname.a'
 -  # Create ${libname}_ixlibrary.a entries in /sys/libs.
 -  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
--  ;;
--
--beos*)
--  library_names_spec='${libname}${shared_ext}'
--  dynamic_linker="$host_os ld.so"
--  shlibpath_var=LIBRARY_PATH
--  ;;
--
--bsdi4*)
--  version_type=linux
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
--  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
--  # the default ld.so.conf also contains /usr/contrib/lib and
--  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
--  # libtool to hard-code these into programs
--  ;;
--
++  case $host_cpu in
++  powerpc)
++    # Since July 2007 AmigaOS4 officially supports .so libraries.
++    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    ;;
++  m68k)
++    library_names_spec='$libname.ixlibrary $libname.a'
++    # Create ${libname}_ixlibrary.a entries in /sys/libs.
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    ;;
++  esac
+   ;;
+ 
+ beos*)
+@@ -12932,61 +11287,112 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
 -cygwin* | mingw* | pw32*)
--  version_type=windows
--  shrext=".dll"
--  need_version=no
--  need_lib_prefix=no
--
++cygwin* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
 -  case $GCC,$host_os in
 -  yes,cygwin* | yes,mingw* | yes,pw32*)
--    library_names_spec='$libname.dll.a'
--    # DLL is installed to $(libdir)/../bin by postinstall_cmds
--    postinstall_cmds='base_file=`basename \${file}`~
++  case $GCC,$cc_basename in
++  yes,*)
++    # gcc
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
 -      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
--      dldir=$destdir/`dirname \$dlpath`~
--      test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
--    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
--      dlpath=$dir/\$dldll~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+       $install_prog $dir/$dlname \$dldir/$dlname~
+-      chmod a+x \$dldir/$dlname'
++      chmod a+x \$dldir/$dlname~
++      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++      fi'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
 -       $rm \$dlpath'
--    shlibpath_overrides_runpath=yes
--
--    case $host_os in
--    cygwin*)
--      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
--      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++       $RM \$dlpath'
+     shlibpath_overrides_runpath=yes
+ 
+     case $host_os in
+     cygwin*)
+       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 -      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
--      ;;
++
++      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+       ;;
 -    mingw*)
--      # MinGW DLLs use traditional 'lib' prefix
--      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++    mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 -      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 -      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
 -        # It is most probably a Windows format PATH printed by
@@ -50231,55 +53906,106 @@
 -      else
 -        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 -      fi
--      ;;
--    pw32*)
--      # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
--      ;;
--    esac
--    ;;
--
--  *)
--    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
--    ;;
--  esac
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
++    dynamic_linker='Win32 ld.exe'
++    ;;
++
++  *,cl*)
++    # Native MSVC
++    libname_spec='$name'
++    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++    library_names_spec='${libname}.dll.lib'
++
++    case $build_os in
++    mingw*)
++      sys_lib_search_path_spec=
++      lt_save_ifs=$IFS
++      IFS=';'
++      for lt_path in $LIB
++      do
++        IFS=$lt_save_ifs
++        # Let DOS variable expansion print the short 8.3 style file name.
++        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
++        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
++      done
++      IFS=$lt_save_ifs
++      # Convert to MSYS style.
++      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
++      ;;
++    cygwin*)
++      # Convert to unix form, then to dos form, then back to unix form
++      # but this time dos style (no spaces!) so that the unix form looks
++      # like /cygdrive/c/PROGRA~1:/cygdr...
++      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
++      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
++      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++      ;;
++    *)
++      sys_lib_search_path_spec="$LIB"
++      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH.
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      # FIXME: find the short name or the path components, as spaces are
++      # common. (e.g. "Program Files" -> "PROGRA~1")
++      ;;
++    esac
++
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
++    dynamic_linker='Win32 link.exe'
+     ;;
+ 
+   *)
++    # Assume MSVC wrapper
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    dynamic_linker='Win32 ld.exe'
+     ;;
+   esac
 -  dynamic_linker='Win32 ld.exe'
--  # FIXME: first we should search . and the directory the executable is in
--  shlibpath_var=PATH
--  ;;
--
--darwin* | rhapsody*)
--  dynamic_linker="$host_os dyld"
--  version_type=darwin
--  need_lib_prefix=no
--  need_version=no
+   # FIXME: first we should search . and the directory the executable is in
+   shlibpath_var=PATH
+   ;;
+@@ -12996,17 +11402,13 @@
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
 -  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
--  soname_spec='${libname}${release}${major}$shared_ext'
--  shlibpath_overrides_runpath=yes
--  shlibpath_var=DYLD_LIBRARY_PATH
--  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 -  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
 -  if test "$GCC" = yes; then
 -    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
 -  else
 -    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
 -  fi
--  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
--  ;;
--
--dgux*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
++
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -13023,18 +11425,6 @@
+   dynamic_linker=no
+   ;;
+ 
 -kfreebsd*-gnu)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -50292,70 +54018,45 @@
 -  dynamic_linker='GNU ld.so'
 -  ;;
 -
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
--  case $version_type in
--    freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
--      need_version=no
--      need_lib_prefix=no
--      ;;
--    freebsd-*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
--      need_version=yes
--      ;;
--  esac
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_os in
--  freebsd2*)
--    shlibpath_overrides_runpath=yes
--    ;;
--  freebsd3.01* | freebsdelf3.01*)
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
--    ;;
--  *) # from 3.2 on
--    shlibpath_overrides_runpath=no
--    hardcode_into_libs=yes
--    ;;
--  esac
--  ;;
--
--gnu*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  hardcode_into_libs=yes
--  ;;
--
--hpux9* | hpux10* | hpux11*)
--  # Give a soname corresponding to the major version so that dld.sl refuses to
--  # link against other versions.
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  case "$host_cpu" in
--  ia64*)
--    shrext='.so'
--    hardcode_into_libs=yes
--    dynamic_linker="$host_os dld.so"
--    shlibpath_var=LD_LIBRARY_PATH
--    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    if test "X$HPUX_IA64_MODE" = X32; then
--      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
--    else
--      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
--    fi
--    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
--    ;;
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -13072,7 +11462,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -13086,6 +11476,20 @@
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
++haiku*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  dynamic_linker="$host_os runtime_loader"
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+   hardcode_into_libs=yes
+   ;;
+ 
+@@ -13111,18 +11515,18 @@
+     fi
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
 -   hppa*64*)
--     shrext='.sl'
+-     shrext_cmds='.sl'
 -     hardcode_into_libs=yes
 -     dynamic_linker="$host_os dld.sl"
 -     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -50366,264 +54067,256 @@
 -     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 -     ;;
 -   *)
--    shrext='.sl'
--    dynamic_linker="$host_os dld.sl"
--    shlibpath_var=SHLIB_PATH
--    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    ;;
--  esac
++  hppa*64*)
++    shrext_cmds='.sl'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++  *)
+     shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+@@ -13131,11 +11535,13 @@
+     soname_spec='${libname}${release}${shared_ext}$major'
+     ;;
+   esac
 -  # HP-UX runs *really* slowly unless shared libraries are mode 555.
--  postinstall_cmds='chmod 555 $lib'
--  ;;
--
--irix5* | irix6* | nonstopux*)
--  case $host_os in
--    nonstopux*) version_type=nonstopux ;;
--    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
--	else
--		version_type=irix
--	fi ;;
--  esac
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
--  case $host_os in
--  irix5* | nonstopux*)
--    libsuff= shlibsuff=
--    ;;
--  *)
--    case $LD in # libtool.m4 will add one of these switches to LD
--    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
--      libsuff= shlibsuff= libmagic=32-bit;;
--    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
--      libsuff=32 shlibsuff=N32 libmagic=N32;;
--    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
--      libsuff=64 shlibsuff=64 libmagic=64-bit;;
--    *) libsuff= shlibsuff= libmagic=never-match;;
--    esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+   postinstall_cmds='chmod 555 $lib'
++  # or fails outright, so override atomically:
++  install_override_mode=555
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -13190,7 +11596,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -13199,36 +11605,50 @@
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
++
++  # Some binutils ld are patched to set DT_RUNPATH
++  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_shlibpath_overrides_runpath=no
++    save_LDFLAGS=$LDFLAGS
++    save_libdir=$libdir
++    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
++	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
++  lt_cv_shlibpath_overrides_runpath=yes
++fi
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++    LDFLAGS=$save_LDFLAGS
++    libdir=$save_libdir
++
++fi
++
++  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
++
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 13211 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
 -    ;;
 -  esac
--  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
--  shlibpath_overrides_runpath=no
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
--  hardcode_into_libs=yes
--  ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
--  dynamic_linker=no
--  ;;
--
--# This must be Linux ELF.
--linux*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  # This implies no fast_install, which is unacceptable.
--  # Some rework will be needed to allow for fast_install
--  # before this can be enabled.
--  hardcode_into_libs=yes
--
--  # Append ld.so.conf contents to the search path
--  if test -f /etc/ld.so.conf; then
--    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
--  fi
--
--  # We used to test for /lib/ld.so.1 and disable shared libraries on
--  # powerpc, because MkLinux only supported shared libraries with the
--  # GNU dynamic linker.  Since this was broken with cross compilers,
--  # most powerpc-linux boxes support dynamic linking these days and
--  # people can always --disable-shared, the test was removed, and we
--  # assume the GNU/Linux dynamic linker is in use.
--  dynamic_linker='GNU/Linux ld.so'
--  ;;
 -
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -13240,7 +11660,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
 -knetbsd*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -13249,14 +11669,14 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
 -  dynamic_linker='GNU ld.so'
--  ;;
--
--netbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
 -  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--    dynamic_linker='NetBSD (a.out) ld.so'
--  else
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    dynamic_linker='NetBSD ld.elf_so'
--  fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  ;;
--
--newsos6)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  ;;
--
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+@@ -13277,14 +11697,16 @@
+   shlibpath_overrides_runpath=yes
+   ;;
+ 
 -nto-qnx*)
 -  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
++*nto* | *qnx*)
++  version_type=qnx
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
--  ;;
--
--openbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=yes
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='ldqnx.so'
+   ;;
+ 
+ openbsd*)
+@@ -13293,13 +11715,13 @@
+   need_lib_prefix=no
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   case $host_os in
+-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+-    *)                         need_version=no  ;;
++    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
++    *)				need_version=no  ;;
+   esac
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
 -  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    case $host_os in
--      openbsd2.[89] | openbsd2.[89].*)
--	shlibpath_overrides_runpath=no
--	;;
--      *)
--	shlibpath_overrides_runpath=yes
--	;;
--      esac
--  else
--    shlibpath_overrides_runpath=yes
--  fi
--  ;;
--
--os2*)
--  libname_spec='$name'
--  shrext=".dll"
--  need_lib_prefix=no
--  library_names_spec='$libname${shared_ext} $libname.a'
--  dynamic_linker='OS/2 ld.exe'
--  shlibpath_var=LIBPATH
--  ;;
--
--osf3* | osf4* | osf5*)
--  version_type=osf
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
--  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
--  ;;
--
--sco3.2v5*)
--  version_type=osf
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--solaris*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  # ldd complains unless libraries are executable
--  postinstall_cmds='chmod +x $lib'
--  ;;
--
--sunos4*)
--  version_type=sunos
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--  fi
--  need_version=yes
--  ;;
--
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_vendor in
--    sni)
--      shlibpath_overrides_runpath=no
--      need_lib_prefix=no
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+     case $host_os in
+       openbsd2.[89] | openbsd2.[89].*)
+ 	shlibpath_overrides_runpath=no
+@@ -13333,6 +11755,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -13367,7 +11793,6 @@
+     sni)
+       shlibpath_overrides_runpath=no
+       need_lib_prefix=no
 -      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      runpath_var=LD_RUN_PATH
--      ;;
--    siemens)
--      need_lib_prefix=no
--      ;;
--    motorola)
--      need_lib_prefix=no
--      need_version=no
--      shlibpath_overrides_runpath=no
--      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
--      ;;
--  esac
--  ;;
--
--sysv4*MP*)
--  if test -d /usr/nec ;then
--    version_type=linux
--    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
--    soname_spec='$libname${shared_ext}.$major'
--    shlibpath_var=LD_LIBRARY_PATH
--  fi
--  ;;
--
--uts4*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--*)
--  dynamic_linker=no
--  ;;
--esac
+       runpath_var=LD_RUN_PATH
+       ;;
+     siemens)
+@@ -13398,13 +11823,12 @@
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+   if test "$with_gnu_ld" = yes; then
+     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+-    shlibpath_overrides_runpath=no
+   else
+     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+-    shlibpath_overrides_runpath=yes
+     case $host_os in
+       sco3.2v5*)
+         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+@@ -13414,6 +11838,17 @@
+   sys_lib_dlsearch_path_spec='/usr/lib'
+   ;;
+ 
++tpf*)
++  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -13425,8 +11860,8 @@
+   dynamic_linker=no
+   ;;
+ esac
 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6
--test "$dynamic_linker" = no && can_build_shared=no
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
++$as_echo "$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+@@ -13434,5684 +11869,1397 @@
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+ 
 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 -hardcode_action_CXX=
 -if test -n "$hardcode_libdir_flag_spec_CXX" || \
--   test -n "$runpath_var CXX" || \
--   test "X$hardcode_automatic_CXX"="Xyes" ; then
+-   test -n "$runpath_var_CXX" || \
+-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 -
 -  # We can hardcode non-existant directories.
 -  if test "$hardcode_direct_CXX" != no &&
@@ -50642,7 +54335,9 @@
 -  # We cannot hardcode anything, or else we can only hardcode existing
 -  # directories.
 -  hardcode_action_CXX=unsupported
--fi
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
 -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
 -echo "${ECHO_T}$hardcode_action_CXX" >&6
 -
@@ -50653,1377 +54348,3632 @@
 -     test "$enable_shared" = no; then
 -  # Fast installation is not necessary
 -  enable_fast_install=needless
--fi
--
--striplib=
--old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--   darwin*)
--       if test -n "$STRIP" ; then
--         striplib="$STRIP -x"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--       else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--       ;;
--   *)
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--    ;;
--  esac
--fi
--
--if test "x$enable_dlopen" != xyes; then
--  enable_dlopen=unknown
--  enable_dlopen_self=unknown
--  enable_dlopen_self_static=unknown
--else
--  lt_cv_dlopen=no
--  lt_cv_dlopen_libs=
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+ 
+ 
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # 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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+-    SED SHELL STRIP \
+-    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 \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_CXX \
+-    CC_CXX \
+-    LD_CXX \
+-    lt_prog_compiler_wl_CXX \
+-    lt_prog_compiler_pic_CXX \
+-    lt_prog_compiler_static_CXX \
+-    lt_prog_compiler_no_builtin_flag_CXX \
+-    export_dynamic_flag_spec_CXX \
+-    thread_safe_flag_spec_CXX \
+-    whole_archive_flag_spec_CXX \
+-    enable_shared_with_static_runtimes_CXX \
+-    old_archive_cmds_CXX \
+-    old_archive_from_new_cmds_CXX \
+-    predep_objects_CXX \
+-    postdep_objects_CXX \
+-    predeps_CXX \
+-    postdeps_CXX \
+-    compiler_lib_search_path_CXX \
+-    archive_cmds_CXX \
+-    archive_expsym_cmds_CXX \
+-    postinstall_cmds_CXX \
+-    postuninstall_cmds_CXX \
+-    old_archive_from_expsyms_cmds_CXX \
+-    allow_undefined_flag_CXX \
+-    no_undefined_flag_CXX \
+-    export_symbols_cmds_CXX \
+-    hardcode_libdir_flag_spec_CXX \
+-    hardcode_libdir_flag_spec_ld_CXX \
+-    hardcode_libdir_separator_CXX \
+-    hardcode_automatic_CXX \
+-    module_cmds_CXX \
+-    module_expsym_cmds_CXX \
+-    lt_cv_prog_compiler_c_o_CXX \
+-    exclude_expsyms_CXX \
+-    include_expsyms_CXX; do
 -
--  case $host_os in
--  beos*)
--    lt_cv_dlopen="load_add_on"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ;;
--
--  mingw* | pw32*)
--    lt_cv_dlopen="LoadLibrary"
--    lt_cv_dlopen_libs=
--   ;;
+-    case $var in
+-    old_archive_cmds_CXX | \
+-    old_archive_from_new_cmds_CXX | \
+-    archive_cmds_CXX | \
+-    archive_expsym_cmds_CXX | \
+-    module_cmds_CXX | \
+-    module_expsym_cmds_CXX | \
+-    old_archive_from_expsyms_cmds_CXX | \
+-    export_symbols_cmds_CXX | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
 -
--  cygwin*)
--    lt_cv_dlopen="dlopen"
--    lt_cv_dlopen_libs=
--   ;;
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
 -
--  darwin*)
--  # if libdl is installed we need to link against it
--    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
+-cfgfile="$ofile"
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dl_dlopen=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 -
--ac_cv_lib_dl_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 -
--    lt_cv_dlopen="dyld"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
 -
--fi
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
 -
--   ;;
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+ 
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
+ 
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+ 
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+ 
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
+ 
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+ 
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+ 
+-# A C compiler.
+-LTCC=$lt_LTCC
+ 
+-# LTCC compiler flags.
+-LTCFLAGS=$lt_LTCFLAGS
+ 
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+ 
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+ 
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
+ 
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+ 
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+ 
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+ 
+-# A symbol stripping program
+-STRIP=$lt_STRIP
+ 
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+ 
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+ 
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+ 
+-# Used on cygwin: assembler.
+-AS="$AS"
+ 
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+ 
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+ 
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
+ 
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+ 
+-# Old archive suffix (normally "a").
+-libext="$libext"
+ 
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
+ 
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+ 
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_CXX
+-pic_mode=$pic_mode
+ 
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+ 
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
+ 
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+ 
+-# Do we need a version for libraries?
+-need_version=$need_version
+ 
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+ 
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+ 
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+ 
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_CXX
+ 
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+ 
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+ 
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+ 
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+ 
+-# Library versioning type.
+-version_type=$version_type
+ 
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+ 
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+ 
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_CXX
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+ 
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_CXX
+-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_CXX
+-module_expsym_cmds=$lt_module_expsym_cmds_CXX
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 -
--  *)
--    echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
--if test "${ac_cv_func_shl_load+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_CXX
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_CXX
+ 
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_CXX
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_CXX
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+ 
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ 
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ 
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_CXX
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
+ 
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+ 
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+ 
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct_CXX
+ 
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L_CXX
+ 
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+ 
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$hardcode_automatic_CXX
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs_CXX
+ 
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+ 
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_CXX"
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols_CXX
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_CXX
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_CXX
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_CXX
+ 
+-# ### END LIBTOOL TAG CONFIG: $tagname
+ 
+-__EOF__
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
++$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" ||
++   test -n "$runpath_var" ||
++   test "X$hardcode_automatic" = "Xyes" ; then
+ 
 -else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define shl_load innocuous_shl_load
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char shl_load (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
+-  # 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.
+-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+-  if test -f "$ltmain_in"; then
+-    test -f Makefile && make "$ltmain"
++  # We can hardcode non-existent directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
+   fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
++$as_echo "$hardcode_action" >&6; }
+ 
++if test "$hardcode_action" = relink ||
++   test "$inherit_rpath" = yes; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
+ 
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
+-CC=$lt_save_CC
+-LDCXX=$LD
+-LD=$lt_save_LD
+-GCC=$lt_save_GCC
+-with_gnu_ldcxx=$with_gnu_ld
+-with_gnu_ld=$lt_save_with_gnu_ld
+-lt_cv_path_LDCXX=$lt_cv_path_LD
+-lt_cv_path_LD=$lt_save_path_LD
+-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+ 
+-	else
+-	  tagname=""
+-	fi
+-	;;
+ 
+-      F77)
+-	if test -n "$F77" && test "X$F77" != "Xno"; then
+ 
+-ac_ext=f
+-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 -
--#undef shl_load
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char shl_load ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_shl_load) || defined (__stub___shl_load)
--choke me
--#else
--char (*f) () = shl_load;
--#endif
--#ifdef __cplusplus
--}
--#endif
+-archive_cmds_need_lc_F77=no
+-allow_undefined_flag_F77=
+-always_export_symbols_F77=no
+-archive_expsym_cmds_F77=
+-export_dynamic_flag_spec_F77=
+-hardcode_direct_F77=no
+-hardcode_libdir_flag_spec_F77=
+-hardcode_libdir_flag_spec_ld_F77=
+-hardcode_libdir_separator_F77=
+-hardcode_minus_L_F77=no
+-hardcode_automatic_F77=no
+-module_cmds_F77=
+-module_expsym_cmds_F77=
+-link_all_deplibs_F77=unknown
+-old_archive_cmds_F77=$old_archive_cmds
+-no_undefined_flag_F77=
+-whole_archive_flag_spec_F77=
+-enable_shared_with_static_runtimes_F77=no
+ 
+-# Source file extension for f77 test sources.
+-ac_ext=f
+ 
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-objext_F77=$objext
++  if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++  mingw* | pw32* | cegcc*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++    ;;
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++    ;;
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++  darwin*)
++  # if libdl is installed we need to link against it
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++if ${ac_cv_lib_dl_dlopen+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dl_dlopen=yes
++else
++  ac_cv_lib_dl_dlopen=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
+ 
++fi
+ 
+-# save warnings/boilerplate of simple test code
+-ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_compiler_boilerplate=`cat conftest.err`
+-$rm conftest*
++    ;;
+ 
+-ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++  *)
++    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
++if test "x$ac_cv_func_shl_load" = xyes; then :
++  lt_cv_dlopen="shl_load"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
++$as_echo_n "checking for shl_load in -ldld... " >&6; }
++if ${ac_cv_lib_dld_shl_load+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char shl_load ();
++int
++main ()
++{
++return shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dld_shl_load=yes
++else
++  ac_cv_lib_dld_shl_load=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
++$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++else
++  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
++if test "x$ac_cv_func_dlopen" = xyes; then :
++  lt_cv_dlopen="dlopen"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++if ${ac_cv_lib_dl_dlopen+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${F77-"f77"}
+-compiler=$CC
+-compiler_F77=$CC
+-for cc_temp in $compiler""; do
+-  case $cc_temp in
+-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 -
--int
--main ()
--{
--return f != shl_load;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_func_shl_load=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_cv_func_shl_load=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
--if test $ac_cv_func_shl_load = yes; then
--  lt_cv_dlopen="shl_load"
--else
--  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char shl_load ();
--int
--main ()
--{
--shl_load ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dld_shl_load=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+-test "$can_build_shared" = "no" && enable_shared=no
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dl_dlopen=yes
++else
++  ac_cv_lib_dl_dlopen=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
++$as_echo_n "checking for dlopen in -lsvld... " >&6; }
++if ${ac_cv_lib_svld_dlopen+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+-  fi
+-  ;;
+-aix4* | aix5*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
+-  fi
+-  ;;
+-esac
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_svld_dlopen=yes
++else
++  ac_cv_lib_svld_dlopen=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
++$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
++if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
++$as_echo_n "checking for dld_link in -ldld... " >&6; }
++if ${ac_cv_lib_dld_dld_link+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
 -
--ac_cv_lib_dld_shl_load=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
--if test $ac_cv_lib_dld_shl_load = yes; then
--  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
--else
--  echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
--if test "${ac_cv_func_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define dlopen innocuous_dlopen
+-GCC_F77="$G77"
+-LD_F77="$LD"
 -
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char dlopen (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
+-lt_prog_compiler_wl_F77=
+-lt_prog_compiler_pic_F77=
+-lt_prog_compiler_static_F77=
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dld_link ();
++int
++main ()
++{
++return dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dld_dld_link=yes
++else
++  ac_cv_lib_dld_dld_link=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
++$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
++if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
++fi
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+ 
+-  if test "$GCC" = yes; then
+-    lt_prog_compiler_wl_F77='-Wl,'
+-    lt_prog_compiler_static_F77='-static'
++fi
+ 
+-    case $host_os in
+-      aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static_F77='-Bstatic'
+-      fi
+-      ;;
+ 
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+-      ;;
++fi
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+ 
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+-      ;;
++fi
+ 
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      lt_prog_compiler_pic_F77='-fno-common'
+-      ;;
+ 
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
+-      ;;
++fi
+ 
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      lt_prog_compiler_can_build_shared_F77=no
+-      enable_shared=no
+-      ;;
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic_F77=-Kconform_pic
+-      fi
+-      ;;
++fi
+ 
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	lt_prog_compiler_pic_F77='-fPIC'
+-	;;
+-      esac
+-      ;;
++    ;;
++  esac
+ 
+-    *)
+-      lt_prog_compiler_pic_F77='-fPIC'
+-      ;;
+-    esac
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
+   else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static_F77='-Bstatic'
+-      else
+-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+-      fi
+-      ;;
+-      darwin*)
+-        # PIC is the default on this platform
+-        # Common symbols not allowed in MH_DYLIB files
+-       case $cc_basename in
+-         xlc*)
+-         lt_prog_compiler_pic_F77='-qnocommon'
+-         lt_prog_compiler_wl_F77='-Wl,'
+-         ;;
+-       esac
+-       ;;
 -
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+-      ;;
 -
--#undef dlopen
+-    hpux9* | hpux10* | hpux11*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	lt_prog_compiler_pic_F77='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
+-      ;;
++    enable_dlopen=no
++  fi
+ 
+-    irix5* | irix6* | nonstopux*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      lt_prog_compiler_static_F77='-non_shared'
+-      ;;
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+-    newsos6)
+-      lt_prog_compiler_pic_F77='-KPIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
++    save_LDFLAGS="$LDFLAGS"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+-    linux*)
+-      case $cc_basename in
+-      icc* | ecc*)
+-	lt_prog_compiler_wl_F77='-Wl,'
+-	lt_prog_compiler_pic_F77='-KPIC'
+-	lt_prog_compiler_static_F77='-static'
+-        ;;
+-      pgcc* | pgf77* | pgf90* | pgf95*)
+-        # Portland Group compilers (*not* the Pentium gcc compiler,
+-	# which looks to be a dead project)
+-	lt_prog_compiler_wl_F77='-Wl,'
+-	lt_prog_compiler_pic_F77='-fpic'
+-	lt_prog_compiler_static_F77='-Bstatic'
+-        ;;
+-      ccc*)
+-        lt_prog_compiler_wl_F77='-Wl,'
+-        # All Alpha code is PIC.
+-        lt_prog_compiler_static_F77='-non_shared'
+-        ;;
+-      esac
+-      ;;
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+-    osf3* | osf4* | osf5*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      # All OSF/1 code is PIC.
+-      lt_prog_compiler_static_F77='-non_shared'
+-      ;;
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
++$as_echo_n "checking whether a program can dlopen itself... " >&6; }
++if ${lt_cv_dlopen_self+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<_LT_EOF
++#line $LINENO "configure"
++#include "confdefs.h"
+ 
+-    solaris*)
+-      lt_prog_compiler_pic_F77='-KPIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      case $cc_basename in
+-      f77* | f90* | f95*)
+-	lt_prog_compiler_wl_F77='-Qoption ld ';;
+-      *)
+-	lt_prog_compiler_wl_F77='-Wl,';;
+-      esac
+-      ;;
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
+-    sunos4*)
+-      lt_prog_compiler_wl_F77='-Qoption ld '
+-      lt_prog_compiler_pic_F77='-PIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
++#include <stdio.h>
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_pic_F77='-KPIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	lt_prog_compiler_pic_F77='-Kconform_pic'
+-	lt_prog_compiler_static_F77='-Bstatic'
+-      fi
+-      ;;
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
+ 
+-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_pic_F77='-KPIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
++/* When -fvisbility=hidden is used, assume the code has been annotated
++   correspondingly for the symbols needed.  */
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++int fnord () __attribute__((visibility("default")));
++#endif
+ 
+-    unicos*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_can_build_shared_F77=no
+-      ;;
++int fnord () { return 42; }
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
+ 
+-    uts4*)
+-      lt_prog_compiler_pic_F77='-pic'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else
++        {
++	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
++          else puts (dlerror ());
++	}
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
+ 
+-    *)
+-      lt_prog_compiler_can_build_shared_F77=no
+-      ;;
++  return status;
++}
++_LT_EOF
++  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) >&5 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+     esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
+   fi
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_dlopen) || defined (__stub___dlopen)
--choke me
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
--}
--#endif
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
 -
--int
--main ()
--{
--return f != dlopen;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_func_dlopen=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$lt_prog_compiler_pic_F77"; then
 -
--ac_cv_func_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
--if test $ac_cv_func_dlopen = yes; then
--  lt_cv_dlopen="dlopen"
--else
--  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dl_dlopen=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-  lt_prog_compiler_pic_works_F77=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -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:14269: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
+-   echo "$as_me:14273: \$? = $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 other than the usual output.
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+-       lt_prog_compiler_pic_works_F77=yes
+-     fi
+-   fi
+-   $rm conftest*
 -
--ac_cv_lib_dl_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
--  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
--if test "${ac_cv_lib_svld_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsvld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_svld_dlopen=yes
+-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+-    case $lt_prog_compiler_pic_F77 in
+-     "" | " "*) ;;
+-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+-     esac
 -else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_svld_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
+-    lt_prog_compiler_pic_F77=
+-     lt_prog_compiler_can_build_shared_F77=no
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
--if test $ac_cv_lib_svld_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
--else
--  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+-
+ fi
+-case $host_os in
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    lt_prog_compiler_pic_F77=
+-    ;;
+-  *)
+-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
+-    ;;
+-esac
++rm -fr conftest*
+ 
+-#
+-# Check to make sure the static flag actually works.
+-#
+-wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
+-  lt_prog_compiler_static_works_F77=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The linker can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&5
+-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-       if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works_F77=yes
+-       fi
+-     else
+-       lt_prog_compiler_static_works_F77=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
++$as_echo "$lt_cv_dlopen_self" >&6; }
+ 
+-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+-    :
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
++$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
++if ${lt_cv_dlopen_self_static+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-    lt_prog_compiler_static_F77=
+-fi
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dld_link ();
--int
--main ()
--{
--dld_link ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dld_dld_link=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_cv_lib_dld_dld_link=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
--if test $ac_cv_lib_dld_dld_link = yes; then
--  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
--fi
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
+ else
+-  lt_cv_prog_compiler_c_o_F77=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 -
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -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:14373: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&5
+-   echo "$as_me:14377: \$? = $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
+-     # So say no if there are warnings
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+-       lt_cv_prog_compiler_c_o_F77=yes
+-     fi
+-   fi
+-   chmod u+w . 2>&5
+-   $rm conftest*
+-   # SGI C++ compiler will create directory out/ii_files/ for
+-   # template instantiation
+-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+-   $rm out/* && rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
 -
 -fi
--
--
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<_LT_EOF
++#line $LINENO "configure"
++#include "confdefs.h"
+ 
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
+-hard_links="nottested"
+-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+-  hard_links=yes
+-  $rm conftest*
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  touch conftest.a
+-  ln conftest.a conftest.b 2>&5 || hard_links=no
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
+-  if test "$hard_links" = no; then
+-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+-    need_locks=warn
+-  fi
+-else
+-  need_locks=no
 -fi
++#include <stdio.h>
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
+ 
+-  runpath_var=
+-  allow_undefined_flag_F77=
+-  enable_shared_with_static_runtimes_F77=no
+-  archive_cmds_F77=
+-  archive_expsym_cmds_F77=
+-  old_archive_From_new_cmds_F77=
+-  old_archive_from_expsyms_cmds_F77=
+-  export_dynamic_flag_spec_F77=
+-  whole_archive_flag_spec_F77=
+-  thread_safe_flag_spec_F77=
+-  hardcode_libdir_flag_spec_F77=
+-  hardcode_libdir_flag_spec_ld_F77=
+-  hardcode_libdir_separator_F77=
+-  hardcode_direct_F77=no
+-  hardcode_minus_L_F77=no
+-  hardcode_shlibpath_var_F77=unsupported
+-  link_all_deplibs_F77=unknown
+-  hardcode_automatic_F77=no
+-  module_cmds_F77=
+-  module_expsym_cmds_F77=
+-  always_export_symbols_F77=no
+-  export_symbols_cmds_F77='$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*
+-  # included in the symbol list
+-  include_expsyms_F77=
+-  # exclude_expsyms can be an extended regexp of symbols to exclude
+-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-  # as well as any symbol that contains `d'.
+-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-  # platforms (ab)use it in PIC code, but their linkers get confused if
+-  # the symbol is explicitly referenced.  Since portable code cannot
+-  # rely on this symbol name, it's probably fine to never include it in
+-  # preloaded symbol tables.
+-  extract_expsyms_cmds=
+-  # Just being paranoid about ensuring that cc_basename is set.
+-  for cc_temp in $compiler""; do
+-  case $cc_temp in
+-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    if test "$GCC" != yes; then
+-      with_gnu_ld=no
+-    fi
+-    ;;
+-  interix*)
+-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+-    with_gnu_ld=yes
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
++/* When -fvisbility=hidden is used, assume the code has been annotated
++   correspondingly for the symbols needed.  */
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++int fnord () __attribute__((visibility("default")));
++#endif
+ 
+-  ld_shlibs_F77=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
++int fnord () { return 42; }
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
+ 
+-    # Set some defaults for GNU ld with shared library support. These
+-    # are reset later if shared libraries are not supported. Putting them
+-    # here allows them to be overridden if necessary.
+-    runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+-    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+       else
+-  	whole_archive_flag_spec_F77=
+-    fi
+-    supports_anon_versioning=no
+-    case `$LD -v 2>/dev/null` in
+-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-      *\ 2.11.*) ;; # other 2.11 versions
+-      *) supports_anon_versioning=yes ;;
+-    esac
 -
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	ld_shlibs_F77=no
+-	cat <<EOF 1>&2
 -
--fi
--
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
 -
--fi
+-EOF
+-      fi
+-      ;;
 -
+-    amigaos*)
+-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_minus_L_F77=yes
 -
--fi
+-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      ld_shlibs_F77=no
+-      ;;
 -
--    ;;
--  esac
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	allow_undefined_flag_F77=unsupported
+-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
 -
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
--  else
--    enable_dlopen=no
--  fi
+-    cygwin* | mingw* | pw32*)
+-      # _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'
+-      allow_undefined_flag_F77=unsupported
+-      always_export_symbols_F77=no
+-      enable_shared_with_static_runtimes_F77=yes
+-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 -
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-	# 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
+-	  cp $export_symbols $output_objdir/$soname.def;
+-	else
+-	  echo EXPORTS > $output_objdir/$soname.def;
+-	  cat $export_symbols >> $output_objdir/$soname.def;
+-	fi~
+-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
 -
--    save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-    interix3*)
+-      hardcode_direct_F77=no
+-      hardcode_shlibpath_var_F77=no
+-      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-      export_dynamic_flag_spec_F77='${wl}-E'
+-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-      # Instead, shared libraries are loaded at an image base (0x10000000 by
+-      # default) and relocated if they conflict, which is a slow very memory
+-      # consuming and fragmenting process.  To avoid this, we pick a random,
+-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-      ;;
 -
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
+-    linux*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	tmp_addflag=
+-	case $cc_basename,$host_cpu in
+-	pgcc*)				# Portland Group C compiler
+-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag'
+-	  ;;
+-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag -Mnomain' ;;
+-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+-	  tmp_addflag=' -i_dynamic' ;;
+-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+-	ifc* | ifort*)			# Intel Fortran compiler
+-	  tmp_addflag=' -nofor_main' ;;
+-	esac
+-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 13473 "configure"
--#include "confdefs.h"
+-	if test $supports_anon_versioning = yes; then
+-	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-  $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-	fi
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
 -
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
+-      ;;
 -
--#include <stdio.h>
+-    solaris*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	ld_shlibs_F77=no
+-	cat <<EOF 1>&2
 -
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
 -
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
 -
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
+-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+-      case `$LD -v 2>&1` in
+-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+-	ld_shlibs_F77=no
+-	cat <<_LT_EOF 1>&2
 -
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+-*** reliably create shared libraries on SCO systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++        {
++	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
++          else puts (dlerror ());
++	}
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
+ 
++  return status;
++}
+ _LT_EOF
+-	;;
+-	*)
+-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+-	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+-	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+-	  else
+-	    ld_shlibs_F77=no
+-	  fi
+-	;;
+-      esac
+-      ;;
 -
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
+-    sunos4*)
+-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 -
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
 -    esac
--  else :
--    # compilation failed
--    lt_cv_dlopen_self=no
--  fi
--fi
--rm -fr conftest*
 -
+-    if test "$ld_shlibs_F77" = no; then
+-      runpath_var=
+-      hardcode_libdir_flag_spec_F77=
+-      export_dynamic_flag_spec_F77=
+-      whole_archive_flag_spec_F77=
+-    fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      allow_undefined_flag_F77=unsupported
+-      always_export_symbols_F77=yes
+-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-      # Note: this linker hardcodes the directories in LIBPATH if there
+-      # are no directories specified by -L.
+-      hardcode_minus_L_F77=yes
+-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	hardcode_direct_F77=unsupported
+-      fi
+-      ;;
 -
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-    aix4* | aix5*)
+-      if test "$host_cpu" = ia64; then
+-	# On IA64, the linker does run time linking by default, so we don't
+-	# have to do anything special.
+-	aix_use_runtimelinking=no
+-	exp_sym_flag='-Bexport'
+-	no_entry_flag=""
+-      else
+-	# If we're using GNU nm, then we don't want the "-C" option.
+-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+-	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
+-	aix_use_runtimelinking=no
 -
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self_static=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 13571 "configure"
--#include "confdefs.h"
+-	# Test if we are trying to use run time linking or normal
+-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-	# need to do runtime linking.
+-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+-	  for ld_flag in $LDFLAGS; do
+-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+-  	    aix_use_runtimelinking=yes
+-  	    break
+-  	  fi
+-	  done
+-	  ;;
+-	esac
 -
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
+-	exp_sym_flag='-bexport'
+-	no_entry_flag='-bnoentry'
+-      fi
 -
--#include <stdio.h>
+-      # When large executables or shared objects are built, AIX ld can
+-      # have problems creating the table of contents.  If linking a library
+-      # or program results in "error TOC overflow" add -mminimal-toc to
+-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 -
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
+-      archive_cmds_F77=''
+-      hardcode_direct_F77=yes
+-      hardcode_libdir_separator_F77=':'
+-      link_all_deplibs_F77=yes
 -
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
+-      if test "$GCC" = yes; then
+-	case $host_os in aix4.[012]|aix4.[012].*)
+-	# We only want to do this on AIX 4.2 and lower, the check
+-	# below for broken collect2 doesn't work under 4.3+
+-	  collect2name=`${CC} -print-prog-name=collect2`
+-	  if test -f "$collect2name" && \
+-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	  then
+-  	  # We have reworked collect2
+-  	  hardcode_direct_F77=yes
+-	  else
+-  	  # We have old collect2
+-  	  hardcode_direct_F77=unsupported
+-  	  # It fails to find uninstalled libraries when the uninstalled
+-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-  	  # to unsupported forces relinking
+-  	  hardcode_minus_L_F77=yes
+-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
+-  	  hardcode_libdir_separator_F77=
+-	  fi
+-	  ;;
+-	esac
+-	shared_flag='-shared'
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag="$shared_flag "'${wl}-G'
+-	fi
+-      else
+-	# not using gcc
+-	if test "$host_cpu" = ia64; then
+-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-  	# chokes on -Wl,-G. The following line is correct:
+-	  shared_flag='-G'
+-	else
+-	  if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='${wl}-G'
+-	  else
+-	    shared_flag='${wl}-bM:SRE'
+-	  fi
+-	fi
+-      fi
 -
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
+-      # It seems that -bexpall does not export symbols beginning with
+-      # underscore (_), so it is better to generate a list of symbols to export.
+-      always_export_symbols_F77=yes
+-      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.
+-	allow_undefined_flag_F77='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
+-       cat >conftest.$ac_ext <<_ACEOF
+-      program main
 -
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-      end
+-_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); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
--    esac
--  else :
--    # compilation failed
--    lt_cv_dlopen_self_static=no
--  fi
--fi
--rm -fr conftest*
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  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
 -
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
 -fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
--    fi
--
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
--    ;;
--  esac
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 -
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
+-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+-	  allow_undefined_flag_F77="-z nodefs"
+-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 cat >conftest.$ac_ext <<_ACEOF
+-      program main
 -
--  case $lt_cv_dlopen_self_static in
--  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
--  *) enable_dlopen_self_static=unknown ;;
--  esac
--fi
+-      end
+-_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_f77_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
 -
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
--# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # See if we are running on zsh, and set the options which allow our commands through
--  # without removal of \ escapes.
--  if test -n "${ZSH_VERSION+set}" ; then
--    setopt NO_GLOB_SUBST
--  fi
--  # 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.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
--    SED SHELL STRIP \
--    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 \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    compiler_CXX \
--    CC_CXX \
--    LD_CXX \
--    lt_prog_compiler_wl_CXX \
--    lt_prog_compiler_pic_CXX \
--    lt_prog_compiler_static_CXX \
--    lt_prog_compiler_no_builtin_flag_CXX \
--    export_dynamic_flag_spec_CXX \
--    thread_safe_flag_spec_CXX \
--    whole_archive_flag_spec_CXX \
--    enable_shared_with_static_runtimes_CXX \
--    old_archive_cmds_CXX \
--    old_archive_from_new_cmds_CXX \
--    predep_objects_CXX \
--    postdep_objects_CXX \
--    predeps_CXX \
--    postdeps_CXX \
--    compiler_lib_search_path_CXX \
--    archive_cmds_CXX \
--    archive_expsym_cmds_CXX \
--    postinstall_cmds_CXX \
--    postuninstall_cmds_CXX \
--    old_archive_from_expsyms_cmds_CXX \
--    allow_undefined_flag_CXX \
--    no_undefined_flag_CXX \
--    export_symbols_cmds_CXX \
--    hardcode_libdir_flag_spec_CXX \
--    hardcode_libdir_flag_spec_ld_CXX \
--    hardcode_libdir_separator_CXX \
--    hardcode_automatic_CXX \
--    module_cmds_CXX \
--    module_expsym_cmds_CXX \
--    lt_cv_prog_compiler_c_o_CXX \
--    exclude_expsyms_CXX \
--    include_expsyms_CXX; do
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 -
--    case $var in
--    old_archive_cmds_CXX | \
--    old_archive_from_new_cmds_CXX | \
--    archive_cmds_CXX | \
--    archive_expsym_cmds_CXX | \
--    module_cmds_CXX | \
--    module_expsym_cmds_CXX | \
--    old_archive_from_expsyms_cmds_CXX | \
--    export_symbols_cmds_CXX | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	  # Warning - without using the other run time loading flags,
+-	  # -berok will link without error, but may produce a broken library.
+-	  no_undefined_flag_F77=' ${wl}-bernotok'
+-	  allow_undefined_flag_F77=' ${wl}-berok'
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec_F77='$convenience'
+-	  archive_cmds_need_lc_F77=yes
+-	  # This is similar to how AIX traditionally builds its shared libraries.
+-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	fi
+-      fi
 -      ;;
--    *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-
+-    amigaos*)
+-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_minus_L_F77=yes
+-      # see comment about different semantics on the GNU ld section
+-      ld_shlibs_F77=no
 -      ;;
--    esac
--  done
 -
--  case $lt_echo in
--  *'\$0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
--    ;;
--  esac
+-    bsdi[45]*)
+-      export_dynamic_flag_spec_F77=-rdynamic
+-      ;;
 -
--cfgfile="$ofile"
+-    cygwin* | mingw* | pw32*)
+-      # When not using gcc, we currently assume that we are using
+-      # Microsoft Visual C++.
+-      # hardcode_libdir_flag_spec is actually meaningless, as there is
+-      # no search path for DLLs.
+-      hardcode_libdir_flag_spec_F77=' '
+-      allow_undefined_flag_F77=unsupported
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext_cmds=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      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'
+-      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+-      enable_shared_with_static_runtimes_F77=yes
+-      ;;
 -
--  cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-    darwin* | rhapsody*)
+-      case $host_os in
+-        rhapsody* | darwin1.[012])
+-         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[012])
+-               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-      esac
+-      archive_cmds_need_lc_F77=no
+-      hardcode_direct_F77=no
+-      hardcode_automatic_F77=yes
+-      hardcode_shlibpath_var_F77=unsupported
+-      whole_archive_flag_spec_F77=''
+-      link_all_deplibs_F77=yes
+-    if test "$GCC" = yes ; then
+-    	output_verbose_link_cmd='echo'
+-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    else
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         ld_shlibs_F77=no
+-          ;;
+-      esac
+-    fi
+-      ;;
 -
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-    dgux*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 -
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-    freebsd1*)
+-      ld_shlibs_F77=no
+-      ;;
 -
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
+-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-    # support.  Future versions do this automatically, but an explicit c++rt0.o
+-    # does not break anything, and helps significantly (at the cost of a little
+-    # extra space).
+-    freebsd2.2*)
+-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 -
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 -
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
+-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 -
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-    hpux9*)
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      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
+-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      hardcode_direct_F77=yes
 -
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      hardcode_minus_L_F77=yes
+-      export_dynamic_flag_spec_F77='${wl}-E'
+-      ;;
 -
--# The host system.
--host_alias=$host_alias
--host=$host
+-    hpux10*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_separator_F77=:
 -
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-	hardcode_direct_F77=yes
+-	export_dynamic_flag_spec_F77='${wl}-E'
 -
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
+-	# hardcode_minus_L: Not really in the search PATH,
+-	# but as the default location of the library.
+-	hardcode_minus_L_F77=yes
+-      fi
+-      ;;
 -
--# A C compiler.
--LTCC=$lt_LTCC
+-    hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case $host_cpu in
+-	hppa*64*)
+-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      else
+-	case $host_cpu in
+-	hppa*64*)
+-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_separator_F77=:
 -
--# A language-specific compiler.
--CC=$lt_compiler_CXX
+-	case $host_cpu in
+-	hppa*64*|ia64*)
+-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+-	  hardcode_direct_F77=no
+-	  hardcode_shlibpath_var_F77=no
+-	  ;;
+-	*)
+-	  hardcode_direct_F77=yes
+-	  export_dynamic_flag_spec_F77='${wl}-E'
 -
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_CXX
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_F77=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
 -
--# An ERE matcher.
--EGREP=$lt_EGREP
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	archive_cmds_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'
+-      fi
+-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      link_all_deplibs_F77=yes
+-      ;;
 -
--# The linker used to build libraries.
--LD=$lt_LD_CXX
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-      else
+-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 -
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-    newsos6)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 -
--# A BSD-compatible nm program.
--NM=$lt_NM
+-    openbsd*)
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_F77='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_F77='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
+-      ;;
 -
--# A symbol stripping program
--STRIP=$lt_STRIP
+-    os2*)
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_minus_L_F77=yes
+-      allow_undefined_flag_F77=unsupported
+-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
 -
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	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'
+-      fi
+-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      ;;
 -
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
--
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
--
--# Used on cygwin: assembler.
--AS=$lt_AS
--
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
--
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
--
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_CXX
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      else
+-	allow_undefined_flag_F77=' -expect_unresolved \*'
+-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 -
--# Object file suffix (normally "o").
--objext="$ac_objext"
+-	# Both c and cxx compiler support -rpath directly
+-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+-      fi
+-      hardcode_libdir_separator_F77=:
+-      ;;
 -
--# Old archive suffix (normally "a").
--libext="$libext"
+-    solaris*)
+-      no_undefined_flag_F77=' -z text'
+-      if test "$GCC" = yes; then
+-	wlarc='${wl}'
+-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+-      else
+-	wlarc=''
+-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      fi
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_shlibpath_var_F77=no
+-      case $host_os in
+-      solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
+-      esac
+-      link_all_deplibs_F77=yes
+-      ;;
 -
--# Shared library suffix (normally ".so").
--shrext='$shrext'
+-    sunos4*)
+-      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.
+-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 -
--# Executable file suffix (normally "").
--exeext="$exeext"
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_F77=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
+-	  hardcode_direct_F77=no
+-        ;;
+-	motorola)
+-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 -
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_CXX
--pic_mode=$pic_mode
+-    sysv4.3*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_F77=no
+-      export_dynamic_flag_spec_F77='-Bexport'
+-      ;;
 -
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_shlibpath_var_F77=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	ld_shlibs_F77=yes
+-      fi
+-      ;;
 -
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+-      no_undefined_flag_F77='${wl}-z,text'
+-      archive_cmds_need_lc_F77=no
+-      hardcode_shlibpath_var_F77=no
+-      runpath_var='LD_RUN_PATH'
 -
--# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      ;;
 -
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
+-    sysv5* | sco3.2v5* | sco5v6*)
+-      # Note: We can NOT use -z defs as we might desire, because we do not
+-      # link with -lc, and that would cause any symbols used from libc to
+-      # always be unresolved, which means just about no library would
+-      # ever link correctly.  If we're not using GNU ld we use -z text
+-      # though, which does catch some bad symbols but isn't as heavy-handed
+-      # as -z defs.
+-      no_undefined_flag_F77='${wl}-z,text'
+-      allow_undefined_flag_F77='${wl}-z,nodefs'
+-      archive_cmds_need_lc_F77=no
+-      hardcode_shlibpath_var_F77=no
+-      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-      hardcode_libdir_separator_F77=':'
+-      link_all_deplibs_F77=yes
+-      export_dynamic_flag_spec_F77='${wl}-Bexport'
+-      runpath_var='LD_RUN_PATH'
 -
--# Do we need a version for libraries?
--need_version=$need_version
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      ;;
 -
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
+-    uts4*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 -
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
+-    *)
+-      ld_shlibs_F77=no
+-      ;;
+-    esac
+-  fi
 -
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
+-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-echo "${ECHO_T}$ld_shlibs_F77" >&6
+-test "$ld_shlibs_F77" = no && can_build_shared=no
 -
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_CXX
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$archive_cmds_need_lc_F77" in
+-x|xyes)
+-  # Assume -lc should be added
+-  archive_cmds_need_lc_F77=yes
 -
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $archive_cmds_F77 in
+-    *'~'*)
+-      # FIXME: we may have to deal with multi-command sequences.
+-      ;;
+-    '$CC '*)
+-      # Test whether the compiler implicitly links with -lc since on some
+-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-      # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 -
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$lt_prog_compiler_wl_F77
+-	pic_flag=$lt_prog_compiler_pic_F77
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
+-        allow_undefined_flag_F77=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
++  (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-        then
+-	  archive_cmds_need_lc_F77=no
+-        else
+-	  archive_cmds_need_lc_F77=yes
+-        fi
+-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
+-      ;;
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) >&5 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+     esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
+   fi
+-  ;;
+-esac
 -
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext_cmds=".so"
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
 -
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
 -
--# Library versioning type.
--version_type=$version_type
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
 -
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
+-  # AIX 3 has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  ;;
 -
--# List of archive names.  First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
+-aix4* | aix5*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  hardcode_into_libs=yes
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
+-    case $host_os in
+-      aix4 | aix4.[01] | aix4.[01].*)
+-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	   echo ' yes '
+-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	:
+-      else
+-	can_build_shared=no
+-      fi
+-      ;;
+-    esac
+-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+-    # soname into executable. Probably we can add versioning support to
+-    # collect2, so additional links can be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-    fi
+-    shlibpath_var=LIBPATH
+-  fi
+-  ;;
 -
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
+-amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+-  ;;
 -
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_CXX
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
+-  ;;
 -
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+-bsdi[45]*)
+-  version_type=linux
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  # the default ld.so.conf also contains /usr/contrib/lib and
+-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+-  # libtool to hard-code these into programs
+-  ;;
 -
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
+-  shrext_cmds=".dll"
+-  need_version=no
+-  need_lib_prefix=no
 -
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_CXX
--archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    library_names_spec='$libname.dll.a'
+-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+-    postinstall_cmds='base_file=`basename \${file}`~
+-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname~
+-      chmod a+x \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    shlibpath_overrides_runpath=yes
 -
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_CXX
--module_expsym_cmds=$lt_module_expsym_cmds_CXX
+-    case $host_os in
+-    cygwin*)
+-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+-      ;;
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-      else
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-      fi
+-      ;;
+-    pw32*)
+-      # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      ;;
+-    esac
+-    ;;
 -
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
+-  *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
 -
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_predep_objects_CXX
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+-  soname_spec='${libname}${release}${major}$shared_ext'
+-  shlibpath_overrides_runpath=yes
+-  shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
 -
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_CXX
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
 -
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_CXX
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
 -
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_CXX
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
 -
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+-freebsd* | dragonfly*)
+-  # DragonFly does not have aout.  When/if they implement a new
+-  # versioning mechanism, adjust this.
+-  if test -x /usr/bin/objformat; then
+-    objformat=`/usr/bin/objformat`
+-  else
+-    case $host_os in
+-    freebsd[123]*) objformat=aout ;;
+-    *) objformat=elf ;;
+-    esac
+-  fi
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-      need_version=no
+-      need_lib_prefix=no
+-      ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
+-      ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
+-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  freebsd*) # from 4.6 on
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
 -
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  ;;
 -
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  case $host_cpu in
+-  ia64*)
+-    shrext_cmds='.so'
+-    hardcode_into_libs=yes
+-    dynamic_linker="$host_os dld.so"
+-    shlibpath_var=LD_LIBRARY_PATH
+-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    if test "X$HPUX_IA64_MODE" = X32; then
+-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+-    else
+-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+-    fi
+-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-    ;;
+-   hppa*64*)
+-     shrext_cmds='.sl'
+-     hardcode_into_libs=yes
+-     dynamic_linker="$host_os dld.sl"
+-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-     soname_spec='${libname}${release}${shared_ext}$major'
+-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-     ;;
+-   *)
+-    shrext_cmds='.sl'
+-    dynamic_linker="$host_os dld.sl"
+-    shlibpath_var=SHLIB_PATH
+-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    ;;
+-  esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
+-  ;;
 -
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_CXX
+-interix3*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  ;;
 -
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_CXX
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
+-  esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
+-    ;;
+-  *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+-      libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
+-    esac
+-    ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+-  hardcode_into_libs=yes
+-  ;;
 -
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+-  dynamic_linker=no
+-  ;;
 -
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
+-# This must be Linux ELF.
+-linux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
 -
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 15822 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
 -
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-  # Append ld.so.conf contents to the search path
+-  if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+-  fi
 -
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+-  # powerpc, because MkLinux only supported shared libraries with the
+-  # GNU dynamic linker.  Since this was broken with cross compilers,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
+-  ;;
 -
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
+-knetbsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
 -
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
 -
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
 -
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_CXX
+-nto-qnx*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
 -
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
+-openbsd*)
+-  version_type=sunos
+-  sys_lib_dlsearch_path_spec="/usr/lib"
+-  need_lib_prefix=no
+-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+-  case $host_os in
+-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+-    *)                         need_version=no  ;;
+-  esac
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[89] | openbsd2.[89].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
 -
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+-os2*)
+-  libname_spec='$name'
+-  shrext_cmds=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
 -
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
 -
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
 -
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_CXX
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
 -
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_CXX
+-sysv4 | sysv4.3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-    siemens)
+-      need_lib_prefix=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
+-  esac
+-  ;;
 -
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
 -
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_CXX
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  version_type=freebsd-elf
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  if test "$with_gnu_ld" = yes; then
+-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+-    shlibpath_overrides_runpath=no
+-  else
+-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+-    shlibpath_overrides_runpath=yes
+-    case $host_os in
+-      sco3.2v5*)
+-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+-	;;
+-    esac
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/lib'
+-  ;;
 -
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
 -
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_CXX
+-*)
+-  dynamic_linker=no
+-  ;;
+-esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
+-test "$dynamic_linker" = no && can_build_shared=no
 -
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
 -
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+-hardcode_action_F77=
+-if test -n "$hardcode_libdir_flag_spec_F77" || \
+-   test -n "$runpath_var_F77" || \
+-   test "X$hardcode_automatic_F77" = "Xyes" ; then
 -
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_CXX"
+-  # We can hardcode non-existant directories.
+-  if test "$hardcode_direct_F77" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
+-     test "$hardcode_minus_L_F77" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    hardcode_action_F77=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action_F77=immediate
+-  fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  hardcode_action_F77=unsupported
+-fi
+-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-echo "${ECHO_T}$hardcode_action_F77" >&6
 -
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_CXX
+-if test "$hardcode_action_F77" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+-fi
 -
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_CXX
 -
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # 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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+-    SED SHELL STRIP \
+-    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 \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_F77 \
+-    CC_F77 \
+-    LD_F77 \
+-    lt_prog_compiler_wl_F77 \
+-    lt_prog_compiler_pic_F77 \
+-    lt_prog_compiler_static_F77 \
+-    lt_prog_compiler_no_builtin_flag_F77 \
+-    export_dynamic_flag_spec_F77 \
+-    thread_safe_flag_spec_F77 \
+-    whole_archive_flag_spec_F77 \
+-    enable_shared_with_static_runtimes_F77 \
+-    old_archive_cmds_F77 \
+-    old_archive_from_new_cmds_F77 \
+-    predep_objects_F77 \
+-    postdep_objects_F77 \
+-    predeps_F77 \
+-    postdeps_F77 \
+-    compiler_lib_search_path_F77 \
+-    archive_cmds_F77 \
+-    archive_expsym_cmds_F77 \
+-    postinstall_cmds_F77 \
+-    postuninstall_cmds_F77 \
+-    old_archive_from_expsyms_cmds_F77 \
+-    allow_undefined_flag_F77 \
+-    no_undefined_flag_F77 \
+-    export_symbols_cmds_F77 \
+-    hardcode_libdir_flag_spec_F77 \
+-    hardcode_libdir_flag_spec_ld_F77 \
+-    hardcode_libdir_separator_F77 \
+-    hardcode_automatic_F77 \
+-    module_cmds_F77 \
+-    module_expsym_cmds_F77 \
+-    lt_cv_prog_compiler_c_o_F77 \
+-    exclude_expsyms_F77 \
+-    include_expsyms_F77; do
 -
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_CXX
+-    case $var in
+-    old_archive_cmds_F77 | \
+-    old_archive_from_new_cmds_F77 | \
+-    archive_cmds_F77 | \
+-    archive_expsym_cmds_F77 | \
+-    module_cmds_F77 | \
+-    module_expsym_cmds_F77 | \
+-    old_archive_from_expsyms_cmds_F77 | \
+-    export_symbols_cmds_F77 | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
 -
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_CXX
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
 -
--# ### END LIBTOOL TAG CONFIG: $tagname
+-cfgfile="$ofile"
 -
--__EOF__
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 -
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 -
--else
--  # If there is no Makefile yet, we rely on a make rule to execute
--  # `config.status --recheck' to rerun these tests and create the
--  # libtool script then.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
--  fi
--fi
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
 -
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
 -
--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
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
 -
--CC=$lt_save_CC
--LDCXX=$LD
--LD=$lt_save_LD
--GCC=$lt_save_GCC
--with_gnu_ldcxx=$with_gnu_ld
--with_gnu_ld=$lt_save_with_gnu_ld
--lt_cv_path_LDCXX=$lt_cv_path_LD
--lt_cv_path_LD=$lt_save_path_LD
--lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
--lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_F77
 -
--	else
--	  tagname=""
--	fi
--	;;
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
 -
--      F77)
--	if test -n "$F77" && test "X$F77" != "Xno"; then
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
 -
--ac_ext=f
--ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
--ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
 -
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
 -
--archive_cmds_need_lc_F77=no
--allow_undefined_flag_F77=
--always_export_symbols_F77=no
--archive_expsym_cmds_F77=
--export_dynamic_flag_spec_F77=
--hardcode_direct_F77=no
--hardcode_libdir_flag_spec_F77=
--hardcode_libdir_flag_spec_ld_F77=
--hardcode_libdir_separator_F77=
--hardcode_minus_L_F77=no
--hardcode_automatic_F77=no
--module_cmds_F77=
--module_expsym_cmds_F77=
--link_all_deplibs_F77=unknown
--old_archive_cmds_F77=$old_archive_cmds
--no_undefined_flag_F77=
--whole_archive_flag_spec_F77=
--enable_shared_with_static_runtimes_F77=no
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
 -
--# Source file extension for f77 test sources.
--ac_ext=f
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
 -
--# Object file extension for compiled f77 test sources.
+-# A C compiler.
+-LTCC=$lt_LTCC
+-
+-# LTCC compiler flags.
+-LTCFLAGS=$lt_LTCFLAGS
+-
+-# A language-specific compiler.
+-CC=$lt_compiler_F77
+-
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_F77
+-
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
+-
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+-
+-# The linker used to build libraries.
+-LD=$lt_LD_F77
+-
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$lt_STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_F77
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_F77
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+-
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
+-
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+-
+-# Do we need a version for libraries?
+-need_version=$need_version
+-
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+-
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+-
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+-
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_F77
+-
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
+-
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
+-
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
+-
+-# Library versioning type.
+-version_type=$version_type
+-
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+-
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+-
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+-
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_F77
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
+-
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
+-
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_F77
+-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+-
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_F77
+-module_expsym_cmds=$lt_module_expsym_cmds_F77
+-
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_F77
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_F77
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+-
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+-
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_F77
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_F77
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+-
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+-
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+-
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_F77
+-
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
+-
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
+-
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
+-
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+-
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct_F77
+-
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L_F77
+-
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
+-
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$hardcode_automatic_F77
+-
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+-
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs_F77
+-
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+-
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+-
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_F77"
+-
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols_F77
+-
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_F77
+-
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+-
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_F77
+-
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_F77
+-
+-# ### END LIBTOOL TAG CONFIG: $tagname
+-
+-__EOF__
+-
+-
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+-  if test -f "$ltmain_in"; then
+-    test -f Makefile && make "$ltmain"
+-  fi
+-fi
+-
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-CC="$lt_save_CC"
+-
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      GCJ)
+-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+-
+-
+-
+-# Source file extension for Java test sources.
+-ac_ext=java
+-
+-# Object file extension for compiled Java test sources.
 -objext=o
--objext_F77=$objext
+-objext_GCJ=$objext
 -
 -# Code to be used in simple compile tests
--lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+-lt_simple_compile_test_code="class foo {}\n"
 -
 -# Code to be used in simple link tests
--lt_simple_link_test_code="      program t\n      end\n"
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
 -
 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 -
 -# If no C compiler was specified, use CC.
 -LTCC=${LTCC-"$CC"}
 -
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+-
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
 -
 -
+-# save warnings/boilerplate of simple test code
+-ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_compiler_boilerplate=`cat conftest.err`
+-$rm conftest*
+-
+-ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
+-
+-
 -# Allow CC to be a program name with arguments.
 -lt_save_CC="$CC"
--CC=${F77-"f77"}
+-CC=${GCJ-"gcj"}
 -compiler=$CC
--compiler_F77=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+-compiler_GCJ=$CC
+-for cc_temp in $compiler""; do
+-  case $cc_temp in
+-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 -
--echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6
 -
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
--test "$can_build_shared" = "no" && enable_shared=no
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-archive_cmds_need_lc_GCJ=no
 -
--# On AIX, shared libraries and static libraries use the same namespace, and
--# are all built from PIC.
--case "$host_os" in
--aix3*)
--  test "$enable_shared" = yes && enable_static=no
--  if test -n "$RANLIB"; then
--    archive_cmds="$archive_cmds~\$RANLIB \$lib"
--    postinstall_cmds='$RANLIB $lib'
--  fi
--  ;;
--aix4*)
--  test "$enable_shared" = yes && enable_static=no
--  ;;
--esac
--echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6
+-old_archive_cmds_GCJ=$old_archive_cmds
 -
--echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6
 -
--test "$ld_shlibs_F77" = no && can_build_shared=no
+-lt_prog_compiler_no_builtin_flag_GCJ=
 -
--GCC_F77="$G77"
--LD_F77="$LD"
+-if test "$GCC" = yes; then
+-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 -
--lt_prog_compiler_wl_F77=
--lt_prog_compiler_pic_F77=
--lt_prog_compiler_static_F77=
+-
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_prog_compiler_rtti_exceptions=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="-fno-rtti -fno-exceptions"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -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:16600: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
+-   echo "$as_me:16604: \$? = $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 other than the usual output.
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+-       lt_cv_prog_compiler_rtti_exceptions=yes
+-     fi
+-   fi
+-   $rm conftest*
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+-
+-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+-else
+-    :
+-fi
+-
+-fi
+-
+-lt_prog_compiler_wl_GCJ=
+-lt_prog_compiler_pic_GCJ=
+-lt_prog_compiler_static_GCJ=
 -
 -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 -
 -  if test "$GCC" = yes; then
--    lt_prog_compiler_wl_F77='-Wl,'
--    lt_prog_compiler_static_F77='-static'
+-    lt_prog_compiler_wl_GCJ='-Wl,'
+-    lt_prog_compiler_static_GCJ='-static'
 -
 -    case $host_os in
 -      aix*)
 -      # All AIX code is PIC.
 -      if test "$host_cpu" = ia64; then
 -	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static_F77='-Bstatic'
+-	lt_prog_compiler_static_GCJ='-Bstatic'
 -      fi
 -      ;;
 -
@@ -52031,7 +57981,7 @@
 -      # FIXME: we need at least 68020 code to build shared libraries, but
 -      # adding the `-m68020' flag to GCC prevents building anything better,
 -      # like `-m68040'.
--      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+-      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
 -      ;;
 -
 -    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
@@ -52041,224 +57991,301 @@
 -    mingw* | pw32* | os2*)
 -      # This hack is so that the source file can tell whether it is being
 -      # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
 -      ;;
 -
 -    darwin* | rhapsody*)
 -      # PIC is the default on this platform
 -      # Common symbols not allowed in MH_DYLIB files
--      lt_prog_compiler_pic_F77='-fno-common'
+-      lt_prog_compiler_pic_GCJ='-fno-common'
+-      ;;
+-
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
 -      ;;
 -
 -    msdosdjgpp*)
 -      # Just because we use GCC doesn't mean we suddenly get shared libraries
 -      # on systems that don't support them.
--      lt_prog_compiler_can_build_shared_F77=no
+-      lt_prog_compiler_can_build_shared_GCJ=no
 -      enable_shared=no
 -      ;;
 -
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
--	lt_prog_compiler_pic_F77=-Kconform_pic
+-	lt_prog_compiler_pic_GCJ=-Kconform_pic
 -      fi
 -      ;;
 -
 -    hpux*)
 -      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 -      # not for PA HP-UX.
--      case "$host_cpu" in
+-      case $host_cpu in
 -      hppa*64*|ia64*)
 -	# +Z the default
 -	;;
 -      *)
--	lt_prog_compiler_pic_F77='-fPIC'
+-	lt_prog_compiler_pic_GCJ='-fPIC'
 -	;;
 -      esac
 -      ;;
 -
 -    *)
--      lt_prog_compiler_pic_F77='-fPIC'
+-      lt_prog_compiler_pic_GCJ='-fPIC'
 -      ;;
 -    esac
 -  else
 -    # PORTME Check for flag to pass linker flags through the system compiler.
 -    case $host_os in
 -    aix*)
--      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_wl_GCJ='-Wl,'
 -      if test "$host_cpu" = ia64; then
 -	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static_F77='-Bstatic'
+-	lt_prog_compiler_static_GCJ='-Bstatic'
 -      else
--	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
 -      fi
 -      ;;
+-      darwin*)
+-        # PIC is the default on this platform
+-        # Common symbols not allowed in MH_DYLIB files
+-       case $cc_basename in
+-         xlc*)
+-         lt_prog_compiler_pic_GCJ='-qnocommon'
+-         lt_prog_compiler_wl_GCJ='-Wl,'
+-         ;;
+-       esac
+-       ;;
 -
 -    mingw* | pw32* | os2*)
 -      # This hack is so that the source file can tell whether it is being
 -      # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
 -      ;;
 -
 -    hpux9* | hpux10* | hpux11*)
--      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_wl_GCJ='-Wl,'
 -      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 -      # not for PA HP-UX.
--      case "$host_cpu" in
+-      case $host_cpu in
 -      hppa*64*|ia64*)
 -	# +Z the default
 -	;;
 -      *)
--	lt_prog_compiler_pic_F77='+Z'
+-	lt_prog_compiler_pic_GCJ='+Z'
 -	;;
 -      esac
 -      # Is there a better lt_prog_compiler_static that works with the bundled CC?
--      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
+-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
 -      ;;
 -
 -    irix5* | irix6* | nonstopux*)
--      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_wl_GCJ='-Wl,'
 -      # PIC (with -KPIC) is the default.
--      lt_prog_compiler_static_F77='-non_shared'
+-      lt_prog_compiler_static_GCJ='-non_shared'
 -      ;;
 -
 -    newsos6)
--      lt_prog_compiler_pic_F77='-KPIC'
--      lt_prog_compiler_static_F77='-Bstatic'
+-      lt_prog_compiler_pic_GCJ='-KPIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
 -      ;;
 -
 -    linux*)
--      case $CC in
+-      case $cc_basename in
 -      icc* | ecc*)
--	lt_prog_compiler_wl_F77='-Wl,'
--	lt_prog_compiler_pic_F77='-KPIC'
--	lt_prog_compiler_static_F77='-static'
+-	lt_prog_compiler_wl_GCJ='-Wl,'
+-	lt_prog_compiler_pic_GCJ='-KPIC'
+-	lt_prog_compiler_static_GCJ='-static'
+-        ;;
+-      pgcc* | pgf77* | pgf90* | pgf95*)
+-        # Portland Group compilers (*not* the Pentium gcc compiler,
+-	# which looks to be a dead project)
+-	lt_prog_compiler_wl_GCJ='-Wl,'
+-	lt_prog_compiler_pic_GCJ='-fpic'
+-	lt_prog_compiler_static_GCJ='-Bstatic'
 -        ;;
 -      ccc*)
--        lt_prog_compiler_wl_F77='-Wl,'
+-        lt_prog_compiler_wl_GCJ='-Wl,'
 -        # All Alpha code is PIC.
--        lt_prog_compiler_static_F77='-non_shared'
+-        lt_prog_compiler_static_GCJ='-non_shared'
 -        ;;
 -      esac
 -      ;;
 -
 -    osf3* | osf4* | osf5*)
--      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_wl_GCJ='-Wl,'
 -      # All OSF/1 code is PIC.
--      lt_prog_compiler_static_F77='-non_shared'
--      ;;
--
--    sco3.2v5*)
--      lt_prog_compiler_pic_F77='-Kpic'
--      lt_prog_compiler_static_F77='-dn'
+-      lt_prog_compiler_static_GCJ='-non_shared'
 -      ;;
 -
 -    solaris*)
--      lt_prog_compiler_wl_F77='-Wl,'
--      lt_prog_compiler_pic_F77='-KPIC'
--      lt_prog_compiler_static_F77='-Bstatic'
+-      lt_prog_compiler_pic_GCJ='-KPIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      case $cc_basename in
+-      f77* | f90* | f95*)
+-	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
+-      *)
+-	lt_prog_compiler_wl_GCJ='-Wl,';;
+-      esac
 -      ;;
 -
 -    sunos4*)
--      lt_prog_compiler_wl_F77='-Qoption ld '
--      lt_prog_compiler_pic_F77='-PIC'
--      lt_prog_compiler_static_F77='-Bstatic'
+-      lt_prog_compiler_wl_GCJ='-Qoption ld '
+-      lt_prog_compiler_pic_GCJ='-PIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
 -      ;;
 -
--    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--      lt_prog_compiler_wl_F77='-Wl,'
--      lt_prog_compiler_pic_F77='-KPIC'
--      lt_prog_compiler_static_F77='-Bstatic'
--      ;;
+-    sysv4 | sysv4.2uw2* | sysv4.3*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      lt_prog_compiler_pic_GCJ='-KPIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
 -
 -    sysv4*MP*)
 -      if test -d /usr/nec ;then
--	lt_prog_compiler_pic_F77='-Kconform_pic'
--	lt_prog_compiler_static_F77='-Bstatic'
+-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
+-	lt_prog_compiler_static_GCJ='-Bstatic'
 -      fi
 -      ;;
 -
+-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      lt_prog_compiler_pic_GCJ='-KPIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
+-
+-    unicos*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      lt_prog_compiler_can_build_shared_GCJ=no
+-      ;;
+-
 -    uts4*)
--      lt_prog_compiler_pic_F77='-pic'
--      lt_prog_compiler_static_F77='-Bstatic'
+-      lt_prog_compiler_pic_GCJ='-pic'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
 -      ;;
 -
 -    *)
--      lt_prog_compiler_can_build_shared_F77=no
+-      lt_prog_compiler_can_build_shared_GCJ=no
 -      ;;
 -    esac
 -  fi
 -
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
 -
 -#
 -# Check to make sure the PIC flag actually works.
 -#
--if test -n "$lt_prog_compiler_pic_F77"; then
+-if test -n "$lt_prog_compiler_pic_GCJ"; then
 -
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
--if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--  lt_prog_compiler_pic_works_F77=no
+-  lt_prog_compiler_pic_works_GCJ=no
 -  ac_outfile=conftest.$ac_objext
 -   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="$lt_prog_compiler_pic_F77"
+-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
 -   # Insert the option either (1) after the last *FLAGS variable, or
 -   # (2) before a word containing "conftest.", or (3) at the end.
 -   # Note that $ac_compile itself does not contain backslashes and begins
 -   # with a dollar sign (not a hyphen), so the echo should work correctly.
 -   # The option is referenced via a variable to avoid confusing sed.
 -   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14398: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16868: $lt_compile\"" >&5)
 -   (eval "$lt_compile" 2>conftest.err)
 -   ac_status=$?
 -   cat conftest.err >&5
--   echo "$as_me:14402: \$? = $ac_status" >&5
+-   echo "$as_me:16872: \$? = $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
--     if test ! -s conftest.err; then
--       lt_prog_compiler_pic_works_F77=yes
+-     # So say no if there are warnings other than the usual output.
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+-       lt_prog_compiler_pic_works_GCJ=yes
 -     fi
 -   fi
 -   $rm conftest*
 -
 -fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
 -
--if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
--    case $lt_prog_compiler_pic_F77 in
+-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+-    case $lt_prog_compiler_pic_GCJ in
 -     "" | " "*) ;;
--     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
 -     esac
 -else
--    lt_prog_compiler_pic_F77=
--     lt_prog_compiler_can_build_shared_F77=no
+-    lt_prog_compiler_pic_GCJ=
+-     lt_prog_compiler_can_build_shared_GCJ=no
 -fi
 -
 -fi
--case "$host_os" in
+-case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
 -  *djgpp*)
--    lt_prog_compiler_pic_F77=
+-    lt_prog_compiler_pic_GCJ=
 -    ;;
 -  *)
--    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
+-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
 -    ;;
 -esac
 -
+-#
+-# Check to make sure the static flag actually works.
+-#
+-wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_prog_compiler_static_works_GCJ=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The linker can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&5
+-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-       if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works_GCJ=yes
+-       fi
+-     else
+-       lt_prog_compiler_static_works_GCJ=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
+-
+-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+-    :
+-else
+-    lt_prog_compiler_static_GCJ=
+-fi
+-
+-
 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--  lt_cv_prog_compiler_c_o_F77=no
+-  lt_cv_prog_compiler_c_o_GCJ=no
 -   $rm -r conftest 2>/dev/null
 -   mkdir conftest
 -   cd conftest
@@ -52271,23 +58298,25 @@
 -   # Note that $ac_compile itself does not contain backslashes and begins
 -   # with a dollar sign (not a hyphen), so the echo should work correctly.
 -   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14458: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16972: $lt_compile\"" >&5)
 -   (eval "$lt_compile" 2>out/conftest.err)
 -   ac_status=$?
 -   cat out/conftest.err >&5
--   echo "$as_me:14462: \$? = $ac_status" >&5
+-   echo "$as_me:16976: \$? = $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
 -     # So say no if there are warnings
--     if test ! -s out/conftest.err; then
--       lt_cv_prog_compiler_c_o_F77=yes
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+-       lt_cv_prog_compiler_c_o_GCJ=yes
 -     fi
 -   fi
--   chmod u+w .
+-   chmod u+w . 2>&5
 -   $rm conftest*
 -   # SGI C++ compiler will create directory out/ii_files/ for
 -   # template instantiation
@@ -52298,12 +58327,12 @@
 -   $rm conftest*
 -
 -fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
 -
 -
 -hard_links="nottested"
--if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
 -  # do not overwrite the value of need_locks provided by the user
 -  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
@@ -52328,41 +58357,51 @@
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
 -
 -  runpath_var=
--  allow_undefined_flag_F77=
--  enable_shared_with_static_runtimes_F77=no
--  archive_cmds_F77=
--  archive_expsym_cmds_F77=
--  old_archive_From_new_cmds_F77=
--  old_archive_from_expsyms_cmds_F77=
--  export_dynamic_flag_spec_F77=
--  whole_archive_flag_spec_F77=
--  thread_safe_flag_spec_F77=
--  hardcode_libdir_flag_spec_F77=
--  hardcode_libdir_flag_spec_ld_F77=
--  hardcode_libdir_separator_F77=
--  hardcode_direct_F77=no
--  hardcode_minus_L_F77=no
--  hardcode_shlibpath_var_F77=unsupported
--  link_all_deplibs_F77=unknown
--  hardcode_automatic_F77=no
--  module_cmds_F77=
--  module_expsym_cmds_F77=
--  always_export_symbols_F77=no
--  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  allow_undefined_flag_GCJ=
+-  enable_shared_with_static_runtimes_GCJ=no
+-  archive_cmds_GCJ=
+-  archive_expsym_cmds_GCJ=
+-  old_archive_From_new_cmds_GCJ=
+-  old_archive_from_expsyms_cmds_GCJ=
+-  export_dynamic_flag_spec_GCJ=
+-  whole_archive_flag_spec_GCJ=
+-  thread_safe_flag_spec_GCJ=
+-  hardcode_libdir_flag_spec_GCJ=
+-  hardcode_libdir_flag_spec_ld_GCJ=
+-  hardcode_libdir_separator_GCJ=
+-  hardcode_direct_GCJ=no
+-  hardcode_minus_L_GCJ=no
+-  hardcode_shlibpath_var_GCJ=unsupported
+-  link_all_deplibs_GCJ=unknown
+-  hardcode_automatic_GCJ=no
+-  module_cmds_GCJ=
+-  module_expsym_cmds_GCJ=
+-  always_export_symbols_GCJ=no
+-  export_symbols_cmds_GCJ='$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*
 -  # included in the symbol list
--  include_expsyms_F77=
+-  include_expsyms_GCJ=
 -  # exclude_expsyms can be an extended regexp of symbols to exclude
 -  # it will be wrapped by ` (' and `)$', so one must not match beginning or
 -  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
 -  # as well as any symbol that contains `d'.
--  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
 -  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
 -  # platforms (ab)use it in PIC code, but their linkers get confused if
 -  # the symbol is explicitly referenced.  Since portable code cannot
 -  # rely on this symbol name, it's probably fine to never include it in
 -  # preloaded symbol tables.
 -  extract_expsyms_cmds=
+-  # Just being paranoid about ensuring that cc_basename is set.
+-  for cc_temp in $compiler""; do
+-  case $cc_temp in
+-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 -
 -  case $host_os in
 -  cygwin* | mingw* | pw32*)
@@ -52373,22 +58412,47 @@
 -      with_gnu_ld=no
 -    fi
 -    ;;
+-  interix*)
+-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+-    with_gnu_ld=yes
+-    ;;
 -  openbsd*)
 -    with_gnu_ld=no
 -    ;;
 -  esac
 -
--  ld_shlibs_F77=yes
+-  ld_shlibs_GCJ=yes
 -  if test "$with_gnu_ld" = yes; then
 -    # If archive_cmds runs LD, not CC, wlarc should be empty
 -    wlarc='${wl}'
 -
+-    # Set some defaults for GNU ld with shared library support. These
+-    # are reset later if shared libraries are not supported. Putting them
+-    # here allows them to be overridden if necessary.
+-    runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+-    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_GCJ=
+-    fi
+-    supports_anon_versioning=no
+-    case `$LD -v 2>/dev/null` in
+-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-      *\ 2.11.*) ;; # other 2.11 versions
+-      *) supports_anon_versioning=yes ;;
+-    esac
+-
 -    # See if GNU ld supports shared libraries.
 -    case $host_os in
 -    aix3* | aix4* | aix5*)
 -      # On AIX/PPC, the GNU linker is very broken
 -      if test "$host_cpu" != ia64; then
--	ld_shlibs_F77=no
+-	ld_shlibs_GCJ=no
 -	cat <<EOF 1>&2
 -
 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
@@ -52402,9 +58466,9 @@
 -      ;;
 -
 -    amigaos*)
--      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_minus_L_F77=yes
+-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_minus_L_GCJ=yes
 -
 -      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
 -      # that the semantics of dynamic libraries on AmigaOS, at least up
@@ -52412,58 +58476,104 @@
 -      # with the same dynamic library.  Since this doesn't match the
 -      # behavior of shared libraries on other platforms, we can't use
 -      # them.
--      ld_shlibs_F77=no
+-      ld_shlibs_GCJ=no
 -      ;;
 -
 -    beos*)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	allow_undefined_flag_F77=unsupported
+-	allow_undefined_flag_GCJ=unsupported
 -	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 -	# support --undefined.  This deserves some investigation.  FIXME
--	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -      else
--	ld_shlibs_F77=no
+-	ld_shlibs_GCJ=no
 -      fi
 -      ;;
 -
 -    cygwin* | mingw* | pw32*)
--      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
 -      # as there is no search path for DLLs.
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      allow_undefined_flag_F77=unsupported
--      always_export_symbols_F77=no
--      enable_shared_with_static_runtimes_F77=yes
--      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      allow_undefined_flag_GCJ=unsupported
+-      always_export_symbols_GCJ=no
+-      enable_shared_with_static_runtimes_GCJ=yes
+-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 -
 -      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -	# 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
+-	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 -	  cp $export_symbols $output_objdir/$soname.def;
 -	else
 -	  echo EXPORTS > $output_objdir/$soname.def;
 -	  cat $export_symbols >> $output_objdir/$soname.def;
 -	fi~
--	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -      else
--	ld_shlibs=no
+-	ld_shlibs_GCJ=no
+-      fi
+-      ;;
+-
+-    interix3*)
+-      hardcode_direct_GCJ=no
+-      hardcode_shlibpath_var_GCJ=no
+-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-      export_dynamic_flag_spec_GCJ='${wl}-E'
+-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-      # Instead, shared libraries are loaded at an image base (0x10000000 by
+-      # default) and relocated if they conflict, which is a slow very memory
+-      # consuming and fragmenting process.  To avoid this, we pick a random,
+-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-      ;;
+-
+-    linux*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	tmp_addflag=
+-	case $cc_basename,$host_cpu in
+-	pgcc*)				# Portland Group C compiler
+-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag'
+-	  ;;
+-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag -Mnomain' ;;
+-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+-	  tmp_addflag=' -i_dynamic' ;;
+-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+-	ifc* | ifort*)			# Intel Fortran compiler
+-	  tmp_addflag=' -nofor_main' ;;
+-	esac
+-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-
+-	if test $supports_anon_versioning = yes; then
+-	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-  $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-	fi
+-      else
+-	ld_shlibs_GCJ=no
 -      fi
 -      ;;
 -
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 -	wlarc=
 -      else
--	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 -      fi
 -      ;;
 -
--    solaris* | sysv5*)
+-    solaris*)
 -      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
--	ld_shlibs_F77=no
+-	ld_shlibs_GCJ=no
 -	cat <<EOF 1>&2
 -
 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably
@@ -52475,80 +58585,77 @@
 -
 -EOF
 -      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 -      else
--	ld_shlibs_F77=no
+-	ld_shlibs_GCJ=no
 -      fi
 -      ;;
 -
+-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+-      case `$LD -v 2>&1` in
+-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+-	ld_shlibs_GCJ=no
+-	cat <<_LT_EOF 1>&2
+-
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+-*** reliably create shared libraries on SCO systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
+-
+-_LT_EOF
+-	;;
+-	*)
+-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+-	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+-	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+-	  else
+-	    ld_shlibs_GCJ=no
+-	  fi
+-	;;
+-      esac
+-      ;;
+-
 -    sunos4*)
--      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 -      wlarc=
--      hardcode_direct_F77=yes
--      hardcode_shlibpath_var_F77=no
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
 -      ;;
 -
--  linux*)
--    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds_F77="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds_F77="$tmp_archive_cmds"
--      fi
--    else
--      ld_shlibs_F77=no
--    fi
--    ;;
--
 -    *)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 -      else
--	ld_shlibs_F77=no
+-	ld_shlibs_GCJ=no
 -      fi
 -      ;;
 -    esac
 -
--    if test "$ld_shlibs_F77" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_F77=
--      fi
+-    if test "$ld_shlibs_GCJ" = no; then
+-      runpath_var=
+-      hardcode_libdir_flag_spec_GCJ=
+-      export_dynamic_flag_spec_GCJ=
+-      whole_archive_flag_spec_GCJ=
 -    fi
 -  else
 -    # PORTME fill in a description of your system's linker (not GNU ld)
 -    case $host_os in
 -    aix3*)
--      allow_undefined_flag_F77=unsupported
--      always_export_symbols_F77=yes
--      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-      allow_undefined_flag_GCJ=unsupported
+-      always_export_symbols_GCJ=yes
+-      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
 -      # Note: this linker hardcodes the directories in LIBPATH if there
 -      # are no directories specified by -L.
--      hardcode_minus_L_F77=yes
--      if test "$GCC" = yes && test -z "$link_static_flag"; then
+-      hardcode_minus_L_GCJ=yes
+-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 -	# Neither direct hardcoding nor static linking is supported with a
 -	# broken collect2.
--	hardcode_direct_F77=unsupported
+-	hardcode_direct_GCJ=unsupported
 -      fi
 -      ;;
 -
@@ -52563,9 +58670,9 @@
 -	# If we're using GNU nm, then we don't want the "-C" option.
 -	# -C means demangle to AIX nm, but means don't demangle with GNU nm
 -	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
--	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 -	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'
+-	  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
 -	aix_use_runtimelinking=no
 -
@@ -52579,6 +58686,7 @@
 -  	    break
 -  	  fi
 -	  done
+-	  ;;
 -	esac
 -
 -	exp_sym_flag='-bexport'
@@ -52591,13 +58699,13 @@
 -      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
 -      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 -
--      archive_cmds_F77=''
--      hardcode_direct_F77=yes
--      hardcode_libdir_separator_F77=':'
--      link_all_deplibs_F77=yes
+-      archive_cmds_GCJ=''
+-      hardcode_direct_GCJ=yes
+-      hardcode_libdir_separator_GCJ=':'
+-      link_all_deplibs_GCJ=yes
 -
 -      if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
+-	case $host_os in aix4.[012]|aix4.[012].*)
 -	# We only want to do this on AIX 4.2 and lower, the check
 -	# below for broken collect2 doesn't work under 4.3+
 -	  collect2name=`${CC} -print-prog-name=collect2`
@@ -52605,19 +58713,23 @@
 -  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 -	  then
 -  	  # We have reworked collect2
--  	  hardcode_direct_F77=yes
+-  	  hardcode_direct_GCJ=yes
 -	  else
 -  	  # We have old collect2
--  	  hardcode_direct_F77=unsupported
+-  	  hardcode_direct_GCJ=unsupported
 -  	  # It fails to find uninstalled libraries when the uninstalled
 -  	  # path is not listed in the libpath.  Setting hardcode_minus_L
 -  	  # to unsupported forces relinking
--  	  hardcode_minus_L_F77=yes
--  	  hardcode_libdir_flag_spec_F77='-L$libdir'
--  	  hardcode_libdir_separator_F77=
+-  	  hardcode_minus_L_GCJ=yes
+-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-  	  hardcode_libdir_separator_GCJ=
 -	  fi
+-	  ;;
 -	esac
 -	shared_flag='-shared'
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag="$shared_flag "'${wl}-G'
+-	fi
 -      else
 -	# not using gcc
 -	if test "$host_cpu" = ia64; then
@@ -52625,26 +58737,36 @@
 -  	# chokes on -Wl,-G. The following line is correct:
 -	  shared_flag='-G'
 -	else
--  	if test "$aix_use_runtimelinking" = yes; then
+-	  if test "$aix_use_runtimelinking" = yes; then
 -	    shared_flag='${wl}-G'
 -	  else
 -	    shared_flag='${wl}-bM:SRE'
--  	fi
+-	  fi
 -	fi
 -      fi
 -
 -      # It seems that -bexpall does not export symbols beginning with
 -      # underscore (_), so it is better to generate a list of symbols to export.
--      always_export_symbols_F77=yes
+-      always_export_symbols_GCJ=yes
 -      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.
--	allow_undefined_flag_F77='-berok'
+-	allow_undefined_flag_GCJ='-berok'
 -       # Determine the default libpath from the value encoded in an empty executable.
 -       cat >conftest.$ac_ext <<_ACEOF
--      program main
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -
--      end
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -52655,7 +58777,7 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
+-	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
@@ -52683,19 +58805,29 @@
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 -
--       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
--	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 -       else
 -	if test "$host_cpu" = ia64; then
--	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
--	  allow_undefined_flag_F77="-z nodefs"
--	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
+-	  allow_undefined_flag_GCJ="-z nodefs"
+-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 -	else
 -	 # Determine the default libpath from the value encoded in an empty executable.
 -	 cat >conftest.$ac_ext <<_ACEOF
--      program main
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -
--      end
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -52706,7 +58838,7 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
+-	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
@@ -52734,32 +58866,30 @@
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 -
--	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	  # Warning - without using the other run time loading flags,
 -	  # -berok will link without error, but may produce a broken library.
--	  no_undefined_flag_F77=' ${wl}-bernotok'
--	  allow_undefined_flag_F77=' ${wl}-berok'
--	  # -bexpall does not export symbols beginning with underscore (_)
--	  always_export_symbols_F77=yes
+-	  no_undefined_flag_GCJ=' ${wl}-bernotok'
+-	  allow_undefined_flag_GCJ=' ${wl}-berok'
 -	  # Exported symbols can be pulled into shared objects from archives
--	  whole_archive_flag_spec_F77=' '
--	  archive_cmds_need_lc_F77=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
--	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	  whole_archive_flag_spec_GCJ='$convenience'
+-	  archive_cmds_need_lc_GCJ=yes
+-	  # This is similar to how AIX traditionally builds its shared libraries.
+-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 -	fi
 -      fi
 -      ;;
 -
 -    amigaos*)
--      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_minus_L_F77=yes
+-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_minus_L_GCJ=yes
 -      # see comment about different semantics on the GNU ld section
--      ld_shlibs_F77=no
+-      ld_shlibs_GCJ=no
 -      ;;
 -
--    bsdi4*)
--      export_dynamic_flag_spec_F77=-rdynamic
+-    bsdi[45]*)
+-      export_dynamic_flag_spec_GCJ=-rdynamic
 -      ;;
 -
 -    cygwin* | mingw* | pw32*)
@@ -52767,80 +58897,80 @@
 -      # Microsoft Visual C++.
 -      # hardcode_libdir_flag_spec is actually meaningless, as there is
 -      # no search path for DLLs.
--      hardcode_libdir_flag_spec_F77=' '
--      allow_undefined_flag_F77=unsupported
+-      hardcode_libdir_flag_spec_GCJ=' '
+-      allow_undefined_flag_GCJ=unsupported
 -      # Tell ltmain to make .lib files, not .a files.
 -      libext=lib
 -      # Tell ltmain to make .dll files, not .so files.
--      shrext=".dll"
+-      shrext_cmds=".dll"
 -      # FIXME: Setting linknames here is a bad hack.
--      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      archive_cmds_GCJ='$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'
+-      old_archive_From_new_cmds_GCJ='true'
 -      # 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
+-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+-      enable_shared_with_static_runtimes_GCJ=yes
 -      ;;
 -
 -    darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
--      archive_cmds_need_lc_F77=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_F77='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_F77='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
+-      case $host_os in
+-        rhapsody* | darwin1.[012])
+-         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[012])
+-               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
 -      esac
--    	lt_int_apple_cc_single_mod=no
+-      archive_cmds_need_lc_GCJ=no
+-      hardcode_direct_GCJ=no
+-      hardcode_automatic_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=unsupported
+-      whole_archive_flag_spec_GCJ=''
+-      link_all_deplibs_GCJ=yes
+-    if test "$GCC" = yes ; then
 -    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      hardcode_direct_F77=no
--      hardcode_automatic_F77=yes
--      hardcode_shlibpath_var_F77=unsupported
--      whole_archive_flag_spec_F77='-all_load $convenience'
--      link_all_deplibs_F77=yes
+-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -    else
--      ld_shlibs_F77=no
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         ld_shlibs_GCJ=no
+-          ;;
+-      esac
 -    fi
 -      ;;
 -
 -    dgux*)
--      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_shlibpath_var_F77=no
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_shlibpath_var_GCJ=no
 -      ;;
 -
 -    freebsd1*)
--      ld_shlibs_F77=no
+-      ld_shlibs_GCJ=no
 -      ;;
 -
 -    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
@@ -52848,91 +58978,106 @@
 -    # does not break anything, and helps significantly (at the cost of a little
 -    # extra space).
 -    freebsd2.2*)
--      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--      hardcode_libdir_flag_spec_F77='-R$libdir'
--      hardcode_direct_F77=yes
--      hardcode_shlibpath_var_F77=no
+-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
 -      ;;
 -
 -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
 -    freebsd2*)
--      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_F77=yes
--      hardcode_minus_L_F77=yes
--      hardcode_shlibpath_var_F77=no
+-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_GCJ=yes
+-      hardcode_minus_L_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
 -      ;;
 -
 -    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
--      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--      hardcode_libdir_flag_spec_F77='-R$libdir'
--      hardcode_direct_F77=yes
--      hardcode_shlibpath_var_F77=no
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
+-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
 -      ;;
 -
 -    hpux9*)
 -      if test "$GCC" = yes; then
--	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 -      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'
+-	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
--      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
--      hardcode_libdir_separator_F77=:
--      hardcode_direct_F77=yes
+-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      hardcode_direct_GCJ=yes
 -
 -      # hardcode_minus_L: Not really in the search PATH,
 -      # but as the default location of the library.
--      hardcode_minus_L_F77=yes
--      export_dynamic_flag_spec_F77='${wl}-E'
+-      hardcode_minus_L_GCJ=yes
+-      export_dynamic_flag_spec_GCJ='${wl}-E'
 -      ;;
 -
--    hpux10* | hpux11*)
+-    hpux10*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_separator_GCJ=:
+-
+-	hardcode_direct_GCJ=yes
+-	export_dynamic_flag_spec_GCJ='${wl}-E'
+-
+-	# hardcode_minus_L: Not really in the search PATH,
+-	# but as the default location of the library.
+-	hardcode_minus_L_GCJ=yes
+-      fi
+-      ;;
+-
+-    hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case $host_cpu in
+-	hppa*64*)
+-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
 -	*)
--	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
 -	esac
 -      else
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	case $host_cpu in
+-	hppa*64*)
+-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
 -	*)
--	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 -	  ;;
 -	esac
 -      fi
 -      if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*)
--	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
--	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
--	  hardcode_libdir_separator_F77=:
--	  hardcode_direct_F77=no
--	  hardcode_shlibpath_var_F77=no
--	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec_F77='-L$libdir'
--	  hardcode_direct_F77=no
--	  hardcode_shlibpath_var_F77=no
+-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_separator_GCJ=:
 -
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  hardcode_minus_L_F77=yes
+-	case $host_cpu in
+-	hppa*64*|ia64*)
+-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+-	  hardcode_direct_GCJ=no
+-	  hardcode_shlibpath_var_GCJ=no
 -	  ;;
 -	*)
--	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
--	  hardcode_libdir_separator_F77=:
--	  hardcode_direct_F77=yes
--	  export_dynamic_flag_spec_F77='${wl}-E'
+-	  hardcode_direct_GCJ=yes
+-	  export_dynamic_flag_spec_GCJ='${wl}-E'
 -
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
--	  hardcode_minus_L_F77=yes
+-	  hardcode_minus_L_GCJ=yes
 -	  ;;
 -	esac
 -      fi
@@ -52940,237 +59085,246 @@
 -
 -    irix5* | irix6* | nonstopux*)
 -      if test "$GCC" = yes; then
--	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 -      else
--	archive_cmds_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'
+-	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'
 -      fi
--      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_F77=:
--      link_all_deplibs_F77=yes
+-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      link_all_deplibs_GCJ=yes
 -      ;;
 -
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 -      else
--	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 -      fi
--      hardcode_libdir_flag_spec_F77='-R$libdir'
--      hardcode_direct_F77=yes
--      hardcode_shlibpath_var_F77=no
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
 -      ;;
 -
 -    newsos6)
--      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_F77=yes
--      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_F77=:
--      hardcode_shlibpath_var_F77=no
--      ;;
--
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_GCJ=yes
+-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+-
 -    openbsd*)
--      hardcode_direct_F77=yes
--      hardcode_shlibpath_var_F77=no
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
 -      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
--	export_dynamic_flag_spec_F77='${wl}-E'
+-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_GCJ='${wl}-E'
 -      else
 -       case $host_os in
 -	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
--	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	   hardcode_libdir_flag_spec_F77='-R$libdir'
+-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
 -	   ;;
 -	 *)
--	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 -	   ;;
 -       esac
 -      fi
 -      ;;
 -
 -    os2*)
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_minus_L_F77=yes
--      allow_undefined_flag_F77=unsupported
--      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
--      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_minus_L_GCJ=yes
+-      allow_undefined_flag_GCJ=unsupported
+-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
 -      ;;
 -
 -    osf3*)
 -      if test "$GCC" = yes; then
--	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 -      else
--	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'
+-	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'
 -      fi
--      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_F77=:
+-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
 -      ;;
 -
 -    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 -      if test "$GCC" = yes; then
--	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
 -      else
--	allow_undefined_flag_F77=' -expect_unresolved \*'
--	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 -
 -	# Both c and cxx compiler support -rpath directly
--	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
 -      fi
--      hardcode_libdir_separator_F77=:
--      ;;
--
--    sco3.2v5*)
--      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var_F77=no
--      export_dynamic_flag_spec_F77='${wl}-Bexport'
--      runpath_var=LD_RUN_PATH
--      hardcode_runpath_var=yes
+-      hardcode_libdir_separator_GCJ=:
 -      ;;
 -
 -    solaris*)
--      no_undefined_flag_F77=' -z text'
+-      no_undefined_flag_GCJ=' -z text'
 -      if test "$GCC" = yes; then
--	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	wlarc='${wl}'
+-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
 -      else
--	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~
+-	wlarc=''
+-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
 -      fi
--      hardcode_libdir_flag_spec_F77='-R$libdir'
--      hardcode_shlibpath_var_F77=no
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_shlibpath_var_GCJ=no
 -      case $host_os in
 -      solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+-      *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
 -      esac
--      link_all_deplibs_F77=yes
+-      link_all_deplibs_GCJ=yes
 -      ;;
 -
 -    sunos4*)
 -      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.
--	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
 -      else
--	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
 -      fi
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_direct_F77=yes
--      hardcode_minus_L_F77=yes
--      hardcode_shlibpath_var_F77=no
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_minus_L_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
 -      ;;
 -
 -    sysv4)
 -      case $host_vendor in
 -	sni)
--	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct_F77=yes # is this really true???
+-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_GCJ=yes # is this really true???
 -	;;
 -	siemens)
 -	  ## LD is ld it makes a PLAMLIB
 -	  ## CC just makes a GrossModule.
--	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--	  reload_cmds_F77='$CC -r -o $output$reload_objs'
--	  hardcode_direct_F77=no
+-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
+-	  hardcode_direct_GCJ=no
 -        ;;
 -	motorola)
--	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
+-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
 -	;;
 -      esac
 -      runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var_F77=no
+-      hardcode_shlibpath_var_GCJ=no
 -      ;;
 -
 -    sysv4.3*)
--      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var_F77=no
--      export_dynamic_flag_spec_F77='-Bexport'
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_GCJ=no
+-      export_dynamic_flag_spec_GCJ='-Bexport'
 -      ;;
 -
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
--	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	hardcode_shlibpath_var_F77=no
+-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_shlibpath_var_GCJ=no
 -	runpath_var=LD_RUN_PATH
 -	hardcode_runpath_var=yes
--	ld_shlibs_F77=yes
+-	ld_shlibs_GCJ=yes
 -      fi
 -      ;;
 -
--    sysv4.2uw2*)
--      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_F77=yes
--      hardcode_minus_L_F77=no
--      hardcode_shlibpath_var_F77=no
--      hardcode_runpath_var=yes
--      runpath_var=LD_RUN_PATH
--      ;;
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+-      no_undefined_flag_GCJ='${wl}-z,text'
+-      archive_cmds_need_lc_GCJ=no
+-      hardcode_shlibpath_var_GCJ=no
+-      runpath_var='LD_RUN_PATH'
 -
--   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
--      no_undefined_flag_F77='${wl}-z ${wl}text'
 -      if test "$GCC" = yes; then
--	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      else
--	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      fi
--      runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var_F77=no
 -      ;;
 -
--    sysv5*)
--      no_undefined_flag_F77=' -z text'
--      # $CC -shared without GNU ld will not create a library from C++
--      # object files and a static libstdc++, better avoid it by now
--      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'
--      hardcode_libdir_flag_spec_F77=
--      hardcode_shlibpath_var_F77=no
+-    sysv5* | sco3.2v5* | sco5v6*)
+-      # Note: We can NOT use -z defs as we might desire, because we do not
+-      # link with -lc, and that would cause any symbols used from libc to
+-      # always be unresolved, which means just about no library would
+-      # ever link correctly.  If we're not using GNU ld we use -z text
+-      # though, which does catch some bad symbols but isn't as heavy-handed
+-      # as -z defs.
+-      no_undefined_flag_GCJ='${wl}-z,text'
+-      allow_undefined_flag_GCJ='${wl}-z,nodefs'
+-      archive_cmds_need_lc_GCJ=no
+-      hardcode_shlibpath_var_GCJ=no
+-      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-      hardcode_libdir_separator_GCJ=':'
+-      link_all_deplibs_GCJ=yes
+-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
 -      runpath_var='LD_RUN_PATH'
+-
+-      if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
 -      ;;
 -
 -    uts4*)
--      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_shlibpath_var_F77=no
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_shlibpath_var_GCJ=no
 -      ;;
 -
 -    *)
--      ld_shlibs_F77=no
+-      ld_shlibs_GCJ=no
 -      ;;
 -    esac
 -  fi
 -
--echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
--echo "${ECHO_T}$ld_shlibs_F77" >&6
--test "$ld_shlibs_F77" = no && can_build_shared=no
--
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
--  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
+-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+-test "$ld_shlibs_GCJ" = no && can_build_shared=no
 -
 -#
 -# Do we need to explicitly link libc?
 -#
--case "x$archive_cmds_need_lc_F77" in
+-case "x$archive_cmds_need_lc_GCJ" in
 -x|xyes)
 -  # Assume -lc should be added
--  archive_cmds_need_lc_F77=yes
+-  archive_cmds_need_lc_GCJ=yes
 -
 -  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $archive_cmds_F77 in
+-    case $archive_cmds_GCJ in
 -    *'~'*)
 -      # FIXME: we may have to deal with multi-command sequences.
 -      ;;
@@ -53192,31 +59346,32 @@
 -        lib=conftest
 -        libobjs=conftest.$ac_objext
 -        deplibs=
--        wl=$lt_prog_compiler_wl_F77
+-        wl=$lt_prog_compiler_wl_GCJ
+-	pic_flag=$lt_prog_compiler_pic_GCJ
 -        compiler_flags=-v
 -        linker_flags=-v
 -        verstring=
 -        output_objdir=.
 -        libname=conftest
--        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
--        allow_undefined_flag_F77=
--        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
--  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
+-        allow_undefined_flag_GCJ=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
 -        then
--	  archive_cmds_need_lc_F77=no
+-	  archive_cmds_need_lc_GCJ=no
 -        else
--	  archive_cmds_need_lc_F77=yes
+-	  archive_cmds_need_lc_GCJ=yes
 -        fi
--        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
+-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
 -      else
 -        cat conftest.err 1>&5
 -      fi
 -      $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
 -      ;;
 -    esac
 -  fi
@@ -53228,7 +59383,7 @@
 -library_names_spec=
 -libname_spec='lib$name'
 -soname_spec=
--shrext=".so"
+-shrext_cmds=".so"
 -postinstall_cmds=
 -postuninstall_cmds=
 -finish_cmds=
@@ -53325,7 +59480,7 @@
 -  shlibpath_var=LIBRARY_PATH
 -  ;;
 -
--bsdi4*)
+-bsdi[45]*)
 -  version_type=linux
 -  need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -53341,7 +59496,7 @@
 -
 -cygwin* | mingw* | pw32*)
 -  version_type=windows
--  shrext=".dll"
+-  shrext_cmds=".dll"
 -  need_version=no
 -  need_lib_prefix=no
 -
@@ -53353,7 +59508,8 @@
 -      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
 -      dldir=$destdir/`dirname \$dlpath`~
 -      test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
+-      $install_prog $dir/$dlname \$dldir/$dlname~
+-      chmod a+x \$dldir/$dlname'
 -    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 -      dlpath=$dir/\$dldll~
 -       $rm \$dlpath'
@@ -53383,7 +59539,7 @@
 -      ;;
 -    pw32*)
 -      # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 -      ;;
 -    esac
 -    ;;
@@ -53406,7 +59562,7 @@
 -  soname_spec='${libname}${release}${major}$shared_ext'
 -  shlibpath_overrides_runpath=yes
 -  shlibpath_var=DYLD_LIBRARY_PATH
--  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 -  # 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"`
@@ -53441,8 +59597,17 @@
 -  dynamic_linker='GNU ld.so'
 -  ;;
 -
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-freebsd* | dragonfly*)
+-  # DragonFly does not have aout.  When/if they implement a new
+-  # versioning mechanism, adjust this.
+-  if test -x /usr/bin/objformat; then
+-    objformat=`/usr/bin/objformat`
+-  else
+-    case $host_os in
+-    freebsd[123]*) objformat=aout ;;
+-    *) objformat=elf ;;
+-    esac
+-  fi
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
@@ -53460,14 +59625,19 @@
 -  freebsd2*)
 -    shlibpath_overrides_runpath=yes
 -    ;;
--  freebsd3.01* | freebsdelf3.01*)
+-  freebsd3.[01]* | freebsdelf3.[01]*)
 -    shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
 -    ;;
--  *) # from 3.2 on
+-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
 -    shlibpath_overrides_runpath=no
 -    hardcode_into_libs=yes
 -    ;;
+-  freebsd*) # from 4.6 on
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
 -  esac
 -  ;;
 -
@@ -53487,9 +59657,9 @@
 -  version_type=sunos
 -  need_lib_prefix=no
 -  need_version=no
--  case "$host_cpu" in
+-  case $host_cpu in
 -  ia64*)
--    shrext='.so'
+-    shrext_cmds='.so'
 -    hardcode_into_libs=yes
 -    dynamic_linker="$host_os dld.so"
 -    shlibpath_var=LD_LIBRARY_PATH
@@ -53504,7 +59674,7 @@
 -    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 -    ;;
 -   hppa*64*)
--     shrext='.sl'
+-     shrext_cmds='.sl'
 -     hardcode_into_libs=yes
 -     dynamic_linker="$host_os dld.sl"
 -     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -53515,7 +59685,7 @@
 -     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 -     ;;
 -   *)
--    shrext='.sl'
+-    shrext_cmds='.sl'
 -    dynamic_linker="$host_os dld.sl"
 -    shlibpath_var=SHLIB_PATH
 -    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -53527,6 +59697,18 @@
 -  postinstall_cmds='chmod 555 $lib'
 -  ;;
 -
+-interix3*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  ;;
+-
 -irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -    nonstopux*) version_type=nonstopux ;;
@@ -53568,7 +59750,7 @@
 -linux*oldld* | linux*aout* | linux*coff*)
 -  dynamic_linker=no
 -  ;;
- 
+-
 -# This must be Linux ELF.
 -linux*)
 -  version_type=linux
@@ -53583,15 +59765,47 @@
 -  # Some rework will be needed to allow for fast_install
 -  # before this can be enabled.
 -  hardcode_into_libs=yes
++fi
++rm -fr conftest*
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 18441 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
++$as_echo "$lt_cv_dlopen_self_static" >&6; }
+     fi
+-    rm -rf conftest*
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
+     ;;
+   esac
  
 -  # Append ld.so.conf contents to the search path
 -  if test -f /etc/ld.so.conf; then
--    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
 -  fi
-+cat >>confdefs.h <<_ACEOF
-+#define LT_OBJDIR "$lt_cv_objdir/"
-+_ACEOF
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
  
 -  # We used to test for /lib/ld.so.1 and disable shared libraries on
 -  # powerpc, because MkLinux only supported shared libraries with the
@@ -53601,6 +59815,11 @@
 -  # assume the GNU/Linux dynamic linker is in use.
 -  dynamic_linker='GNU/Linux ld.so'
 -  ;;
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
  
 -knetbsd*-gnu)
 -  version_type=linux
@@ -53651,8 +59870,13 @@
  
 -openbsd*)
 -  version_type=sunos
+-  sys_lib_dlsearch_path_spec="/usr/lib"
 -  need_lib_prefix=no
--  need_version=yes
+-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+-  case $host_os in
+-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+-    *)                         need_version=no  ;;
+-  esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 -  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 -  shlibpath_var=LD_LIBRARY_PATH
@@ -53672,7 +59896,7 @@
  
 -os2*)
 -  libname_spec='$name'
--  shrext=".dll"
+-  shrext_cmds=".dll"
 -  need_lib_prefix=no
 -  library_names_spec='$libname${shared_ext} $libname.a'
 -  dynamic_linker='OS/2 ld.exe'
@@ -53690,13 +59914,6 @@
 -  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
 -  ;;
  
--sco3.2v5*)
--  version_type=osf
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
- 
 -solaris*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -53722,7 +59939,7 @@
 -  need_version=yes
 -  ;;
  
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-sysv4 | sysv4.3*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -  soname_spec='${libname}${release}${shared_ext}$major'
@@ -53755,6 +59972,29 @@
 -  fi
 -  ;;
  
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  version_type=freebsd-elf
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  if test "$with_gnu_ld" = yes; then
+-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+-    shlibpath_overrides_runpath=no
+-  else
+-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+-    shlibpath_overrides_runpath=yes
+-    case $host_os in
+-      sco3.2v5*)
+-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+-	;;
+-    esac
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/lib'
+-  ;;
+ 
 -uts4*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -53770,43 +60010,49 @@
 -echo "${ECHO_T}$dynamic_linker" >&6
 -test "$dynamic_linker" = no && can_build_shared=no
  
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+ 
 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
--hardcode_action_F77=
--if test -n "$hardcode_libdir_flag_spec_F77" || \
--   test -n "$runpath_var F77" || \
--   test "X$hardcode_automatic_F77"="Xyes" ; then
+-hardcode_action_GCJ=
+-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+-   test -n "$runpath_var_GCJ" || \
+-   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
  
 -  # We can hardcode non-existant directories.
--  if test "$hardcode_direct_F77" != no &&
+-  if test "$hardcode_direct_GCJ" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
 -     # have to relink, otherwise we might link with an installed library
 -     # when we should be linking with a yet-to-be-installed one
--     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
--     test "$hardcode_minus_L_F77" != no; then
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+-     test "$hardcode_minus_L_GCJ" != no; then
 -    # Linking always hardcodes the temporary library directory.
--    hardcode_action_F77=relink
+-    hardcode_action_GCJ=relink
 -  else
 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action_F77=immediate
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-   fi
--else
+-    hardcode_action_GCJ=immediate
+-  fi
++striplib=
++old_striplib=
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
++$as_echo_n "checking whether stripping libraries is possible... " >&6; }
++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ else
 -  # We cannot hardcode anything, or else we can only hardcode existing
 -  # directories.
--  hardcode_action_F77=unsupported
+-  hardcode_action_GCJ=unsupported
 -fi
--echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
--echo "${ECHO_T}$hardcode_action_F77" >&6
+-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+-echo "${ECHO_T}$hardcode_action_GCJ" >&6
 -
--if test "$hardcode_action_F77" = relink; then
+-if test "$hardcode_action_GCJ" = relink; then
 -  # Fast installation is not supported
 -  enable_fast_install=no
 -elif test "$shlibpath_overrides_runpath" = yes ||
@@ -53815,36 +60061,6 @@
 -  enable_fast_install=needless
 -fi
 -
--striplib=
--old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--   darwin*)
--       if test -n "$STRIP" ; then
--         striplib="$STRIP -x"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--       else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--       ;;
--   *)
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--    ;;
--  esac
--fi
--
--
 -
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -53859,7 +60075,7 @@
 -  # 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.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
 -    SED SHELL STRIP \
 -    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
 -    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -53868,51 +60084,51 @@
 -    lt_cv_sys_global_symbol_to_c_name_address \
 -    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
 -    old_postinstall_cmds old_postuninstall_cmds \
--    compiler_F77 \
--    CC_F77 \
--    LD_F77 \
--    lt_prog_compiler_wl_F77 \
--    lt_prog_compiler_pic_F77 \
--    lt_prog_compiler_static_F77 \
--    lt_prog_compiler_no_builtin_flag_F77 \
--    export_dynamic_flag_spec_F77 \
--    thread_safe_flag_spec_F77 \
--    whole_archive_flag_spec_F77 \
--    enable_shared_with_static_runtimes_F77 \
--    old_archive_cmds_F77 \
--    old_archive_from_new_cmds_F77 \
--    predep_objects_F77 \
--    postdep_objects_F77 \
--    predeps_F77 \
--    postdeps_F77 \
--    compiler_lib_search_path_F77 \
--    archive_cmds_F77 \
--    archive_expsym_cmds_F77 \
--    postinstall_cmds_F77 \
--    postuninstall_cmds_F77 \
--    old_archive_from_expsyms_cmds_F77 \
--    allow_undefined_flag_F77 \
--    no_undefined_flag_F77 \
--    export_symbols_cmds_F77 \
--    hardcode_libdir_flag_spec_F77 \
--    hardcode_libdir_flag_spec_ld_F77 \
--    hardcode_libdir_separator_F77 \
--    hardcode_automatic_F77 \
--    module_cmds_F77 \
--    module_expsym_cmds_F77 \
--    lt_cv_prog_compiler_c_o_F77 \
--    exclude_expsyms_F77 \
--    include_expsyms_F77; do
+-    compiler_GCJ \
+-    CC_GCJ \
+-    LD_GCJ \
+-    lt_prog_compiler_wl_GCJ \
+-    lt_prog_compiler_pic_GCJ \
+-    lt_prog_compiler_static_GCJ \
+-    lt_prog_compiler_no_builtin_flag_GCJ \
+-    export_dynamic_flag_spec_GCJ \
+-    thread_safe_flag_spec_GCJ \
+-    whole_archive_flag_spec_GCJ \
+-    enable_shared_with_static_runtimes_GCJ \
+-    old_archive_cmds_GCJ \
+-    old_archive_from_new_cmds_GCJ \
+-    predep_objects_GCJ \
+-    postdep_objects_GCJ \
+-    predeps_GCJ \
+-    postdeps_GCJ \
+-    compiler_lib_search_path_GCJ \
+-    archive_cmds_GCJ \
+-    archive_expsym_cmds_GCJ \
+-    postinstall_cmds_GCJ \
+-    postuninstall_cmds_GCJ \
+-    old_archive_from_expsyms_cmds_GCJ \
+-    allow_undefined_flag_GCJ \
+-    no_undefined_flag_GCJ \
+-    export_symbols_cmds_GCJ \
+-    hardcode_libdir_flag_spec_GCJ \
+-    hardcode_libdir_flag_spec_ld_GCJ \
+-    hardcode_libdir_separator_GCJ \
+-    hardcode_automatic_GCJ \
+-    module_cmds_GCJ \
+-    module_expsym_cmds_GCJ \
+-    lt_cv_prog_compiler_c_o_GCJ \
+-    exclude_expsyms_GCJ \
+-    include_expsyms_GCJ; do
 -
 -    case $var in
--    old_archive_cmds_F77 | \
--    old_archive_from_new_cmds_F77 | \
--    archive_cmds_F77 | \
--    archive_expsym_cmds_F77 | \
--    module_cmds_F77 | \
--    module_expsym_cmds_F77 | \
--    old_archive_from_expsyms_cmds_F77 | \
--    export_symbols_cmds_F77 | \
+-    old_archive_cmds_GCJ | \
+-    old_archive_from_new_cmds_GCJ | \
+-    archive_cmds_GCJ | \
+-    archive_expsym_cmds_GCJ | \
+-    module_cmds_GCJ | \
+-    module_expsym_cmds_GCJ | \
+-    old_archive_from_expsyms_cmds_GCJ | \
+-    export_symbols_cmds_GCJ | \
 -    extract_expsyms_cmds | reload_cmds | finish_cmds | \
 -    postinstall_cmds | postuninstall_cmds | \
 -    old_postinstall_cmds | old_postuninstall_cmds | \
@@ -53929,467 +60145,933 @@
 -  case $lt_echo in
 -  *'\$0 --fallback-echo"')
 -    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
--    ;;
--  esac
--
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++  darwin*)
++    if test -n "$STRIP" ; then
++      striplib="$STRIP -x"
++      old_striplib="$STRIP -S"
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++    else
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++    fi
++    ;;
++  *)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+     ;;
+   esac
++fi
+ 
 -cfgfile="$ofile"
--
+ 
 -  cat <<__EOF__ >> "$cfgfile"
 -# ### BEGIN LIBTOOL TAG CONFIG: $tagname
--
+ 
 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--
+ 
 -# Shell to use when invoking shell scripts.
 -SHELL=$lt_SHELL
--
+ 
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
--
+ 
 -# Whether or not to build static libraries.
 -build_old_libs=$enable_static
--
+ 
 -# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_F77
--
+-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
+ 
 -# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
--
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
+ 
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
--
+ 
 -# The host system.
 -host_alias=$host_alias
 -host=$host
--
+-host_os=$host_os
+ 
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
+ 
 -# An echo program that does not interpret backslashes.
 -echo=$lt_echo
--
++  # Report which library types will actually be built
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
++$as_echo_n "checking if libtool supports shared libraries... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
++$as_echo "$can_build_shared" >&6; }
+ 
 -# The archiver.
 -AR=$lt_AR
 -AR_FLAGS=$lt_AR_FLAGS
--
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
++$as_echo_n "checking whether to build shared libraries... " >&6; }
++  test "$can_build_shared" = "no" && enable_shared=no
+ 
 -# A C compiler.
 -LTCC=$lt_LTCC
--
--# A language-specific compiler.
--CC=$lt_compiler_F77
--
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_F77
--
--# An ERE matcher.
--EGREP=$lt_EGREP
--
--# The linker used to build libraries.
--LD=$lt_LD_F77
--
--# Whether we need hard or soft links.
++  # On AIX, shared libraries and static libraries use the same namespace, and
++  # are all built from PIC.
++  case $host_os in
++  aix3*)
++    test "$enable_shared" = yes && enable_static=no
++    if test -n "$RANLIB"; then
++      archive_cmds="$archive_cmds~\$RANLIB \$lib"
++      postinstall_cmds='$RANLIB $lib'
++    fi
++    ;;
+ 
+-# LTCC compiler flags.
+-LTCFLAGS=$lt_LTCFLAGS
++  aix[4-9]*)
++    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++      test "$enable_shared" = yes && enable_static=no
++    fi
++    ;;
++  esac
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
++$as_echo "$enable_shared" >&6; }
+ 
+-# A language-specific compiler.
+-CC=$lt_compiler_GCJ
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
++$as_echo_n "checking whether to build static libraries... " >&6; }
++  # Make sure either enable_shared or enable_static is yes.
++  test "$enable_shared" = yes || enable_static=yes
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
++$as_echo "$enable_static" >&6; }
+ 
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_GCJ
+ 
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
+ 
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+ 
+-# The linker used to build libraries.
+-LD=$lt_LD_GCJ
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
--
++CC="$lt_save_CC"
+ 
 -# A BSD-compatible nm program.
 -NM=$lt_NM
--
+ 
 -# A symbol stripping program
 -STRIP=$lt_STRIP
--
+ 
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
--
+ 
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
--
+ 
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
--
+ 
 -# Used on cygwin: assembler.
--AS=$lt_AS
--
+-AS="$AS"
+ 
 -# The name of the directory that contains temporary libtool files.
 -objdir=$objdir
--
+ 
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
--
+ 
 -# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_F77
--
+-wl=$lt_lt_prog_compiler_wl_GCJ
+ 
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
--
+ 
 -# Old archive suffix (normally "a").
 -libext="$libext"
--
+ 
 -# Shared library suffix (normally ".so").
--shrext='$shrext'
--
+-shrext_cmds='$shrext_cmds'
+ 
 -# Executable file suffix (normally "").
 -exeext="$exeext"
--
++        ac_config_commands="$ac_config_commands libtool"
+ 
 -# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_F77
+-pic_flag=$lt_lt_prog_compiler_pic_GCJ
 -pic_mode=$pic_mode
--
+ 
 -# What is the maximum length of a command?
 -max_cmd_len=$lt_cv_sys_max_cmd_len
--
+ 
 -# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
--
--# Must we lock files when doing compilation ?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+ 
+-# Must we lock files when doing compilation?
 -need_locks=$lt_need_locks
--
++# Only expand once:
+ 
 -# Do we need the lib prefix for modules?
 -need_lib_prefix=$need_lib_prefix
--
+ 
 -# Do we need a version for libraries?
 -need_version=$need_version
--
+ 
 -# Whether dlopen is supported.
 -dlopen_support=$enable_dlopen
--
++if test x"$enable_static$enable_all_static" = xnoyes; then
++  as_fn_error $? "You cannot pass --enable-all-static without one of --enable-static or --disable-shared" "$LINENO" 5
++fi
++ if test $enable_static = yes; then
++  CR_ENABLE_STATIC_TRUE=
++  CR_ENABLE_STATIC_FALSE='#'
++else
++  CR_ENABLE_STATIC_TRUE='#'
++  CR_ENABLE_STATIC_FALSE=
++fi
+ 
 -# Whether dlopen of programs is supported.
 -dlopen_self=$enable_dlopen_self
--
++ if test $enable_shared = yes; then
++  CR_ENABLE_SHARED_TRUE=
++  CR_ENABLE_SHARED_FALSE='#'
++else
++  CR_ENABLE_SHARED_TRUE='#'
++  CR_ENABLE_SHARED_FALSE=
++fi
+ 
 -# Whether dlopen of statically linked programs is supported.
 -dlopen_self_static=$enable_dlopen_self_static
--
+ 
 -# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_F77
--
+-link_static_flag=$lt_lt_prog_compiler_static_GCJ
++# Check for rpmbuild
+ 
 -# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
--
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
++  for ac_prog in rpmbuild rpmb rpm
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_RPMBUILD+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $RPMBUILD in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_RPMBUILD="$RPMBUILD" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy="$PATH:/usr/lib/rpm"
++for as_dir in $as_dummy
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
--
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
++  ;;
++esac
++fi
++RPMBUILD=$ac_cv_path_RPMBUILD
++if test -n "$RPMBUILD"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPMBUILD" >&5
++$as_echo "$RPMBUILD" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
 -# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
--
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
+ 
 -# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
--
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
++  test -n "$RPMBUILD" && break
++done
++test -n "$RPMBUILD" || RPMBUILD="none"
+ 
 -# Library versioning type.
 -version_type=$version_type
--
++  if $RPMBUILD -bs 2>&1 | grep 'no spec' >/dev/null 2>/dev/null; then
++    :
++  else
++    RPMBUILD=none
++  fi
+ 
 -# Format of library name prefix.
 -libname_spec=$lt_libname_spec
--
++ if test $RPMBUILD != none; then
++  HAVE_RPMBUILD_TRUE=
++  HAVE_RPMBUILD_FALSE='#'
++else
++  HAVE_RPMBUILD_TRUE='#'
++  HAVE_RPMBUILD_FALSE=
++fi
+ 
 -# List of archive names.  First name is the real one, the rest are links.
 -# The last name is the one that the linker finds with -lNAME.
 -library_names_spec=$lt_library_names_spec
--
+ 
 -# The coded name of the library, if different from the real name.
 -soname_spec=$lt_soname_spec
--
++# Check for a GNU C compiler (or a work alike?)
+ 
 -# Commands used to build and install an old-style archive.
 -RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_F77
+-old_archive_cmds=$lt_old_archive_cmds_GCJ
 -old_postinstall_cmds=$lt_old_postinstall_cmds
 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
--
++  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
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_CC="${ac_tool_prefix}gcc"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
--
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
 -# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
--
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
+ 
 -# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_F77
--archive_expsym_cmds=$lt_archive_expsym_cmds_F77
+-archive_cmds=$lt_archive_cmds_GCJ
+-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
 -postinstall_cmds=$lt_postinstall_cmds
 -postuninstall_cmds=$lt_postuninstall_cmds
--
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_CC="gcc"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_F77
--module_expsym_cmds=$lt_module_expsym_cmds_F77
--
+-module_cmds=$lt_module_cmds_GCJ
+-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
 -# Commands to strip libraries.
 -old_striplib=$lt_old_striplib
 -striplib=$lt_striplib
--
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
++else
++  CC="$ac_cv_prog_CC"
++fi
+ 
 -# Dependencies to place before the objects being linked to create a
 -# shared library.
--predep_objects=$lt_predep_objects_F77
+-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 -
 -# Dependencies to place after the objects being linked to create a
 -# shared library.
--postdep_objects=$lt_postdep_objects_F77
+-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 -
 -# Dependencies to place before the objects being linked to create a
 -# shared library.
--predeps=$lt_predeps_F77
+-predeps=$lt_predeps_GCJ
 -
 -# Dependencies to place after the objects being linked to create a
 -# shared library.
--postdeps=$lt_postdeps_F77
--
+-postdeps=$lt_postdeps_GCJ
++if test -z "$CC"; then
++          if test -n "$ac_tool_prefix"; then
++    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_CC="${ac_tool_prefix}cc"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -# The library search path used internally by the compiler when linking
 -# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_F77
--
+-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
 -# Method to check whether dependent libraries are shared objects.
 -deplibs_check_method=$lt_deplibs_check_method
--
+ 
 -# Command to use when deplibs_check_method == file_magic.
 -file_magic_cmd=$lt_file_magic_cmd
--
++  fi
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_prog_rejected=no
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++       ac_prog_rejected=yes
++       continue
++     fi
++    ac_cv_prog_CC="cc"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_F77
--
+-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $# != 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++  fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
 -# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_F77
-+  ;;
-+esac
+-no_undefined_flag=$lt_no_undefined_flag_GCJ
  
 -# Commands used to finish a libtool library installation in a directory.
 -finish_cmds=$lt_finish_cmds
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl.exe
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
 -# Same as above, but a single script fragment to be evaled but not shown.
 -finish_eval=$lt_finish_eval
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
 -# Take the output of nm and produce a listing of raw symbols and C names.
 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
  
 -# Transform the output of nm in a proper C declaration
 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl.exe
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_CC="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
 -# Transform the output of nm in a C name address pair
 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
- 
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
- 
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+ 
 -# This is the shared library path variable.
 -shlibpath_var=$shlibpath_var
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
++  test -n "$ac_ct_CC" && break
++done
  
 -# Is shlibpath searched before the hard-coded library search path?
 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
++fi
  
 -# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_F77
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
+-hardcode_action=$hardcode_action_GCJ
++fi
  
 -# Whether we should hardcode library paths into libraries.
 -hardcode_into_libs=$hardcode_into_libs
-+# Set sane defaults for various variables
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$LD" && LD=ld
-+test -z "$ac_objext" && ac_objext=o
  
 -# Flag to hardcode \$libdir into a binary during linking.
 -# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
  
 -# If ld is used when linking, flag to hardcode \$libdir into
 -# a binary during linking. This must work even if \$libdir does
 -# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
 -
 -# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
 -
 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
 -# resulting binary.
--hardcode_direct=$hardcode_direct_F77
+-hardcode_direct=$hardcode_direct_GCJ
 -
 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 -# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_F77
+-hardcode_minus_L=$hardcode_minus_L_GCJ
 -
 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 -# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
+-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
 -
 -# Set to yes if building a shared library automatically hardcodes DIR into the library
 -# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_F77
+-hardcode_automatic=$hardcode_automatic_GCJ
++# Provide some information about the compiler.
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    sed '10a\
++... rest of stderr output deleted ...
++         10q' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++  fi
++  rm -f conftest.er1 conftest.err
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
++if ${ac_cv_c_compiler_gnu+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -# Variables whose values should be saved in libtool wrapper scripts and
 -# restored at relink time.
 -variables_saved_for_relink="$variables_saved_for_relink"
-+# Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $MAGIC_CMD in
-+[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<_LT_EOF 1>&2
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
  
 -# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_F77
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
+-link_all_deplibs=$link_all_deplibs_GCJ
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_compiler_gnu=yes
++else
++  ac_compiler_gnu=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
 -# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
++$as_echo "$ac_cv_c_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++  GCC=yes
++else
++  GCC=
 +fi
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
++$as_echo_n "checking whether $CC accepts -g... " >&6; }
++if ${ac_cv_prog_cc_g+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_save_c_werror_flag=$ac_c_werror_flag
++   ac_c_werror_flag=yes
++   ac_cv_prog_cc_g=no
++   CFLAGS="-g"
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -# Run-time system search path for libraries
 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
++int
++main ()
++{
  
 -# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_F77"
+-fix_srcfile_path="$fix_srcfile_path_GCJ"
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_prog_cc_g=yes
++else
++  CFLAGS=""
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_F77
+-always_export_symbols=$always_export_symbols_GCJ
++int
++main ()
++{
  
 -# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_F77
+-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
  
 -# The commands to extract the exported symbol list from a shared archive.
 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
++else
++  ac_c_werror_flag=$ac_save_c_werror_flag
++	 CFLAGS="-g"
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_F77
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-+$as_echo_n "checking for file... " >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $MAGIC_CMD in
-+[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<_LT_EOF 1>&2
+-exclude_expsyms=$lt_exclude_expsyms_GCJ
++int
++main ()
++{
  
 -# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_F77
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
+-include_expsyms=$lt_include_expsyms_GCJ
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_prog_cc_g=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
++$as_echo "$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++if ${ac_cv_prog_cc_c89+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
  
 -# ### END LIBTOOL TAG CONFIG: $tagname
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
  
 -__EOF__
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
  
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_prog_cc_c89=$ac_arg
++fi
++rm -f core conftest.err conftest.$ac_objext
++  test "x$ac_cv_prog_cc_c89" != "xno" && break
++done
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
  
 -else
 -  # If there is no Makefile yet, we rely on a make rule to execute
@@ -54398,3500 +61080,2492 @@
 -  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 -  if test -f "$ltmain_in"; then
 -    test -f Makefile && make "$ltmain"
-+  else
-+    MAGIC_CMD=:
-   fi
+-  fi
  fi
- 
-+  fi
-+  ;;
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++  x)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
++$as_echo "none needed" >&6; } ;;
++  xno)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
++$as_echo "unsupported" >&6; } ;;
++  *)
++    CC="$CC $ac_cv_prog_cc_c89"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 +esac
-+
-+# Use C for the default configuration in the libtool script
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+ 
++fi
  
-+lt_save_CC="$CC"
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -19119,1051 +13267,1686 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
 -CC="$lt_save_CC"
- 
+-
 -	else
 -	  tagname=""
 -	fi
 -	;;
-+# Source file extension for C test sources.
-+ac_ext=c
- 
--      GCJ)
--	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+# Object file extension for compiled C test sources.
-+objext=o
-+objext=$objext
- 
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
+-
+-      RC)
+-
++depcc="$CC"   am_compiler_list=
  
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++  # We make a subdir and do the tests there.  Otherwise we can end up
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
  
--# Source file extension for Java test sources.
--ac_ext=java
+-# Source file extension for RC test sources.
+-ac_ext=rc
++  am_cv_CC_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++  fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
  
--# Object file extension for compiled Java test sources.
+-# Object file extension for compiled RC test sources.
 -objext=o
--objext_GCJ=$objext
+-objext_RC=$objext
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
 -# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
- 
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
- 
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
- 
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
- 
--# Allow CC to be a program name with arguments.
--compiler=$CC
--
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
- # Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${GCJ-"gcj"}
- compiler=$CC
--compiler_GCJ=$CC
- 
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--archive_cmds_need_lc_GCJ=no
-+# Save the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
-+
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$RM conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$RM -r conftest*
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
++    case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
++    none) break ;;
++    esac
++    if depmode=$depmode \
++       source=sub/conftest.c object=$am__obj \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_CC_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
  
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_CC_dependencies_compiler_type=none
++fi
  
--lt_prog_compiler_no_builtin_flag_GCJ=
-+if test -n "$compiler"; then
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
--if test "$GCC" = yes; then
--  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-+lt_prog_compiler_no_builtin_flag=
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++ if
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
++  am__fastdepCC_TRUE=
++  am__fastdepCC_FALSE='#'
++else
++  am__fastdepCC_TRUE='#'
++  am__fastdepCC_FALSE=
++fi
  
-+if test "$GCC" = yes; then
-+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
  
--echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
--  ac_outfile=conftest.$ac_objext
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-    lt_compiler_flag="-fno-rtti -fno-exceptions"
-    # Insert the option either (1) after the last *FLAGS variable, or
-    # (2) before a word containing "conftest.", or (3) at the end.
-@@ -16486,292 +8617,498 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16492: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8623: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16496: \$? = $ac_status" >&5
-+   echo "$as_me:8627: \$? = $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
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
--   $rm conftest*
-+   $RM conftest*
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
  
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
++  if test "$GCC" = yes; then
++    :
++  else
++    cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
  
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
--    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
- else
-     :
- fi
+-# save warnings/boilerplate of simple test code
+-ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_compiler_boilerplate=`cat conftest.err`
+-$rm conftest*
++_ACEOF
  
- fi
+-ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, we kill variables containing newlines.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
  
--lt_prog_compiler_wl_GCJ=
--lt_prog_compiler_pic_GCJ=
--lt_prog_compiler_static_GCJ=
++  (set) 2>&1 |
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;; #(
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
++      ;;
++    esac |
++    sort
++) |
++  sed '
++     /^ac_cv_env_/b end
++     t clear
++     :clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
++  else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
++  fi
++fi
++rm -f confcache
++   as_fn_error $? "the C compiler '$CC' is not a GNU C compiler." "$LINENO" 5
++  fi
  
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+
-+
-+
-+
-+  lt_prog_compiler_wl=
-+lt_prog_compiler_pic=
-+lt_prog_compiler_static=
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${RC-"windres"}
+-compiler=$CC
+-compiler_RC=$CC
+-for cc_temp in $compiler""; do
+-  case $cc_temp in
+-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  
-   if test "$GCC" = yes; then
--    lt_prog_compiler_wl_GCJ='-Wl,'
--    lt_prog_compiler_static_GCJ='-static'
-+    lt_prog_compiler_wl='-Wl,'
-+    lt_prog_compiler_static='-static'
+-lt_cv_prog_compiler_c_o_RC=yes
  
-     case $host_os in
-       aix*)
-       # All AIX code is PIC.
-       if test "$host_cpu" = ia64; then
- 	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static_GCJ='-Bstatic'
-+	lt_prog_compiler_static='-Bstatic'
-       fi
-       ;;
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # 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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+-    SED SHELL STRIP \
+-    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 \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_RC \
+-    CC_RC \
+-    LD_RC \
+-    lt_prog_compiler_wl_RC \
+-    lt_prog_compiler_pic_RC \
+-    lt_prog_compiler_static_RC \
+-    lt_prog_compiler_no_builtin_flag_RC \
+-    export_dynamic_flag_spec_RC \
+-    thread_safe_flag_spec_RC \
+-    whole_archive_flag_spec_RC \
+-    enable_shared_with_static_runtimes_RC \
+-    old_archive_cmds_RC \
+-    old_archive_from_new_cmds_RC \
+-    predep_objects_RC \
+-    postdep_objects_RC \
+-    predeps_RC \
+-    postdeps_RC \
+-    compiler_lib_search_path_RC \
+-    archive_cmds_RC \
+-    archive_expsym_cmds_RC \
+-    postinstall_cmds_RC \
+-    postuninstall_cmds_RC \
+-    old_archive_from_expsyms_cmds_RC \
+-    allow_undefined_flag_RC \
+-    no_undefined_flag_RC \
+-    export_symbols_cmds_RC \
+-    hardcode_libdir_flag_spec_RC \
+-    hardcode_libdir_flag_spec_ld_RC \
+-    hardcode_libdir_separator_RC \
+-    hardcode_automatic_RC \
+-    module_cmds_RC \
+-    module_expsym_cmds_RC \
+-    lt_cv_prog_compiler_c_o_RC \
+-    exclude_expsyms_RC \
+-    include_expsyms_RC; do
+-
+-    case $var in
+-    old_archive_cmds_RC | \
+-    old_archive_from_new_cmds_RC | \
+-    archive_cmds_RC | \
+-    archive_expsym_cmds_RC | \
+-    module_cmds_RC | \
+-    module_expsym_cmds_RC | \
+-    old_archive_from_expsyms_cmds_RC | \
+-    export_symbols_cmds_RC | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
++# Configure inlining (XXX: need to probe gcc for support?)
  
-     amigaos*)
--      # FIXME: we need at least 68020 code to build shared libraries, but
--      # adding the `-m68020' flag to GCC prevents building anything better,
--      # like `-m68040'.
--      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            lt_prog_compiler_pic='-fPIC'
-+        ;;
-+      m68k)
-+            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
-+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-       ;;
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
++$as_echo "#define CR_INLINE static __inline__ __attribute__ ((__unused__))" >>confdefs.h
  
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
+-cfgfile="$ofile"
  
--    mingw* | pw32* | os2*)
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+      # (--disable-auto-import) libraries
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-       ;;
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++# Check for additional flags needed when building libcr
++if test x"$cr_build_libcr" = xyes; then
++CR_LIBCR_CFLAGS=""
  
-     darwin* | rhapsody*)
-       # PIC is the default on this platform
-       # Common symbols not allowed in MH_DYLIB files
--      lt_prog_compiler_pic_GCJ='-fno-common'
-+      lt_prog_compiler_pic='-fno-common'
-+      ;;
-+
-+    hpux*)
-+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-+      # sets the default TLS model and affects inlining.
-+      case $host_cpu in
-+      hppa*64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    interix[3-9]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-       ;;
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wall" >&5
++$as_echo_n "checking whether gcc accepts -Wall... " >&6; }
++if ${cr_cv_gcc_flag_WALL+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
  
-     msdosdjgpp*)
-       # Just because we use GCC doesn't mean we suddenly get shared libraries
-       # on systems that don't support them.
--      lt_prog_compiler_can_build_shared_GCJ=no
-+      lt_prog_compiler_can_build_shared=no
-       enable_shared=no
-       ;;
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
++    SAVE_CFLAGS=$CFLAGS
++    CFLAGS="$CFLAGS -Wall"
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
-+
-     sysv4*MP*)
-       if test -d /usr/nec; then
--	lt_prog_compiler_pic_GCJ=-Kconform_pic
-+	lt_prog_compiler_pic=-Kconform_pic
-       fi
-       ;;
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
++int
++main ()
++{
  
--    hpux*)
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
--      case "$host_cpu" in
--      hppa*64*|ia64*)
--	# +Z the default
--	;;
--      *)
--	lt_prog_compiler_pic_GCJ='-fPIC'
--	;;
--      esac
--      ;;
--
-     *)
--      lt_prog_compiler_pic_GCJ='-fPIC'
-+      lt_prog_compiler_pic='-fPIC'
-       ;;
-     esac
-   else
-     # PORTME Check for flag to pass linker flags through the system compiler.
-     case $host_os in
-     aix*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_wl='-Wl,'
-       if test "$host_cpu" = ia64; then
- 	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static_GCJ='-Bstatic'
-+	lt_prog_compiler_static='-Bstatic'
-       else
--	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  cr_cv_gcc_flag_WALL=yes
++else
++  cr_cv_gcc_flag_WALL=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS=$SAVE_CFLAGS
  
--    mingw* | pw32* | os2*)
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-       ;;
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_RC
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_gcc_flag_WALL" >&5
++$as_echo "$cr_cv_gcc_flag_WALL" >&6; }
  
-     hpux9* | hpux10* | hpux11*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_wl='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-       *)
--	lt_prog_compiler_pic_GCJ='+Z'
-+	lt_prog_compiler_pic='+Z'
- 	;;
-       esac
-       # Is there a better lt_prog_compiler_static that works with the bundled CC?
--      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-+      lt_prog_compiler_static='${wl}-a ${wl}archive'
-       ;;
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
++  if eval test $cr_cv_gcc_flag_WALL = yes; then
++    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wall"
++  else
++    :
++  fi
  
-     irix5* | irix6* | nonstopux*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_wl='-Wl,'
-       # PIC (with -KPIC) is the default.
--      lt_prog_compiler_static_GCJ='-non_shared'
--      ;;
--
--    newsos6)
--      lt_prog_compiler_pic_GCJ='-KPIC'
--      lt_prog_compiler_static_GCJ='-Bstatic'
-+      lt_prog_compiler_static='-non_shared'
-       ;;
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
  
--    linux*)
--      case $CC in
--      icc* | ecc*)
--	lt_prog_compiler_wl_GCJ='-Wl,'
--	lt_prog_compiler_pic_GCJ='-KPIC'
--	lt_prog_compiler_static_GCJ='-static'
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
-+      ecc*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-KPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
-+      # icc used to be incompatible with GCC.
-+      # ICC 10 doesn't accept -KPIC any more.
-+      icc* | ifort*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
-+      # Lahey Fortran 8.1.
-+      lf95*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='--shared'
-+	lt_prog_compiler_static='--static'
-+	;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fpic'
-+	lt_prog_compiler_static='-Bstatic'
-         ;;
-       ccc*)
--        lt_prog_compiler_wl_GCJ='-Wl,'
-+        lt_prog_compiler_wl='-Wl,'
-         # All Alpha code is PIC.
--        lt_prog_compiler_static_GCJ='-non_shared'
-+        lt_prog_compiler_static='-non_shared'
-         ;;
-+      xl*)
-+	# IBM XL C 8.0/Fortran 10.1 on PPC
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-qpic'
-+	lt_prog_compiler_static='-qstaticlink'
-+	;;
-+      *)
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)
-+	  # Sun C 5.9
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl='-Wl,'
-+	  ;;
-+	*Sun\ F*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl=''
-+	  ;;
-+	esac
-+	;;
-       esac
-       ;;
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
  
-+    newsos6)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
-+
-     osf3* | osf4* | osf5*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_wl='-Wl,'
-       # All OSF/1 code is PIC.
--      lt_prog_compiler_static_GCJ='-non_shared'
-+      lt_prog_compiler_static='-non_shared'
-       ;;
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wno-unused-function" >&5
++$as_echo_n "checking whether gcc accepts -Wno-unused-function... " >&6; }
++if ${cr_cv_gcc_flag_WNO_UNUSED_FUNCTION+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
  
--    sco3.2v5*)
--      lt_prog_compiler_pic_GCJ='-Kpic'
--      lt_prog_compiler_static_GCJ='-dn'
-+    rdos*)
-+      lt_prog_compiler_static='-non_shared'
-       ;;
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++    SAVE_CFLAGS=$CFLAGS
++    CFLAGS="$CFLAGS -Wno-unused-function"
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
-     solaris*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
--      lt_prog_compiler_pic_GCJ='-KPIC'
--      lt_prog_compiler_static_GCJ='-Bstatic'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl='-Wl,';;
-+      esac
-       ;;
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
++int
++main ()
++{
  
-     sunos4*)
--      lt_prog_compiler_wl_GCJ='-Qoption ld '
--      lt_prog_compiler_pic_GCJ='-PIC'
--      lt_prog_compiler_static_GCJ='-Bstatic'
-+      lt_prog_compiler_wl='-Qoption ld '
-+      lt_prog_compiler_pic='-PIC'
-+      lt_prog_compiler_static='-Bstatic'
-       ;;
+-# A C compiler.
+-LTCC=$lt_LTCC
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=yes
++else
++  cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS=$SAVE_CFLAGS
  
--    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
--      lt_prog_compiler_pic_GCJ='-KPIC'
--      lt_prog_compiler_static_GCJ='-Bstatic'
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-       ;;
+-# LTCC compiler flags.
+-LTCFLAGS=$lt_LTCFLAGS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&5
++$as_echo "$cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&6; }
  
-     sysv4*MP*)
-       if test -d /usr/nec ;then
--	lt_prog_compiler_pic_GCJ='-Kconform_pic'
--	lt_prog_compiler_static_GCJ='-Bstatic'
-+	lt_prog_compiler_pic='-Kconform_pic'
-+	lt_prog_compiler_static='-Bstatic'
-       fi
-       ;;
+-# A language-specific compiler.
+-CC=$lt_compiler_RC
++  if eval test $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION = yes; then
++    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wno-unused-function"
++  else
++    :
++  fi
  
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    unicos*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+
-     uts4*)
--      lt_prog_compiler_pic_GCJ='-pic'
--      lt_prog_compiler_static_GCJ='-Bstatic'
-+      lt_prog_compiler_pic='-pic'
-+      lt_prog_compiler_static='-Bstatic'
-       ;;
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_RC
  
-     *)
--      lt_prog_compiler_can_build_shared_GCJ=no
-+      lt_prog_compiler_can_build_shared=no
-       ;;
-     esac
-   fi
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
  
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-+    ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-+$as_echo "$lt_prog_compiler_pic" >&6; }
-+
-+
-+
-+
-+
+-# An ERE matcher.
+-EGREP=$lt_EGREP
++fi # cr_build_libcr
  
- #
- # Check to make sure the PIC flag actually works.
- #
--if test -n "$lt_prog_compiler_pic_GCJ"; then
--
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
--if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_prog_compiler_pic_works_GCJ=no
--  ac_outfile=conftest.$ac_objext
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-+if test -n "$lt_prog_compiler_pic"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+-# The linker used to build libraries.
+-LD=$lt_LD_RC
++# Additional flags needed when linking utils, tests and examples
++CR_CLIENT_LDADD=""
++if test x"$enable_all_static" = xyes; then
++  CR_CLIENT_LDADD="$CR_CLIENT_LDADD -all-static"
++fi
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+ 
+-# A BSD-compatible nm program.
+-NM=$lt_NM
++# If building the tests, we can optionally test C++
++# Note, however, that  bug 2619 reports that we can't call this conditionally.
++  ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++if test -z "$CXX"; then
++  if test -n "$CCC"; then
++    CXX=$CCC
++  else
++    if test -n "$ac_tool_prefix"; then
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+  lt_cv_prog_compiler_pic_works=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-    # Insert the option either (1) after the last *FLAGS variable, or
-    # (2) before a word containing "conftest.", or (3) at the end.
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16725: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8962: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16729: \$? = $ac_status" >&5
-+   echo "$as_me:8966: \$? = $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
--     if test ! -s conftest.err; then
--       lt_prog_compiler_pic_works_GCJ=yes
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_pic_works=yes
-      fi
-    fi
--   $rm conftest*
-+   $RM conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
++  if test -n "$CXX"; then
++  ac_cv_prog_CXX="$CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
--if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
--    case $lt_prog_compiler_pic_GCJ in
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-+    case $lt_prog_compiler_pic in
-      "" | " "*) ;;
--     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-      esac
- else
--    lt_prog_compiler_pic_GCJ=
--     lt_prog_compiler_can_build_shared_GCJ=no
-+    lt_prog_compiler_pic=
-+     lt_prog_compiler_can_build_shared=no
- fi
+-# A symbol stripping program
+-STRIP=$lt_STRIP
++fi
++fi
++CXX=$ac_cv_prog_CXX
++if test -n "$CXX"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
++$as_echo "$CXX" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
- fi
--case "$host_os" in
--  # For platforms which do not support PIC, -DPIC is meaningless:
--  *djgpp*)
--    lt_prog_compiler_pic_GCJ=
--    ;;
--  *)
--    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
--    ;;
--esac
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
  
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
++    test -n "$CXX" && break
++  done
++fi
++if test -z "$CXX"; then
++  ac_ct_CXX=$CXX
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+  lt_cv_prog_compiler_static_works=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_cv_prog_compiler_static_works=yes
-+       fi
-+     else
-+       lt_cv_prog_compiler_static_works=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-+
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-+    :
++  if test -n "$ac_ct_CXX"; then
++  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 +else
-+    lt_prog_compiler_static=
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_CXX="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
 +fi
-+
-+
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
++fi
++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
++if test -n "$ac_ct_CXX"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
++$as_echo "$ac_ct_CXX" >&6; }
 +else
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -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:9067: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:9071: \$? = $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
-+     # So say no if there are warnings
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
-+
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
 +fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-+
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  lt_cv_prog_compiler_c_o_GCJ=no
--   $rm -r conftest 2>/dev/null
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-    mkdir conftest
-    cd conftest
-    mkdir out
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-    lt_compiler_flag="-o out/conftest2.$ac_objext"
-    # Insert the option either (1) after the last *FLAGS variable, or
-@@ -16779,101 +9116,114 @@
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16785: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9122: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16789: \$? = $ac_status" >&5
-+   echo "$as_me:9126: \$? = $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
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
--       lt_cv_prog_compiler_c_o_GCJ=yes
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o=yes
-      fi
-    fi
--   chmod u+w .
--   $rm conftest*
-+   chmod u+w . 2>&5
-+   $RM conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
--   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
--   $rm out/* && rmdir out
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-    cd ..
--   rmdir conftest
--   $rm conftest*
-+   $RM -r conftest
-+   $RM conftest*
  
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-+
-+
+-# Used on cygwin: assembler.
+-AS="$AS"
  
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++  test -n "$ac_ct_CXX" && break
++done
  
- hard_links="nottested"
--if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-+$as_echo_n "checking if we can lock with hard links... " >&6; }
-   hard_links=yes
--  $rm conftest*
-+  $RM conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
- else
-   need_locks=no
- fi
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
++  if test "x$ac_ct_CXX" = x; then
++    CXX="g++"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    CXX=$ac_ct_CXX
++  fi
++fi
  
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+
-+
-+
-+
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_RC
++  fi
++fi
++# Provide some information about the compiler.
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    sed '10a\
++... rest of stderr output deleted ...
++         10q' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++  fi
++  rm -f conftest.er1 conftest.err
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++done
 +
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
++if ${ac_cv_cxx_compiler_gnu+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
-   runpath_var=
--  allow_undefined_flag_GCJ=
--  enable_shared_with_static_runtimes_GCJ=no
--  archive_cmds_GCJ=
--  archive_expsym_cmds_GCJ=
--  old_archive_From_new_cmds_GCJ=
--  old_archive_from_expsyms_cmds_GCJ=
--  export_dynamic_flag_spec_GCJ=
--  whole_archive_flag_spec_GCJ=
--  thread_safe_flag_spec_GCJ=
--  hardcode_libdir_flag_spec_GCJ=
--  hardcode_libdir_flag_spec_ld_GCJ=
--  hardcode_libdir_separator_GCJ=
--  hardcode_direct_GCJ=no
--  hardcode_minus_L_GCJ=no
--  hardcode_shlibpath_var_GCJ=unsupported
--  link_all_deplibs_GCJ=unknown
--  hardcode_automatic_GCJ=no
--  module_cmds_GCJ=
--  module_expsym_cmds_GCJ=
--  always_export_symbols_GCJ=no
--  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  allow_undefined_flag=
-+  always_export_symbols=no
-+  archive_cmds=
-+  archive_expsym_cmds=
-+  compiler_needs_object=no
-+  enable_shared_with_static_runtimes=no
-+  export_dynamic_flag_spec=
-+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  hardcode_automatic=no
-+  hardcode_direct=no
-+  hardcode_direct_absolute=no
-+  hardcode_libdir_flag_spec=
-+  hardcode_libdir_flag_spec_ld=
-+  hardcode_libdir_separator=
-+  hardcode_minus_L=no
-+  hardcode_shlibpath_var=unsupported
-+  inherit_rpath=no
-+  link_all_deplibs=unknown
-+  module_cmds=
-+  module_expsym_cmds=
-+  old_archive_from_new_cmds=
-+  old_archive_from_expsyms_cmds=
-+  thread_safe_flag_spec=
-+  whole_archive_flag_spec=
-   # include_expsyms should be a list of space-separated symbols to be *always*
-   # included in the symbol list
--  include_expsyms_GCJ=
-+  include_expsyms=
-   # exclude_expsyms can be an extended regexp of symbols to exclude
-   # it will be wrapped by ` (' and `)$', so one must not match beginning or
-   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-   # as well as any symbol that contains `d'.
--  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-   # platforms (ab)use it in PIC code, but their linkers get confused if
-   # the symbol is explicitly referenced.  Since portable code cannot
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-   extract_expsyms_cmds=
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
  
-   case $host_os in
--  cygwin* | mingw* | pw32*)
-+  cygwin* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -16881,23 +9231,52 @@
-       with_gnu_ld=no
-     fi
-     ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs=no
-+    ;;
-   esac
+-# Old archive suffix (normally "a").
+-libext="$libext"
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++  ac_compiler_gnu=yes
++else
++  ac_compiler_gnu=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
--  ld_shlibs_GCJ=yes
-+  ld_shlibs=yes
-   if test "$with_gnu_ld" = yes; then
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++  GXX=yes
++else
++  GXX=
++fi
++ac_test_CXXFLAGS=${CXXFLAGS+set}
++ac_save_CXXFLAGS=$CXXFLAGS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
++$as_echo_n "checking whether $CXX accepts -g... " >&6; }
++if ${ac_cv_prog_cxx_g+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
++   ac_cxx_werror_flag=yes
++   ac_cv_prog_cxx_g=no
++   CXXFLAGS="-g"
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      whole_archive_flag_spec=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
--    aix3* | aix4* | aix5*)
-+    aix[3-9]*)
-       # On AIX/PPC, the GNU linker is very broken
-       if test "$host_cpu" != ia64; then
--	ld_shlibs_GCJ=no
--	cat <<EOF 1>&2
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
+-# Executable file suffix (normally "").
+-exeext="$exeext"
++int
++main ()
++{
  
- *** Warning: the GNU linker, at least up to release 2.9.1, is reported
- *** to be unable to reliably create shared libraries on AIX.
-@@ -16905,74 +9284,160 @@
- *** really care for shared libraries, you may want to modify your PATH
- *** so that a non-GNU linker is found, and then restart.
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_RC
+-pic_mode=$pic_mode
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++  ac_cv_prog_cxx_g=yes
++else
++  CXXFLAGS=""
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
--EOF
-+_LT_EOF
-       fi
-       ;;
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
++int
++main ()
++{
  
-     amigaos*)
--      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_minus_L_GCJ=yes
--
--      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
--      # that the semantics of dynamic libraries on AmigaOS, at least up
--      # to version 4, is to share data among multiple programs linked
--      # with the same dynamic library.  Since this doesn't match the
--      # behavior of shared libraries on other platforms, we can't use
--      # them.
--      ld_shlibs_GCJ=no
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-       ;;
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
  
-     beos*)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	allow_undefined_flag_GCJ=unsupported
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	allow_undefined_flag=unsupported
- 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
- 	# support --undefined.  This deserves some investigation.  FIXME
--	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       else
--	ld_shlibs_GCJ=no
-+	ld_shlibs=no
-       fi
-       ;;
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
++else
++  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++	 CXXFLAGS="-g"
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
--    cygwin* | mingw* | pw32*)
--      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-       # as there is no search path for DLLs.
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      allow_undefined_flag_GCJ=unsupported
--      always_export_symbols_GCJ=no
--      enable_shared_with_static_runtimes_GCJ=yes
--      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=no
-+      enable_shared_with_static_runtimes=yes
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++int
++main ()
++{
  
--      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- 	# 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
-+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- 	  cp $export_symbols $output_objdir/$soname.def;
- 	else
- 	  echo EXPORTS > $output_objdir/$soname.def;
- 	  cat $export_symbols >> $output_objdir/$soname.def;
- 	fi~
--	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       else
- 	ld_shlibs=no
-       fi
-       ;;
+-# Do we need a version for libraries?
+-need_version=$need_version
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++  ac_cv_prog_cxx_g=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
++$as_echo "$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++  CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++  if test "$GXX" = yes; then
++    CXXFLAGS="-g -O2"
++  else
++    CXXFLAGS="-g"
++  fi
++else
++  if test "$GXX" = yes; then
++    CXXFLAGS="-O2"
++  else
++    CXXFLAGS=
++  fi
++fi
++ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+    interix[3-9]*)
-+      hardcode_direct=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+      # Instead, shared libraries are loaded at an image base (0x10000000 by
-+      # default) and relocated if they conflict, which is a slow very memory
-+      # consuming and fragmenting process.  To avoid this, we pick a random,
-+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      ;;
-+
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-+	esac
-+      fi
-+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
-+      then
-+	tmp_addflag=
-+	tmp_sharedflag='-shared'
-+	case $cc_basename,$host_cpu in
-+        pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	lf95*)				# Lahey Fortran 8.1
-+	  whole_archive_flag_spec=
-+	  tmp_sharedflag='--shared' ;;
-+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-+	  tmp_sharedflag='-qmkshrobj'
-+	  tmp_addflag= ;;
-+	esac
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)			# Sun C 5.9
-+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  compiler_needs_object=yes
-+	  tmp_sharedflag='-G' ;;
-+	*Sun\ F*)			# Sun Fortran 8.3
-+	  tmp_sharedflag='-G' ;;
-+	esac
-+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+        if test "x$supports_anon_versioning" = xyes; then
-+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+        fi
-+
-+	case $cc_basename in
-+	xlf*)
-+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-+	  hardcode_libdir_flag_spec=
-+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
-+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	  fi
-+	  ;;
-+	esac
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-       else
--	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       fi
-       ;;
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
++depcc="$CXX"  am_compiler_list=
  
--    solaris* | sysv5*)
--      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
--	ld_shlibs_GCJ=no
--	cat <<EOF 1>&2
-+    solaris*)
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
++if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++  # We make a subdir and do the tests there.  Otherwise we can end up
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
  
- *** Warning: The releases 2.8.* of the GNU linker cannot reliably
- *** create shared libraries on Solaris systems.  Therefore, libtool
-@@ -16981,86 +9446,87 @@
- *** your PATH or compiler configuration so that the native linker is
- *** used, and then restart.
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
++  am_cv_CXX_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++  fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
  
--EOF
--      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+_LT_EOF
-+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
--	ld_shlibs_GCJ=no
-+	ld_shlibs=no
-       fi
-       ;;
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_RC
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+	;;
-+	*)
-+	  # For security reasons, it is highly recommended that you always
-+	  # use absolute paths for naming shared libraries, and exclude the
-+	  # DT_RUNPATH tag from executables and libraries.  But doing so
-+	  # requires that you compile everything twice, which is a pain.
-+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  else
-+	    ld_shlibs=no
-+	  fi
-+	;;
-+      esac
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
++    case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
 +      ;;
-+
-     sunos4*)
--      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-       wlarc=
--      hardcode_direct_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-       ;;
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
++    none) break ;;
++    esac
++    if depmode=$depmode \
++       source=sub/conftest.c object=$am__obj \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_CXX_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
  
--  linux*)
--    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_cmds_GCJ="$tmp_archive_cmds"
--      supports_anon_versioning=no
--      case `$LD -v 2>/dev/null` in
--        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
--        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--        *\ 2.11.*) ;; # other 2.11 versions
--        *) supports_anon_versioning=yes ;;
--      esac
--      if test $supports_anon_versioning = yes; then
--        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
--cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--$echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--      else
--        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
--      fi
--    else
--      ld_shlibs_GCJ=no
--    fi
--    ;;
--
-     *)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
--	ld_shlibs_GCJ=no
-+	ld_shlibs=no
-       fi
-       ;;
-     esac
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_CXX_dependencies_compiler_type=none
++fi
  
--    if test "$ld_shlibs_GCJ" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_GCJ=
--      fi
-+    if test "$ld_shlibs" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec=
-+      export_dynamic_flag_spec=
-+      whole_archive_flag_spec=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-     case $host_os in
-     aix3*)
--      allow_undefined_flag_GCJ=unsupported
--      always_export_symbols_GCJ=yes
--      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=yes
-+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-       # Note: this linker hardcodes the directories in LIBPATH if there
-       # are no directories specified by -L.
--      hardcode_minus_L_GCJ=yes
--      if test "$GCC" = yes && test -z "$link_static_flag"; then
-+      hardcode_minus_L=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- 	# Neither direct hardcoding nor static linking is supported with a
- 	# broken collect2.
--	hardcode_direct_GCJ=unsupported
-+	hardcode_direct=unsupported
-       fi
-       ;;
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
--    aix4* | aix5*)
-+    aix[4-9]*)
-       if test "$host_cpu" = ia64; then
- 	# On IA64, the linker does run time linking by default, so we don't
- 	# have to do anything special.
-@@ -17070,23 +9536,24 @@
-       else
- 	# If we're using GNU nm, then we don't want the "-C" option.
- 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
--	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
--	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- 	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'
-+	  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
- 	aix_use_runtimelinking=no
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
++ if
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
++  am__fastdepCXX_TRUE=
++  am__fastdepCXX_FALSE='#'
++else
++  am__fastdepCXX_TRUE='#'
++  am__fastdepCXX_FALSE=
++fi
  
- 	# Test if we are trying to use run time linking or normal
- 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- 	# need to do runtime linking.
--	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- 	  for ld_flag in $LDFLAGS; do
--  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
--  	    aix_use_runtimelinking=yes
--  	    break
--  	  fi
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  fi
- 	  done
-+	  ;;
- 	esac
+-# Library versioning type.
+-version_type=$version_type
  
- 	exp_sym_flag='-bexport'
-@@ -17099,61 +9566,66 @@
-       # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-       # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
  
--      archive_cmds_GCJ=''
--      hardcode_direct_GCJ=yes
--      hardcode_libdir_separator_GCJ=':'
--      link_all_deplibs_GCJ=yes
-+      archive_cmds=''
-+      hardcode_direct=yes
-+      hardcode_direct_absolute=yes
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      file_list_spec='${wl}-f,'
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
  
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
--	  if test -f "$collect2name" && \
--  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	  if test -f "$collect2name" &&
-+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
- 	  then
--  	  # We have reworked collect2
--  	  hardcode_direct_GCJ=yes
-+	  # We have reworked collect2
-+	  :
- 	  else
--  	  # We have old collect2
--  	  hardcode_direct_GCJ=unsupported
--  	  # It fails to find uninstalled libraries when the uninstalled
--  	  # path is not listed in the libpath.  Setting hardcode_minus_L
--  	  # to unsupported forces relinking
--  	  hardcode_minus_L_GCJ=yes
--  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
--  	  hardcode_libdir_separator_GCJ=
-+	  # We have old collect2
-+	  hardcode_direct=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
- 	  fi
-+	  ;;
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-+	link_all_deplibs=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
--  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
--  	# chokes on -Wl,-G. The following line is correct:
-+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	# chokes on -Wl,-G. The following line is correct:
- 	  shared_flag='-G'
- 	else
--  	if test "$aix_use_runtimelinking" = yes; then
-+	  if test "$aix_use_runtimelinking" = yes; then
- 	    shared_flag='${wl}-G'
- 	  else
- 	    shared_flag='${wl}-bM:SRE'
--  	fi
-+	  fi
- 	fi
-       fi
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
  
-+      export_dynamic_flag_spec='${wl}-bexpall'
-       # It seems that -bexpall does not export symbols beginning with
-       # underscore (_), so it is better to generate a list of symbols to export.
--      always_export_symbols_GCJ=yes
-+      always_export_symbols=yes
-       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.
--	allow_undefined_flag_GCJ='-berok'
--       # Determine the default libpath from the value encoded in an empty executable.
--       cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	allow_undefined_flag='-berok'
-+        # Determine the default libpath from the value encoded in an
-+        # empty executable.
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_RC
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
++func_stripname_cnf ()
++{
++  case ${2} in
++  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
++  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++  esac
++} # func_stripname_cnf
  
- int
-@@ -17164,57 +9636,36 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
-+if ac_fn_c_try_link "$LINENO"; then :
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
++ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++if test -z "$CXX"; then
++  if test -n "$CCC"; then
++    CXX=$CCC
++  else
++    if test -n "$ac_tool_prefix"; then
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CXX+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$CXX"; then
++  ac_cv_prog_CXX="$CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
++fi
++fi
++CXX=$ac_cv_prog_CXX
++if test -n "$CXX"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
++$as_echo "$CXX" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
 +fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
--       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
--	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--       else
-+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+      else
- 	if test "$host_cpu" = ia64; then
--	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
--	  allow_undefined_flag_GCJ="-z nodefs"
--	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	  allow_undefined_flag="-z nodefs"
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- 	else
--	 # Determine the default libpath from the value encoded in an empty executable.
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 # Determine the default libpath from the value encoded in an
-+	 # empty executable.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
  
- int
-@@ -17225,150 +9676,114 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
-+if ac_fn_c_try_link "$LINENO"; then :
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_RC
+-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
  
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_RC
+-module_expsym_cmds=$lt_module_expsym_cmds_RC
++    test -n "$CXX" && break
++  done
 +fi
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++if test -z "$CXX"; then
++  ac_ct_CXX=$CXX
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_CXX+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_CXX"; then
++  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_CXX="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
--	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- 	  # Warning - without using the other run time loading flags,
- 	  # -berok will link without error, but may produce a broken library.
--	  no_undefined_flag_GCJ=' ${wl}-bernotok'
--	  allow_undefined_flag_GCJ=' ${wl}-berok'
--	  # -bexpall does not export symbols beginning with underscore (_)
--	  always_export_symbols_GCJ=yes
-+	  no_undefined_flag=' ${wl}-bernotok'
-+	  allow_undefined_flag=' ${wl}-berok'
- 	  # Exported symbols can be pulled into shared objects from archives
--	  whole_archive_flag_spec_GCJ=' '
--	  archive_cmds_need_lc_GCJ=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
--	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	  whole_archive_flag_spec='$convenience'
-+	  archive_cmds_need_lc=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-       ;;
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++fi
++fi
++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
++if test -n "$ac_ct_CXX"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
++$as_echo "$ac_ct_CXX" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
-     amigaos*)
--      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_minus_L_GCJ=yes
--      # see comment about different semantics on the GNU ld section
--      ld_shlibs_GCJ=no
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-       ;;
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_RC
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_RC
  
--    bsdi4*)
--      export_dynamic_flag_spec_GCJ=-rdynamic
-+    bsdi[45]*)
-+      export_dynamic_flag_spec=-rdynamic
-       ;;
- 
--    cygwin* | mingw* | pw32*)
-+    cygwin* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
--      hardcode_libdir_flag_spec_GCJ=' '
--      allow_undefined_flag_GCJ=unsupported
-+      hardcode_libdir_flag_spec=' '
-+      allow_undefined_flag=unsupported
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
--      shrext=".dll"
-+      shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
--      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-       # The linker will automatically build a .lib file if we build a DLL.
--      old_archive_From_new_cmds_GCJ='true'
-+      old_archive_from_new_cmds='true'
-       # FIXME: Should let the user specify the lib program.
--      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-       fix_srcfile_path='`cygpath -w "$srcfile"`'
--      enable_shared_with_static_runtimes_GCJ=yes
-+      enable_shared_with_static_runtimes=yes
-       ;;
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++  test -n "$ac_ct_CXX" && break
++done
  
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
--      archive_cmds_need_lc_GCJ=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_GCJ='-undefined suppress'
--	;;
--      *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--      else
--        case ${MACOSX_DEPLOYMENT_TARGET} in
--          10.[012])
--            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--            ;;
--          10.*)
--            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
--            ;;
--        esac
--      fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      hardcode_direct_GCJ=no
--      hardcode_automatic_GCJ=yes
--      hardcode_shlibpath_var_GCJ=unsupported
--      whole_archive_flag_spec_GCJ='-all_load $convenience'
--      link_all_deplibs_GCJ=yes
--    else
--      ld_shlibs_GCJ=no
--    fi
-+
-+
-+  archive_cmds_need_lc=no
-+  hardcode_direct=no
-+  hardcode_automatic=yes
-+  hardcode_shlibpath_var=unsupported
-+  whole_archive_flag_spec=''
-+  link_all_deplibs=yes
-+  allow_undefined_flag="$_lt_dar_allow_undefined"
-+  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
-+     *) _lt_dar_can_shared=$GCC ;;
-+  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
-+    output_verbose_link_cmd=echo
-+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++  if test "x$ac_ct_CXX" = x; then
++    CXX="g++"
 +  else
-+  ld_shlibs=no
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    CXX=$ac_ct_CXX
 +  fi
-+
-       ;;
++fi
  
-     dgux*)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_shlibpath_var_GCJ=no
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-       ;;
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++  fi
++fi
++# Provide some information about the compiler.
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    sed '10a\
++... rest of stderr output deleted ...
++         10q' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++  fi
++  rm -f conftest.er1 conftest.err
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
++if ${ac_cv_cxx_compiler_gnu+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
-     freebsd1*)
--      ld_shlibs_GCJ=no
-+      ld_shlibs=no
-       ;;
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_RC
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
  
-     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-@@ -17376,91 +9791,106 @@
-     # does not break anything, and helps significantly (at the cost of a little
-     # extra space).
-     freebsd2.2*)
--      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--      hardcode_libdir_flag_spec_GCJ='-R$libdir'
--      hardcode_direct_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-       ;;
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_RC
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++  ac_compiler_gnu=yes
++else
++  ac_compiler_gnu=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
-     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-     freebsd2*)
--      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_GCJ=yes
--      hardcode_minus_L_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-       ;;
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++  GXX=yes
++else
++  GXX=
++fi
++ac_test_CXXFLAGS=${CXXFLAGS+set}
++ac_save_CXXFLAGS=$CXXFLAGS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
++$as_echo_n "checking whether $CXX accepts -g... " >&6; }
++if ${ac_cv_prog_cxx_g+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
++   ac_cxx_werror_flag=yes
++   ac_cv_prog_cxx_g=no
++   CXXFLAGS="-g"
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
--      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--      hardcode_libdir_flag_spec_GCJ='-R$libdir'
--      hardcode_direct_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
-+    freebsd* | dragonfly*)
-+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-       ;;
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
++int
++main ()
++{
  
-     hpux9*)
-       if test "$GCC" = yes; then
--	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       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'
-+	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
--      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
--      hardcode_libdir_separator_GCJ=:
--      hardcode_direct_GCJ=yes
-+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_direct=yes
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++  ac_cv_prog_cxx_g=yes
++else
++  CXXFLAGS=""
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
-       # hardcode_minus_L: Not really in the search PATH,
-       # but as the default location of the library.
--      hardcode_minus_L_GCJ=yes
--      export_dynamic_flag_spec_GCJ='${wl}-E'
-+      hardcode_minus_L=yes
-+      export_dynamic_flag_spec='${wl}-E'
-       ;;
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++int
++main ()
++{
  
--    hpux10* | hpux11*)
-+    hpux10*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_flag_spec_ld='+b $libdir'
-+	hardcode_libdir_separator=:
-+	hardcode_direct=yes
-+	hardcode_direct_absolute=yes
-+	export_dynamic_flag_spec='${wl}-E'
-+	# hardcode_minus_L: Not really in the search PATH,
-+	# but as the default location of the library.
-+	hardcode_minus_L=yes
-+      fi
-+      ;;
-+
-+    hpux11*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*)
--	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
--	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
--	  hardcode_libdir_separator_GCJ=:
--	  hardcode_direct_GCJ=no
--	  hardcode_shlibpath_var_GCJ=no
--	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
--	  hardcode_direct_GCJ=no
--	  hardcode_shlibpath_var_GCJ=no
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_separator=:
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
  
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  hardcode_minus_L_GCJ=yes
-+	case $host_cpu in
-+	hppa*64*|ia64*)
-+	  hardcode_direct=no
-+	  hardcode_shlibpath_var=no
- 	  ;;
- 	*)
--	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
--	  hardcode_libdir_separator_GCJ=:
--	  hardcode_direct_GCJ=yes
--	  export_dynamic_flag_spec_GCJ='${wl}-E'
-+	  hardcode_direct=yes
-+	  hardcode_direct_absolute=yes
-+	  export_dynamic_flag_spec='${wl}-E'
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++else
++  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++	 CXXFLAGS="-g"
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
- 	  # hardcode_minus_L: Not really in the search PATH,
- 	  # but as the default location of the library.
--	  hardcode_minus_L_GCJ=yes
-+	  hardcode_minus_L=yes
- 	  ;;
- 	esac
-       fi
-@@ -17468,237 +9898,307 @@
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++int
++main ()
++{
  
-     irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
--	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	# Try to use the -exported_symbol ld option, if it does not
-+	# work, assume that -exports_file does not work either and
-+	# implicitly export all symbols.
-+        save_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int foo(void) {}
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++  ;
++  return 0;
++}
 +_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+
++if ac_fn_cxx_try_compile "$LINENO"; then :
++  ac_cv_prog_cxx_g=yes
 +fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+        LDFLAGS="$save_LDFLAGS"
-       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'
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-       fi
--      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_GCJ=:
--      link_all_deplibs_GCJ=yes
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      inherit_rpath=yes
-+      link_all_deplibs=yes
-       ;;
- 
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
--	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-       fi
--      hardcode_libdir_flag_spec_GCJ='-R$libdir'
--      hardcode_direct_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-       ;;
- 
-     newsos6)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_GCJ=yes
--      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_GCJ=:
--      hardcode_shlibpath_var_GCJ=no
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *nto* | *qnx*)
-       ;;
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
++$as_echo "$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++  CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++  if test "$GXX" = yes; then
++    CXXFLAGS="-g -O2"
++  else
++    CXXFLAGS="-g"
++  fi
++else
++  if test "$GXX" = yes; then
++    CXXFLAGS="-O2"
++  else
++    CXXFLAGS=
++  fi
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
-     openbsd*)
--      hardcode_direct_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
--      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
--	export_dynamic_flag_spec_GCJ='${wl}-E'
-+      if test -f /usr/libexec/ld.so; then
-+	hardcode_direct=yes
-+	hardcode_shlibpath_var=no
-+	hardcode_direct_absolute=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	  export_dynamic_flag_spec='${wl}-E'
-+	else
-+	  case $host_os in
-+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     hardcode_libdir_flag_spec='-R$libdir'
-+	     ;;
-+	   *)
-+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
-+	fi
-       else
--       case $host_os in
--	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
--	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
--	   ;;
--	 *)
--	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
--	   ;;
--       esac
-+	ld_shlibs=no
-       fi
-       ;;
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_RC
++depcc="$CXX"  am_compiler_list=
  
-     os2*)
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_minus_L_GCJ=yes
--      allow_undefined_flag_GCJ=unsupported
--      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
--      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      allow_undefined_flag=unsupported
-+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
++if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++  # We make a subdir and do the tests there.  Otherwise we can end up
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
  
-     osf3*)
-       if test "$GCC" = yes; then
--	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       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'
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-       fi
--      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_GCJ=:
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-       ;;
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
++  am_cv_CXX_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++  fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
  
-     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
--	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-       else
--	allow_undefined_flag_GCJ=' -expect_unresolved \*'
--	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
--	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-+	hardcode_libdir_flag_spec='-rpath $libdir'
-       fi
--      hardcode_libdir_separator_GCJ=:
--      ;;
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
 -
--    sco3.2v5*)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var_GCJ=no
--      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
--      runpath_var=LD_RUN_PATH
--      hardcode_runpath_var=yes
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_separator=:
-       ;;
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+-
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct_RC
+-
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L_RC
+-
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+-
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$hardcode_automatic_RC
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
-     solaris*)
--      no_undefined_flag_GCJ=' -z text'
-+      no_undefined_flag=' -z defs'
-       if test "$GCC" = yes; then
--	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
--      else
--	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'
-+	wlarc='${wl}'
-+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
++    case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
 +      else
-+	case `$CC -V 2>&1` in
-+	*"Compilers 5.0"*)
-+	  wlarc=''
-+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-+	  ;;
-+	*)
-+	  wlarc='${wl}'
-+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  ;;
-+	esac
-       fi
--      hardcode_libdir_flag_spec_GCJ='-R$libdir'
--      hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_shlibpath_var=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+	# The compiler driver will combine and reorder linker options,
-+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-+	# but is careful enough not to reorder.
-+	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+	if test "$GCC" = yes; then
-+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	else
-+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-+	fi
-+	;;
-       esac
--      link_all_deplibs_GCJ=yes
-+      link_all_deplibs=yes
-       ;;
- 
-     sunos4*)
-       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.
--	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-       else
--	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-       fi
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_direct_GCJ=yes
--      hardcode_minus_L_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-       ;;
++	break
++      fi
++      ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
++    none) break ;;
++    esac
++    if depmode=$depmode \
++       source=sub/conftest.c object=$am__obj \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_CXX_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
  
-     sysv4)
-       case $host_vendor in
- 	sni)
--	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct_GCJ=yes # is this really true???
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=yes # is this really true???
- 	;;
- 	siemens)
- 	  ## LD is ld it makes a PLAMLIB
- 	  ## CC just makes a GrossModule.
--	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
--	  hardcode_direct_GCJ=no
-+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  reload_cmds='$CC -r -o $output$reload_objs'
-+	  hardcode_direct=no
-         ;;
- 	motorola)
--	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
- 	;;
-       esac
-       runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var_GCJ=no
-+      hardcode_shlibpath_var=no
-       ;;
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs_RC
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_CXX_dependencies_compiler_type=none
++fi
  
-     sysv4.3*)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var_GCJ=no
--      export_dynamic_flag_spec_GCJ='-Bexport'
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      export_dynamic_flag_spec='-Bexport'
-       ;;
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
-     sysv4*MP*)
-       if test -d /usr/nec; then
--	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	hardcode_shlibpath_var_GCJ=no
-+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_shlibpath_var=no
- 	runpath_var=LD_RUN_PATH
- 	hardcode_runpath_var=yes
--	ld_shlibs_GCJ=yes
-+	ld_shlibs=yes
-       fi
-       ;;
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++ if
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
++  am__fastdepCXX_TRUE=
++  am__fastdepCXX_FALSE='#'
++else
++  am__fastdepCXX_TRUE='#'
++  am__fastdepCXX_FALSE=
++fi
  
--    sysv4.2uw2*)
--      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_GCJ=yes
--      hardcode_minus_L_GCJ=no
--      hardcode_shlibpath_var_GCJ=no
--      hardcode_runpath_var=yes
--      runpath_var=LD_RUN_PATH
--      ;;
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag='${wl}-z,text'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-+      runpath_var='LD_RUN_PATH'
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_RC"
++      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
++$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
++if test -z "$CXXCPP"; then
++  if ${ac_cv_prog_CXXCPP+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++      # Double quotes because CXXCPP needs to be expanded
++    for CXXCPP in "$CXX -E" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
  
--   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
--      no_undefined_flag_GCJ='${wl}-z ${wl}text'
-       if test "$GCC" = yes; then
--	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       else
--	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       fi
--      runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var_GCJ=no
-       ;;
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols_RC
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
  
--    sysv5*)
--      no_undefined_flag_GCJ=' -z text'
--      # $CC -shared without GNU ld will not create a library from C++
--      # object files and a static libstdc++, better avoid it by now
--      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'
--      hardcode_libdir_flag_spec_GCJ=
--      hardcode_shlibpath_var_GCJ=no
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      no_undefined_flag='${wl}-z,text'
-+      allow_undefined_flag='${wl}-z,nodefs'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      export_dynamic_flag_spec='${wl}-Bexport'
-       runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-       ;;
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_RC
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
  
-     uts4*)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_shlibpath_var_GCJ=no
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-       ;;
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++  break
++fi
  
-     *)
--      ld_shlibs_GCJ=no
-+      ld_shlibs=no
-       ;;
-     esac
-+
-+    if test x$host_vendor = xsni; then
-+      case $host in
-+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	export_dynamic_flag_spec='${wl}-Blargedynsym'
-+	;;
-+      esac
-+    fi
-   fi
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_RC
++    done
++    ac_cv_prog_CXXCPP=$CXXCPP
  
--echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
--echo "${ECHO_T}$ld_shlibs_GCJ" >&6
--test "$ld_shlibs_GCJ" = no && can_build_shared=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-+$as_echo "$ld_shlibs" >&6; }
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+with_gnu_ld=$with_gnu_ld
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_RC
++fi
++  CXXCPP=$ac_cv_prog_CXXCPP
++else
++  ac_cv_prog_CXXCPP=$CXXCPP
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
++$as_echo "$CXXCPP" >&6; }
++ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
  
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
--  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
+-# ### END LIBTOOL TAG CONFIG: $tagname
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
  
- #
- # Do we need to explicitly link libc?
- #
--case "x$archive_cmds_need_lc_GCJ" in
-+case "x$archive_cmds_need_lc" in
- x|xyes)
-   # Assume -lc should be added
--  archive_cmds_need_lc_GCJ=yes
-+  archive_cmds_need_lc=yes
+-__EOF__
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
  
-   if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $archive_cmds_GCJ in
-+    case $archive_cmds in
-     *'~'*)
-       # FIXME: we may have to deal with multi-command sequences.
-       ;;
-@@ -17706,57 +10206,266 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
--      $rm conftest*
--      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+      $RM conftest*
-+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
  
--      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } 2>conftest.err; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-         libobjs=conftest.$ac_objext
-         deplibs=
--        wl=$lt_prog_compiler_wl_GCJ
-+        wl=$lt_prog_compiler_wl
-+	pic_flag=$lt_prog_compiler_pic
-         compiler_flags=-v
-         linker_flags=-v
-         verstring=
-         output_objdir=.
-         libname=conftest
--        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
--        allow_undefined_flag_GCJ=
--        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
--  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+        lt_save_allow_undefined_flag=$allow_undefined_flag
-+        allow_undefined_flag=
-+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-         then
--	  archive_cmds_need_lc_GCJ=no
-+	  archive_cmds_need_lc=no
-         else
--	  archive_cmds_need_lc_GCJ=yes
-+	  archive_cmds_need_lc=yes
-         fi
--        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-+        allow_undefined_flag=$lt_save_allow_undefined_flag
-       else
-         cat conftest.err 1>&5
-       fi
--      $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-+      $RM conftest*
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-+$as_echo "$archive_cmds_need_lc" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
+ else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+-  if test -f "$ltmain_in"; then
+-    test -f Makefile && make "$ltmain"
+-  fi
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++CXX=no; }
+ fi
  
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+
-+if test "$GCC" = yes; then
-+  case $host_os in
-+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+    *) lt_awk_arg="/^libraries:/" ;;
-+  esac
-+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
-+  # Ok, now we have the path, separated by spaces, we can step through it
-+  # and add multilib dir if necessary.
-+  lt_tmp_lt_search_path_spec=
-+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+  for lt_sys_path in $lt_search_path_spec; do
-+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+    else
-+      test -d "$lt_sys_path" && \
-+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+    fi
-+  done
-+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+  lt_foo="";
-+  lt_count=0;
-+  for (lt_i = NF; lt_i > 0; lt_i--) {
-+    if ($lt_i != "" && $lt_i != ".") {
-+      if ($lt_i == "..") {
-+        lt_count++;
-+      } else {
-+        if (lt_count == 0) {
-+          lt_foo="/" $lt_i lt_foo;
-+        } else {
-+          lt_count--;
-+        }
-+      }
-+    }
-+  }
-+  if (lt_foo != "") { lt_freq[lt_foo]++; }
-+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-+}'`
-+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -17766,20 +10475,6 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
--  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
--    # if the path contains ";" then we assume it to be the separator
--    # otherwise default to the standard path separator (i.e. ":") - it is
--    # assumed that no part of a normal pathname contains ";" but that should
--    # okay in the real world where ";" in dirpaths is itself problematic.
--    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-
+ 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
+ 
+-CC="$lt_save_CC"
+-
+-	;;
+-
+-      *)
+-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+-   { (exit 1); exit 1; }; }
+-	;;
+-      esac
+-
+-      # Append the new tag name to the list of available tags.
+-      if test -n "$tagname" ; then
+-      available_tags="$available_tags $tagname"
+-    fi
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-
+-  # Now substitute the updated list of available tags.
+-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+-    mv "${ofile}T" "$ofile"
+-    chmod +x "$ofile"
 -  else
--    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-    rm -f "${ofile}T"
+-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+-   { (exit 1); exit 1; }; }
 -  fi
--else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 -fi
- need_lib_prefix=unknown
- hardcode_into_libs=no
+-
+-
+-
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+-
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-
+-# Prevent multiple expansion
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-if test x"$enable_static$enable_all_static" = xnoyes; then
+-  { { echo "$as_me:$LINENO: error: You cannot pass --enable-all-static without one of --enable-static or --disable-shared" >&5
+-echo "$as_me: error: You cannot pass --enable-all-static without one of --enable-static or --disable-shared" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-
+-if test $enable_static = yes; then
+-  CR_ENABLE_STATIC_TRUE=
+-  CR_ENABLE_STATIC_FALSE='#'
+ else
+-  CR_ENABLE_STATIC_TRUE='#'
+-  CR_ENABLE_STATIC_FALSE=
++  _lt_caught_CXX_error=yes
+ fi
  
-@@ -17797,7 +10492,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
++ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
--aix4* | aix5*)
-+aix[4-9]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -17816,7 +10511,7 @@
-       aix4 | aix4.[01] | aix4.[01].*)
-       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- 	   echo ' yes '
--	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
- 	:
-       else
- 	can_build_shared=no
-@@ -17842,9 +10537,18 @@
-   ;;
++archive_cmds_need_lc_CXX=no
++allow_undefined_flag_CXX=
++always_export_symbols_CXX=no
++archive_expsym_cmds_CXX=
++compiler_needs_object_CXX=no
++export_dynamic_flag_spec_CXX=
++hardcode_direct_CXX=no
++hardcode_direct_absolute_CXX=no
++hardcode_libdir_flag_spec_CXX=
++hardcode_libdir_flag_spec_ld_CXX=
++hardcode_libdir_separator_CXX=
++hardcode_minus_L_CXX=no
++hardcode_shlibpath_var_CXX=unsupported
++hardcode_automatic_CXX=no
++inherit_rpath_CXX=no
++module_cmds_CXX=
++module_expsym_cmds_CXX=
++link_all_deplibs_CXX=unknown
++old_archive_cmds_CXX=$old_archive_cmds
++reload_flag_CXX=$reload_flag
++reload_cmds_CXX=$reload_cmds
++no_undefined_flag_CXX=
++whole_archive_flag_spec_CXX=
++enable_shared_with_static_runtimes_CXX=no
  
- amigaos*)
--  library_names_spec='$libname.ixlibrary $libname.a'
--  # Create ${libname}_ixlibrary.a entries in /sys/libs.
--  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+  case $host_cpu in
-+  powerpc)
-+    # Since July 2007 AmigaOS4 officially supports .so libraries.
-+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    ;;
-+  m68k)
-+    library_names_spec='$libname.ixlibrary $libname.a'
-+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    ;;
-+  esac
-   ;;
+-if test $enable_shared = yes; then
+-  CR_ENABLE_SHARED_TRUE=
+-  CR_ENABLE_SHARED_FALSE='#'
+-else
+-  CR_ENABLE_SHARED_TRUE='#'
+-  CR_ENABLE_SHARED_FALSE=
+-fi
+-
++# Source file extension for C++ test sources.
++ac_ext=cpp
  
- beos*)
-@@ -17853,7 +10557,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
+-# Check for rpmbuild
++# Object file extension for compiled C++ test sources.
++objext=o
++objext_CXX=$objext
  
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17867,24 +10571,28 @@
-   # libtool to hard-code these into programs
-   ;;
+-  for ac_prog in rpmbuild rpmb rpm
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_RPMBUILD+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $RPMBUILD in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_RPMBUILD="$RPMBUILD" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$PATH:/usr/lib/rpm"
+-for as_dir in $as_dummy
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++# No sense in running all these tests if we already determined that
++# the CXX compiler isn't working.  Some variables (like enable_shared)
++# are currently assumed to apply to all compilers on this platform,
++# and will be corrupted by setting them based on a non-working compiler.
++if test "$_lt_caught_CXX_error" != yes; then
++  # Code to be used in simple compile tests
++  lt_simple_compile_test_code="int some_variable = 0;"
  
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
-   version_type=windows
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
+-  ;;
+-esac
+-fi
+-RPMBUILD=$ac_cv_path_RPMBUILD
++  # Code to be used in simple link tests
++  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
  
-   case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32*)
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
--      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname~
-+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+      fi'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
--       $rm \$dlpath'
-+       $RM \$dlpath'
-     shlibpath_overrides_runpath=yes
+-if test -n "$RPMBUILD"; then
+-  echo "$as_me:$LINENO: result: $RPMBUILD" >&5
+-echo "${ECHO_T}$RPMBUILD" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-     case $host_os in
-@@ -17893,25 +10601,25 @@
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
--    mingw*)
-+    mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-         # It is most probably a Windows format PATH printed by
-         # mingw gcc, but we are running on Cygwin. Gcc prints its search
-         # path with ; separators, and with drive letters. We can handle the
-         # drive letters (cygwin fileutils understands them), so leave them,
-         # especially as we might pass files found there to a mingw objdump,
-         # which wouldn't understand a cygwinified path. Ahh.
--        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-       else
--        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-       fi
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -17930,17 +10638,13 @@
-   version_type=darwin
-   need_lib_prefix=no
-   need_version=no
--  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
--  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if test "$GCC" = yes; then
--    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  test -n "$RPMBUILD" && break
+-done
+-test -n "$RPMBUILD" || RPMBUILD="none"
+ 
+-  if $RPMBUILD -bs 2>&1 | grep 'no spec' >/dev/null 2>/dev/null; then
+-    :
 -  else
--    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-    RPMBUILD=none
 -  fi
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+
-+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-   ;;
  
-@@ -17957,20 +10661,17 @@
-   dynamic_linker=no
-   ;;
  
--kfreebsd*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
--  ;;
--
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -17988,14 +10689,19 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
--  *) # from 3.2 on
-+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
-+  *) # from 4.6 on, and DragonFly
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-   esac
-   ;;
  
-@@ -18015,9 +10721,9 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
--    shrext='.so'
-+    shrext_cmds='.so'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.so"
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -18031,19 +10737,19 @@
-     fi
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
--   hppa*64*)
--     shrext='.sl'
--     hardcode_into_libs=yes
--     dynamic_linker="$host_os dld.sl"
--     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
--     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--     soname_spec='${libname}${release}${shared_ext}$major'
--     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
--     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
--     ;;
--   *)
--    shrext='.sl'
-+  hppa*64*)
-+    shrext_cmds='.sl'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  *)
-+    shrext_cmds='.sl'
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=SHLIB_PATH
-     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -18055,6 +10761,18 @@
-   postinstall_cmds='chmod 555 $lib'
-   ;;
+-if test $RPMBUILD != none; then
+-  HAVE_RPMBUILD_TRUE=
+-  HAVE_RPMBUILD_FALSE='#'
+-else
+-  HAVE_RPMBUILD_TRUE='#'
+-  HAVE_RPMBUILD_FALSE=
+-fi
  
-+interix[3-9]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- irix5* | irix6* | nonstopux*)
-   case $host_os in
-     nonstopux*) version_type=nonstopux ;;
-@@ -18098,7 +10816,7 @@
-   ;;
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
  
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -18107,6 +10825,32 @@
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-+  # Some binutils ld are patched to set DT_RUNPATH
-+  save_LDFLAGS=$LDFLAGS
-+  save_libdir=$libdir
-+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-+  shlibpath_overrides_runpath=yes
-+fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  LDFLAGS=$save_LDFLAGS
-+  libdir=$save_libdir
-+
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-@@ -18114,8 +10858,8 @@
+-# Check for a GNU C compiler (or a work alike?)
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
  
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
+-  ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++# Allow CC to be a program name with arguments.
++compiler=$CC
  
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18127,7 +10871,7 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
  
--knetbsd*-gnu)
-+netbsdelf*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -18136,14 +10880,14 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
-+  dynamic_linker='NetBSD ld.elf_so'
-   ;;
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++  # save warnings/boilerplate of simple test code
++  ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$RM conftest*
  
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-@@ -18164,24 +10908,31 @@
-   shlibpath_overrides_runpath=yes
-   ;;
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++  ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$RM -r conftest*
  
--nto-qnx*)
--  version_type=linux
-+*nto* | *qnx*)
-+  version_type=qnx
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='ldqnx.so'
-   ;;
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
  
- openbsd*)
-   version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-   need_lib_prefix=no
--  need_version=yes
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
++  # Allow CC to be a program name with arguments.
++  lt_save_CC=$CC
++  lt_save_CFLAGS=$CFLAGS
++  lt_save_LD=$LD
++  lt_save_GCC=$GCC
++  GCC=$GXX
++  lt_save_with_gnu_ld=$with_gnu_ld
++  lt_save_path_LD=$lt_cv_path_LD
++  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++  else
++    $as_unset lt_cv_prog_gnu_ld
++  fi
++  if test -n "${lt_cv_path_LDCXX+set}"; then
++    lt_cv_path_LD=$lt_cv_path_LDCXX
++  else
++    $as_unset lt_cv_path_LD
++  fi
++  test -z "${LDCXX+set}" || LD=$LDCXX
++  CC=${CXX-"c++"}
++  CFLAGS=$CXXFLAGS
++  compiler=$CC
++  compiler_CXX=$CC
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
 +  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-     case $host_os in
-       openbsd2.[89] | openbsd2.[89].*)
- 	shlibpath_overrides_runpath=no
-@@ -18197,7 +10948,7 @@
+ done
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
  
- os2*)
-   libname_spec='$name'
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -18215,11 +10966,8 @@
-   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-   ;;
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
  
--sco3.2v5*)
--  version_type=osf
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
-+rdos*)
-+  dynamic_linker=no
-   ;;
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++  if test -n "$compiler"; then
++    # We don't want -fno-exception when compiling C++ code, so set the
++    # no_builtin_flag separately
++    if test "$GXX" = yes; then
++      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
++    else
++      lt_prog_compiler_no_builtin_flag_CXX=
++    fi
  
- solaris*)
-@@ -18247,7 +10995,7 @@
-   need_version=yes
-   ;;
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++    if test "$GXX" = yes; then
++      # Set up default GNU C++ configuration
  
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-@@ -18256,7 +11004,6 @@
-     sni)
-       shlibpath_overrides_runpath=no
-       need_lib_prefix=no
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
-       runpath_var=LD_RUN_PATH
-       ;;
-     siemens)
-@@ -18271,59 +11018,191 @@
-   esac
-   ;;
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
  
--sysv4*MP*)
--  if test -d /usr/nec ;then
--    version_type=linux
--    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
--    soname_spec='$libname${shared_ext}.$major'
--    shlibpath_var=LD_LIBRARY_PATH
+-fi
+-if test -z "$CC"; then
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_prog_rejected=no
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+-       ac_prog_rejected=yes
+-       continue
+-     fi
+-    ac_cv_prog_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
 -  fi
--  ;;
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
-+
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- 
--uts4*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
- 
--*)
--  dynamic_linker=no
--  ;;
--esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
--test "$dynamic_linker" = no && can_build_shared=no
- 
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
--hardcode_action_GCJ=
--if test -n "$hardcode_libdir_flag_spec_GCJ" || \
--   test -n "$runpath_var GCJ" || \
--   test "X$hardcode_automatic_GCJ"="Xyes" ; then
+-done
+-done
  
--  # We can hardcode non-existant directories.
--  if test "$hardcode_direct_GCJ" != no &&
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" ||
-+   test -n "$runpath_var" ||
-+   test "X$hardcode_automatic" = "Xyes" ; then
-+
-+  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct" != no &&
-      # If the only mechanism to avoid hardcoding is shlibpath_var, we
-      # have to relink, otherwise we might link with an installed library
-      # when we should be linking with a yet-to-be-installed one
--     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
--     test "$hardcode_minus_L_GCJ" != no; then
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-+     test "$hardcode_minus_L" != no; then
-     # Linking always hardcodes the temporary library directory.
--    hardcode_action_GCJ=relink
-+    hardcode_action=relink
-   else
-     # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action_GCJ=immediate
-+    hardcode_action=immediate
-   fi
+-if test $ac_prog_rejected = yes; then
+-  # We found a bogon in the path, so make sure we never use it.
+-  set dummy $ac_cv_prog_CC
+-  shift
+-  if test $# != 0; then
+-    # We chose a different compiler from the bogus one.
+-    # However, it has the same basename, so the bogon will be chosen
+-    # first if we set CC to just the basename; use the full file name.
+-    shift
+-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+-  fi
+-fi
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++# Check whether --with-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then :
++  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
-   # We cannot hardcode anything, or else we can only hardcode existing
-   # directories.
--  hardcode_action_GCJ=unsupported
-+  hardcode_action=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--echo "${ECHO_T}$hardcode_action_GCJ" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-+$as_echo "$hardcode_action" >&6; }
- 
--if test "$hardcode_action_GCJ" = relink; then
-+if test "$hardcode_action" = relink ||
-+   test "$inherit_rpath" = yes; then
-   # Fast installation is not supported
-   enable_fast_install=no
- elif test "$shlibpath_overrides_runpath" = yes ||
-@@ -18332,36 +11211,12 @@
-   enable_fast_install=needless
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  with_gnu_ld=no
  fi
  
--striplib=
--old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-fi
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--   darwin*)
--       if test -n "$STRIP" ; then
--         striplib="$STRIP -x"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--       else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
++$as_echo_n "checking for ld used by $CC... " >&6; }
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
++      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
++$as_echo_n "checking for GNU ld... " >&6; }
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
++$as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++if ${lt_cv_path_LD+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 -fi
--       ;;
--   *)
+-
+-    test -n "$CC" && break
++  if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some variants of GNU ld only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
+   done
+-fi
+-if test -z "$CC"; then
+-  ac_ct_CC=$CC
+-  for ac_prog in cl
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi
+ fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
++$as_echo "$LD" >&6; }
+ else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
--    ;;
--  esac
--fi
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++test -z "$LD" && CXX=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
++if ${lt_cv_prog_gnu_ld+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  # I'd rather use --version here, but apparently some GNU lds only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
++$as_echo "$lt_cv_prog_gnu_ld" >&6; }
++with_gnu_ld=$lt_cv_prog_gnu_ld
  
--if test "x$enable_dlopen" != xyes; then
-+
-+
-+
-+
-+  if test "x$enable_dlopen" != xyes; then
-   enable_dlopen=unknown
-   enable_dlopen_self=unknown
-   enable_dlopen_self_static=unknown
-@@ -18376,83 +11231,55 @@
-     lt_cv_dlopen_self=yes
-     ;;
+-  test -n "$ac_ct_CC" && break
+-done
  
--  mingw* | pw32*)
-+  mingw* | pw32* | cegcc*)
-     lt_cv_dlopen="LoadLibrary"
-     lt_cv_dlopen_libs=
--   ;;
-+    ;;
+-  CC=$ac_ct_CC
+-fi
  
-   cygwin*)
-     lt_cv_dlopen="dlopen"
-     lt_cv_dlopen_libs=
--   ;;
-+    ;;
+-fi
  
-   darwin*)
-   # if libdl is installed we need to link against it
--    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+ 
+-# Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
 -  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 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
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dl_dlopen=yes
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_dl_dlopen=no
-+  ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
- 
-@@ -18462,462 +11289,172 @@
- 
- fi
- 
--   ;;
-+    ;;
+-  (exit $ac_status); }
  
-   *)
--    echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
--if test "${ac_cv_func_shl_load+set}" = set; then
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define shl_load innocuous_shl_load
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char shl_load (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef shl_load
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char shl_load ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_shl_load) || defined (__stub___shl_load)
--choke me
--#else
--char (*f) () = shl_load;
--#endif
--#ifdef __cplusplus
--}
--#endif
--
--int
--main ()
--{
--return f != shl_load;
--  ;
--  return 0;
--}
++      # 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
++        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
++        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++
++        # If archive_cmds runs LD, not CC, wlarc should be empty
++        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++        #     investigate it a little bit more. (MM)
++        wlarc='${wl}'
++
++        # ancient GNU ld didn't support --whole-archive et. al.
++        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
++	  $GREP 'no-whole-archive' > /dev/null; then
++          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++        else
++          whole_archive_flag_spec_CXX=
++        fi
++      else
++        with_gnu_ld=no
++        wlarc=
++
++        # A generic and very simple default shared library creation
++        # command for GNU C++ for the case where it uses the native
++        # 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.
++        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      fi
++
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++
++    else
++      GXX=no
++      with_gnu_ld=no
++      wlarc=
++    fi
++
++    # PORTME: fill in a description of your system's C++ link characteristics
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
++    ld_shlibs_CXX=yes
++    case $host_os in
++      aix3*)
++        # FIXME: insert proper C++ library support
++        ld_shlibs_CXX=no
++        ;;
++      aix[4-9]*)
++        if test "$host_cpu" = ia64; then
++          # On IA64, the linker does run time linking by default, so we don't
++          # have to do anything special.
++          aix_use_runtimelinking=no
++          exp_sym_flag='-Bexport'
++          no_entry_flag=""
++        else
++          aix_use_runtimelinking=no
++
++          # Test if we are trying to use run time linking or normal
++          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++          # need to do runtime linking.
++          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
++	    for ld_flag in $LDFLAGS; do
++	      case $ld_flag in
++	      *-brtl*)
++	        aix_use_runtimelinking=yes
++	        break
++	        ;;
++	      esac
++	    done
++	    ;;
++          esac
++
++          exp_sym_flag='-bexport'
++          no_entry_flag='-bnoentry'
++        fi
++
++        # When large executables or shared objects are built, AIX ld can
++        # have problems creating the table of contents.  If linking a library
++        # or program results in "error TOC overflow" add -mminimal-toc to
++        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++        archive_cmds_CXX=''
++        hardcode_direct_CXX=yes
++        hardcode_direct_absolute_CXX=yes
++        hardcode_libdir_separator_CXX=':'
++        link_all_deplibs_CXX=yes
++        file_list_spec_CXX='${wl}-f,'
++
++        if test "$GXX" = yes; then
++          case $host_os in aix4.[012]|aix4.[012].*)
++          # We only want to do this on AIX 4.2 and lower, the check
++          # below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" &&
++	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
++	  then
++	    # We have reworked collect2
++	    :
++	  else
++	    # We have old collect2
++	    hardcode_direct_CXX=unsupported
++	    # It fails to find uninstalled libraries when the uninstalled
++	    # path is not listed in the libpath.  Setting hardcode_minus_L
++	    # to unsupported forces relinking
++	    hardcode_minus_L_CXX=yes
++	    hardcode_libdir_flag_spec_CXX='-L$libdir'
++	    hardcode_libdir_separator_CXX=
++	  fi
++          esac
++          shared_flag='-shared'
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag="$shared_flag "'${wl}-G'
++	  fi
++        else
++          # not using gcc
++          if test "$host_cpu" = ia64; then
++	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	  # chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++          else
++	    if test "$aix_use_runtimelinking" = yes; then
++	      shared_flag='${wl}-G'
++	    else
++	      shared_flag='${wl}-bM:SRE'
++	    fi
++          fi
++        fi
++
++        export_dynamic_flag_spec_CXX='${wl}-bexpall'
++        # It seems that -bexpall does not export symbols beginning with
++        # underscore (_), so it is better to generate a list of symbols to
++	# export.
++        always_export_symbols_CXX=yes
++        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.
++          allow_undefined_flag_CXX='-berok'
++          # Determine the default libpath from the value encoded in an empty
++          # executable.
++          if test "${lt_cv_aix_libpath+set}" = set; then
++  aix_libpath=$lt_cv_aix_libpath
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 -_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  if ${lt_cv_aix_libpath__CXX+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+ main ()
+ {
+-#ifndef __GNUC__
+-       choke me
+-#endif
+ 
+   ;
+   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
@@ -57905,70 +63579,88 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_func_shl_load=yes
+-  ac_compiler_gnu=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_func_shl_load=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
--if test $ac_cv_func_shl_load = yes; then
-+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-   lt_cv_dlopen="shl_load"
- else
--  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++if ac_fn_cxx_try_link "$LINENO"; then :
+ 
+-ac_compiler_gnu=no
++  lt_aix_libpath_sed='
++      /Import File Strings/,/^$/ {
++	  /^0/ {
++	      s/^0  *\([^ ]*\) *$/\1/
++	      p
++	  }
++      }'
++  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  # Check for a 64-bit object if we didn't find anything.
++  if test -z "$lt_cv_aix_libpath__CXX"; then
++    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_c_compiler_gnu=$ac_compiler_gnu
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++  if test -z "$lt_cv_aix_libpath__CXX"; then
++    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
++  fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_g+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
++
++  aix_libpath=$lt_cv_aix_libpath__CXX
++fi
++
++          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++        else
++          if test "$host_cpu" = ia64; then
++	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
++	    allow_undefined_flag_CXX="-z nodefs"
++	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++          else
++	    # Determine the default libpath from the value encoded in an
++	    # empty executable.
++	    if test "${lt_cv_aix_libpath+set}" = set; then
++  aix_libpath=$lt_cv_aix_libpath
  else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  if ${lt_cv_aix_libpath__CXX+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shl_load ();
  int
- main ()
- {
--shl_load ();
-+return shl_load ();
-   ;
+@@ -20174,4766 +14957,3686 @@
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -57982,91 +63674,272 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dld_shl_load=yes
- else
+-  ac_cv_prog_cc_g=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_dld_shl_load=no
-+  ac_cv_lib_dld_shl_load=no
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
++if ac_fn_cxx_try_link "$LINENO"; then :
++
++  lt_aix_libpath_sed='
++      /Import File Strings/,/^$/ {
++	  /^0/ {
++	      s/^0  *\([^ ]*\) *$/\1/
++	      p
++	  }
++      }'
++  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  # Check for a 64-bit object if we didn't find anything.
++  if test -z "$lt_cv_aix_libpath__CXX"; then
++    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  fi
++fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
++  if test -z "$lt_cv_aix_libpath__CXX"; then
++    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
++  fi
+ 
+-ac_cv_prog_cc_g=no
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
--if test $ac_cv_lib_dld_shl_load = yes; then
--  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++  aix_libpath=$lt_cv_aix_libpath__CXX
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
++
++	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++	    # Warning - without using the other run time loading flags,
++	    # -berok will link without error, but may produce a broken library.
++	    no_undefined_flag_CXX=' ${wl}-bernotok'
++	    allow_undefined_flag_CXX=' ${wl}-berok'
++	    if test "$with_gnu_ld" = yes; then
++	      # We only use this code for GNU lds that support --whole-archive.
++	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    else
++	      # Exported symbols can be pulled into shared objects from archives
++	      whole_archive_flag_spec_CXX='$convenience'
++	    fi
++	    archive_cmds_need_lc_CXX=yes
++	    # This is similar to how AIX traditionally builds its shared
++	    # libraries.
++	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++          fi
++        fi
++        ;;
++
++      beos*)
++	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	  allow_undefined_flag_CXX=unsupported
++	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	  # support --undefined.  This deserves some investigation.  FIXME
++	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	else
++	  ld_shlibs_CXX=no
++	fi
++	;;
++
++      chorus*)
++        case $cc_basename in
++          *)
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	  ;;
++        esac
++        ;;
++
++      cygwin* | mingw* | pw32* | cegcc*)
++	case $GXX,$cc_basename in
++	,cl* | no,cl*)
++	  # Native MSVC
++	  # hardcode_libdir_flag_spec is actually meaningless, as there is
++	  # no search path for DLLs.
++	  hardcode_libdir_flag_spec_CXX=' '
++	  allow_undefined_flag_CXX=unsupported
++	  always_export_symbols_CXX=yes
++	  file_list_spec_CXX='@'
++	  # Tell ltmain to make .lib files, not .a files.
++	  libext=lib
++	  # Tell ltmain to make .dll files, not .so files.
++	  shrext_cmds=".dll"
++	  # FIXME: Setting linknames here is a bad hack.
++	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++	    else
++	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++	    fi~
++	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++	    linknames='
++	  # The linker will not automatically build a static lib if we build a DLL.
++	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
++	  enable_shared_with_static_runtimes_CXX=yes
++	  # Don't use ranlib
++	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
++	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
++	    lt_tool_outputfile="@TOOL_OUTPUT@"~
++	    case $lt_outputfile in
++	      *.exe|*.EXE) ;;
++	      *)
++		lt_outputfile="$lt_outputfile.exe"
++		lt_tool_outputfile="$lt_tool_outputfile.exe"
++		;;
++	    esac~
++	    func_to_tool_file "$lt_outputfile"~
++	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++	      $RM "$lt_outputfile.manifest";
++	    fi'
++	  ;;
++	*)
++	  # g++
++	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
++	  # as there is no search path for DLLs.
++	  hardcode_libdir_flag_spec_CXX='-L$libdir'
++	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
++	  allow_undefined_flag_CXX=unsupported
++	  always_export_symbols_CXX=no
++	  enable_shared_with_static_runtimes_CXX=yes
++
++	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	    # 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
++	      cp $export_symbols $output_objdir/$soname.def;
++	    else
++	      echo EXPORTS > $output_objdir/$soname.def;
++	      cat $export_symbols >> $output_objdir/$soname.def;
++	    fi~
++	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	  else
++	    ld_shlibs_CXX=no
++	  fi
++	  ;;
++	esac
++	;;
++      darwin* | rhapsody*)
++
++
++  archive_cmds_need_lc_CXX=no
++  hardcode_direct_CXX=no
++  hardcode_automatic_CXX=yes
++  hardcode_shlibpath_var_CXX=unsupported
++  if test "$lt_cv_ld_force_load" = "yes"; then
++    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+   else
+-    CFLAGS="-g"
++    whole_archive_flag_spec_CXX=''
+   fi
 -else
--  echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
--if test "${ac_cv_func_dlopen+set}" = set; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
++  link_all_deplibs_CXX=yes
++  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
++  case $cc_basename in
++     ifort*) _lt_dar_can_shared=yes ;;
++     *) _lt_dar_can_shared=$GCC ;;
++  esac
++  if test "$_lt_dar_can_shared" = "yes"; then
++    output_verbose_link_cmd=func_echo_all
++    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++    fi
++
+   else
+-    CFLAGS=
++  ld_shlibs_CXX=no
+   fi
+-fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define dlopen innocuous_dlopen
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char dlopen (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef dlopen
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
 -{
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_dlopen) || defined (__stub___dlopen)
--choke me
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
+-  return p[i];
 -}
--#endif
--
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+ 
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+-   function prototypes and stuff, but not '\xHH' hex character constants.
+-   These don't provoke an error unfortunately, instead are silently treated
+-   as 'x'.  The following induces an error, until -std1 is added to get
+-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+-   array size at least.  It's necessary to write '\x00'==0 to get something
+-   that's true only with -std1.  */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++	;;
+ 
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
 -int
 -main ()
 -{
--return f != dlopen;
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
 -  ;
 -  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
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# HP-UX older versions	-Aa -D_HPUX_SOURCE
+-# SVR4			-Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-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
@@ -58080,74 +63953,78 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_func_dlopen=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
+-  ac_cv_prog_cc_stdc=$ac_arg
+-break
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_func_dlopen=no
++      dgux*)
++        case $cc_basename in
++          ec++*)
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++          ghcx*)
++	    # Green Hills C++ Compiler
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++          *)
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++        esac
++        ;;
+ 
 -fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
++      freebsd[12]*)
++        # C++ shared libraries reported to be fairly broken before
++	# switch to ELF
++        ld_shlibs_CXX=no
++        ;;
+ 
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
--if test $ac_cv_func_dlopen = yes; then
-+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen"
- else
--  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
++      freebsd-elf*)
++        archive_cmds_need_lc_CXX=no
++        ;;
+ 
+-case "x$ac_cv_prog_cc_stdc" in
+-  x|xno)
+-    echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+-  *)
+-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
++      freebsd* | dragonfly*)
++        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++        # conventions
++        ld_shlibs_CXX=yes
++        ;;
+ 
+-# Some people use a C++ compiler to compile C.  Since we use `exit',
+-# in C++ we need to declare it.  In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
 -cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
+-#ifndef __cplusplus
+-  choke me
+-#endif
 -_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -58161,76 +64038,39 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dl_dlopen=yes
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_dl_dlopen=no
-+  ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
--  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
--if test "${ac_cv_lib_svld_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+-  for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-/* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  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
@@ -58244,4079 +64084,4542 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_svld_dlopen=yes
- else
+-  :
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_svld_dlopen=no
-+  ac_cv_lib_svld_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
--if test $ac_cv_lib_svld_dlopen = yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
--  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_dld_link+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-+$as_echo_n "checking for dld_link in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
++      gnu*)
++        ;;
+ 
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dld_link ();
- int
- main ()
- {
--dld_link ();
-+return dld_link ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dld_dld_link=yes
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_dld_dld_link=no
-+  ac_cv_lib_dld_dld_link=no
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
--if test $ac_cv_lib_dld_dld_link = yes; then
--  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
- 
- 
-@@ -18950,23 +11487,23 @@
-     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- 
-     save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- 
-     save_LIBS="$LIBS"
-     LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-+if test "${lt_cv_dlopen_self+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self=cross
- else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 18969 "configure"
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#line 11506 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -19007,10 +11544,6 @@
- #  endif
- #endif
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
- void fnord() { int i=42;}
- int main ()
- {
-@@ -19023,21 +11556,23 @@
-       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-       /* dlclose (self); */
-     }
-+  else
-+    puts (dlerror ());
- 
--    exit (status);
-+  return status;
- }
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+_LT_EOF
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-     esac
-   else :
-     # compilation failed
-@@ -19048,23 +11583,23 @@
- 
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-+$as_echo "$lt_cv_dlopen_self" >&6; }
- 
-     if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-+if test "${lt_cv_dlopen_self_static+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self_static=cross
- else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 19067 "configure"
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#line 11602 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -19105,10 +11640,6 @@
- #  endif
- #endif
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
- void fnord() { int i=42;}
- int main ()
- {
-@@ -19121,21 +11652,23 @@
-       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-       /* dlclose (self); */
-     }
-+  else
-+    puts (dlerror ());
- 
--    exit (status);
-+  return status;
- }
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+_LT_EOF
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-     esac
-   else :
-     # compilation failed
-@@ -19146,8 +11679,8 @@
- 
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
-     fi
- 
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -19168,404 +11701,751 @@
- fi
- 
- 
--# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # See if we are running on zsh, and set the options which allow our commands through
--  # without removal of \ escapes.
--  if test -n "${ZSH_VERSION+set}" ; then
--    setopt NO_GLOB_SUBST
--  fi
--  # 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.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
--    SED SHELL STRIP \
--    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 \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    compiler_GCJ \
--    CC_GCJ \
--    LD_GCJ \
--    lt_prog_compiler_wl_GCJ \
--    lt_prog_compiler_pic_GCJ \
--    lt_prog_compiler_static_GCJ \
--    lt_prog_compiler_no_builtin_flag_GCJ \
--    export_dynamic_flag_spec_GCJ \
--    thread_safe_flag_spec_GCJ \
--    whole_archive_flag_spec_GCJ \
--    enable_shared_with_static_runtimes_GCJ \
--    old_archive_cmds_GCJ \
--    old_archive_from_new_cmds_GCJ \
--    predep_objects_GCJ \
--    postdep_objects_GCJ \
--    predeps_GCJ \
--    postdeps_GCJ \
--    compiler_lib_search_path_GCJ \
--    archive_cmds_GCJ \
--    archive_expsym_cmds_GCJ \
--    postinstall_cmds_GCJ \
--    postuninstall_cmds_GCJ \
--    old_archive_from_expsyms_cmds_GCJ \
--    allow_undefined_flag_GCJ \
--    no_undefined_flag_GCJ \
--    export_symbols_cmds_GCJ \
--    hardcode_libdir_flag_spec_GCJ \
--    hardcode_libdir_flag_spec_ld_GCJ \
--    hardcode_libdir_separator_GCJ \
--    hardcode_automatic_GCJ \
--    module_cmds_GCJ \
--    module_expsym_cmds_GCJ \
--    lt_cv_prog_compiler_c_o_GCJ \
--    exclude_expsyms_GCJ \
--    include_expsyms_GCJ; do
--
--    case $var in
--    old_archive_cmds_GCJ | \
--    old_archive_from_new_cmds_GCJ | \
--    archive_cmds_GCJ | \
--    archive_expsym_cmds_GCJ | \
--    module_cmds_GCJ | \
--    module_expsym_cmds_GCJ | \
--    old_archive_from_expsyms_cmds_GCJ | \
--    export_symbols_cmds_GCJ | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
--      ;;
--    *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
--      ;;
--    esac
--  done
- 
--  case $lt_echo in
--  *'\$0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+-/* end confdefs.h.  */
+-$ac_declaration
+-int
+-main ()
++      haiku*)
++        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        link_all_deplibs_CXX=yes
++        ;;
 +
++      hpux9*)
++        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++        hardcode_libdir_separator_CXX=:
++        export_dynamic_flag_spec_CXX='${wl}-E'
++        hardcode_direct_CXX=yes
++        hardcode_minus_L_CXX=yes # Not in the search PATH,
++				             # but as the default
++				             # location of the library.
 +
-+striplib=
-+old_striplib=
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+  darwin*)
-+    if test -n "$STRIP" ; then
-+      striplib="$STRIP -x"
-+      old_striplib="$STRIP -S"
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+    else
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    fi
-+    ;;
-+  *)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
-   esac
-+fi
- 
--cfgfile="$ofile"
- 
--  cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
- 
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
- 
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
- 
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
- 
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_GCJ
- 
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
- 
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
- 
--# The host system.
--host_alias=$host_alias
--host=$host
- 
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
- 
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
-+  # Report which library types will actually be built
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-+$as_echo "$can_build_shared" >&6; }
- 
--# A C compiler.
--LTCC=$lt_LTCC
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-+$as_echo_n "checking whether to build shared libraries... " >&6; }
-+  test "$can_build_shared" = "no" && enable_shared=no
- 
--# A language-specific compiler.
--CC=$lt_compiler_GCJ
-+  # On AIX, shared libraries and static libraries use the same namespace, and
-+  # are all built from PIC.
-+  case $host_os in
-+  aix3*)
-+    test "$enable_shared" = yes && enable_static=no
-+    if test -n "$RANLIB"; then
-+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+      postinstall_cmds='$RANLIB $lib'
-+    fi
-+    ;;
- 
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_GCJ
-+  aix[4-9]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-+    ;;
-+  esac
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
- 
--# An ERE matcher.
--EGREP=$lt_EGREP
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-+$as_echo_n "checking whether to build static libraries... " >&6; }
-+  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
- 
--# The linker used to build libraries.
--LD=$lt_LD_GCJ
- 
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
- 
--# A BSD-compatible nm program.
--NM=$lt_NM
- 
--# A symbol stripping program
--STRIP=$lt_STRIP
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
-+CC="$lt_save_CC"
- 
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
- 
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
- 
--# Used on cygwin: assembler.
--AS=$lt_AS
- 
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
- 
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
- 
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_GCJ
- 
--# Object file suffix (normally "o").
--objext="$ac_objext"
- 
--# Old archive suffix (normally "a").
--libext="$libext"
- 
--# Shared library suffix (normally ".so").
--shrext='$shrext'
- 
--# Executable file suffix (normally "").
--exeext="$exeext"
- 
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_GCJ
--pic_mode=$pic_mode
- 
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
- 
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-+        ac_config_commands="$ac_config_commands libtool"
- 
--# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
- 
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
- 
--# Do we need a version for libraries?
--need_version=$need_version
- 
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
-+# Only expand once:
- 
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
- 
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
- 
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_GCJ
-+if test x"$enable_static$enable_all_static" = xnoyes; then
-+  as_fn_error $? "You cannot pass --enable-all-static without one of --enable-static or --disable-shared" "$LINENO" 5
-+fi
-+ if test $enable_static = yes; then
-+  CR_ENABLE_STATIC_TRUE=
-+  CR_ENABLE_STATIC_FALSE='#'
-+else
-+  CR_ENABLE_STATIC_TRUE='#'
-+  CR_ENABLE_STATIC_FALSE=
-+fi
- 
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-+ if test $enable_shared = yes; then
-+  CR_ENABLE_SHARED_TRUE=
-+  CR_ENABLE_SHARED_FALSE='#'
-+else
-+  CR_ENABLE_SHARED_TRUE='#'
-+  CR_ENABLE_SHARED_FALSE=
-+fi
- 
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
- 
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-+# Check for rpmbuild
- 
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-+  for ac_prog in rpmbuild rpmb rpm
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_RPMBUILD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $RPMBUILD in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_RPMBUILD="$RPMBUILD" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_dummy="$PATH:/usr/lib/rpm"
-+for as_dir in $as_dummy
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
--# Library versioning type.
--version_type=$version_type
-+  ;;
-+esac
-+fi
-+RPMBUILD=$ac_cv_path_RPMBUILD
-+if test -n "$RPMBUILD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPMBUILD" >&5
-+$as_echo "$RPMBUILD" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
- 
--# List of archive names.  First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
-+  test -n "$RPMBUILD" && break
-+done
-+test -n "$RPMBUILD" || RPMBUILD="none"
- 
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
-+  if $RPMBUILD -bs 2>&1 | grep 'no spec' >/dev/null 2>/dev/null; then
-+    :
-+  else
-+    RPMBUILD=none
-+  fi
- 
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_GCJ
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+ if test $RPMBUILD != none; then
-+  HAVE_RPMBUILD_TRUE=
-+  HAVE_RPMBUILD_FALSE='#'
-+else
-+  HAVE_RPMBUILD_TRUE='#'
-+  HAVE_RPMBUILD_FALSE=
-+fi
- 
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
- 
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-+# Check for a GNU C compiler (or a work alike?)
- 
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_GCJ
--archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
-+  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
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}gcc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_GCJ
--module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
- 
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_predep_objects_GCJ
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_GCJ
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_GCJ
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_GCJ
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+  ac_ct_CC=$CC
-+  # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
- 
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
-+if test -z "$CC"; then
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
++        case $cc_basename in
++          CC*)
++            # FIXME: insert proper C++ library support
++            ld_shlibs_CXX=no
++            ;;
++          aCC*)
++            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            # Commands to make compiler produce verbose output that lists
++            # what "hidden" libraries, object files and flags are used when
++            # linking a shared library.
++            #
++            # There doesn't appear to be a way to prevent this compiler from
++            # explicitly linking system object files so we need to strip them
++            # from the output so that they don't get included in the library
++            # dependencies.
++            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++            ;;
++          *)
++            if test "$GXX" = yes; then
++              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            else
++              # FIXME: insert proper C++ library support
++              ld_shlibs_CXX=no
++            fi
++            ;;
++        esac
++        ;;
++
++      hpux10*|hpux11*)
++        if test $with_gnu_ld = no; then
++	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
++
++          case $host_cpu in
++            hppa*64*|ia64*)
++              ;;
++            *)
++	      export_dynamic_flag_spec_CXX='${wl}-E'
++              ;;
++          esac
++        fi
++        case $host_cpu in
++          hppa*64*|ia64*)
++            hardcode_direct_CXX=no
++            hardcode_shlibpath_var_CXX=no
++            ;;
++          *)
++            hardcode_direct_CXX=yes
++            hardcode_direct_absolute_CXX=yes
++            hardcode_minus_L_CXX=yes # Not in the search PATH,
++					         # but as the default
++					         # location of the library.
++            ;;
++        esac
++
++        case $cc_basename in
++          CC*)
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++          aCC*)
++	    case $host_cpu in
++	      hppa*64*)
++	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        ;;
++	      ia64*)
++	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        ;;
++	      *)
++	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        ;;
++	    esac
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    ;;
++          *)
++	    if test "$GXX" = yes; then
++	      if test $with_gnu_ld = no; then
++	        case $host_cpu in
++	          hppa*64*)
++	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            ;;
++	          ia64*)
++	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            ;;
++	          *)
++	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            ;;
++	        esac
++	      fi
++	    else
++	      # FIXME: insert proper C++ library support
++	      ld_shlibs_CXX=no
++	    fi
++	    ;;
++        esac
++        ;;
++
++      interix[3-9]*)
++	hardcode_direct_CXX=no
++	hardcode_shlibpath_var_CXX=no
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}-E'
++	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++	# Instead, shared libraries are loaded at an image base (0x10000000 by
++	# default) and relocated if they conflict, which is a slow very memory
++	# consuming and fragmenting process.  To avoid this, we pick a random,
++	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	;;
++      irix5* | irix6*)
++        case $cc_basename in
++          CC*)
++	    # SGI C++
++	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++
++	    # Archives containing C++ object files must be created using
++	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	    # necessary to make sure instantiated templates are included
++	    # in the archive.
++	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	    ;;
++          *)
++	    if test "$GXX" = yes; then
++	      if test "$with_gnu_ld" = no; then
++	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	      else
++	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
++	      fi
++	    fi
++	    link_all_deplibs_CXX=yes
++	    ;;
++        esac
++        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++        hardcode_libdir_separator_CXX=:
++        inherit_rpath_CXX=yes
++        ;;
++
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
++        case $cc_basename in
++          KCC*)
++	    # Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	    # KCC will only create a shared library if the output file
++	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
++	    # to its proper name (with version) after linking.
++	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++
++	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++
++	    # Archives containing C++ object files must be created using
++	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++	    ;;
++	  icpc* | ecpc* )
++	    # Intel C++
++	    with_gnu_ld=yes
++	    # version 8.0 and above of icpc choke on multiply defined symbols
++	    # if we add $predep_objects and $postdep_objects, however 7.1 and
++	    # earlier do not add the objects themselves.
++	    case `$CC -V 2>&1` in
++	      *"Version 7."*)
++	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++		;;
++	      *)  # Version 8.0 or newer
++	        tmp_idyn=
++	        case $host_cpu in
++		  ia64*) tmp_idyn=' -i_dynamic';;
++		esac
++	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++		;;
++	    esac
++	    archive_cmds_need_lc_CXX=no
++	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    ;;
++          pgCC* | pgcpp*)
++            # Portland Group C++ compiler
++	    case `$CC -V` in
++	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
++	      prelink_cmds_CXX='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
++		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
++	      old_archive_cmds_CXX='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
++		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
++		$RANLIB $oldlib'
++	      archive_cmds_CXX='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++	      archive_expsym_cmds_CXX='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++	      ;;
++	    *) # Version 6 and above use weak symbols
++	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++	      ;;
++	    esac
++
++	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++            ;;
++	  cxx*)
++	    # Compaq C++
++	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	    runpath_var=LD_RUN_PATH
++	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	    hardcode_libdir_separator_CXX=:
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
++	    ;;
++	  xl* | mpixl* | bgxl*)
++	    # IBM XL 8.0 on PPC, with GNU ld
++	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	    if test "x$supports_anon_versioning" = xyes; then
++	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
++		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++		echo "local: *; };" >> $output_objdir/$libname.ver~
++		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	    fi
++	    ;;
++	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      no_undefined_flag_CXX=' -zdefs'
++	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	      hardcode_libdir_flag_spec_CXX='-R$libdir'
++	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	      compiler_needs_object_CXX=yes
++
++	      # Not sure whether something based on
++	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	      # would be better.
++	      output_verbose_link_cmd='func_echo_all'
++
++	      # Archives containing C++ object files must be created using
++	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	      # necessary to make sure instantiated templates are included
++	      # in the archive.
++	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	      ;;
++	    esac
++	    ;;
++	esac
++	;;
++
++      lynxos*)
++        # FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++
++      m88k*)
++        # FIXME: insert proper C++ library support
++        ld_shlibs_CXX=no
++	;;
++
++      mvs*)
++        case $cc_basename in
++          cxx*)
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++	  *)
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++	esac
++	;;
++
++      netbsd*)
++        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=
++	  hardcode_libdir_flag_spec_CXX='-R$libdir'
++	  hardcode_direct_CXX=yes
++	  hardcode_shlibpath_var_CXX=no
++	fi
++	# 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::"'
++	;;
++
++      *nto* | *qnx*)
++        ld_shlibs_CXX=yes
++	;;
++
++      openbsd2*)
++        # C++ shared libraries are fairly broken
++	ld_shlibs_CXX=no
++	;;
++
++      openbsd*)
++	if test -f /usr/libexec/ld.so; then
++	  hardcode_direct_CXX=yes
++	  hardcode_shlibpath_var_CXX=no
++	  hardcode_direct_absolute_CXX=yes
++	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	    export_dynamic_flag_spec_CXX='${wl}-E'
++	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	  fi
++	  output_verbose_link_cmd=func_echo_all
++	else
++	  ld_shlibs_CXX=no
++	fi
++	;;
++
++      osf3* | osf4* | osf5*)
++        case $cc_basename in
++          KCC*)
++	    # Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	    # KCC will only create a shared library if the output file
++	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
++	    # to its proper name (with version) after linking.
++	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	    hardcode_libdir_separator_CXX=:
++
++	    # Archives containing C++ object files must be created using
++	    # the KAI C++ compiler.
++	    case $host in
++	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
++	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
++	    esac
++	    ;;
++          RCC*)
++	    # Rational C++ 2.4.1
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++          cxx*)
++	    case $host in
++	      osf3*)
++	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++		;;
++	      *)
++	        allow_undefined_flag_CXX=' -expect_unresolved \*'
++	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	          echo "-hidden">> $lib.exp~
++	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
++	          $RM $lib.exp'
++	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++		;;
++	    esac
++
++	    hardcode_libdir_separator_CXX=:
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    ;;
++	  *)
++	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	      case $host in
++	        osf3*)
++	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++		  ;;
++	        *)
++	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++		  ;;
++	      esac
++
++	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	      hardcode_libdir_separator_CXX=:
++
++	      # Commands to make compiler produce verbose output that lists
++	      # what "hidden" libraries, object files and flags are used when
++	      # linking a shared library.
++	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++
++	    else
++	      # FIXME: insert proper C++ library support
++	      ld_shlibs_CXX=no
++	    fi
++	    ;;
++        esac
++        ;;
++
++      psos*)
++        # FIXME: insert proper C++ library support
++        ld_shlibs_CXX=no
++        ;;
++
++      sunos4*)
++        case $cc_basename in
++          CC*)
++	    # Sun C++ 4.x
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++          lcc*)
++	    # Lucid
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++          *)
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++        esac
++        ;;
++
++      solaris*)
++        case $cc_basename in
++          CC* | sunCC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++            archive_cmds_need_lc_CXX=yes
++	    no_undefined_flag_CXX=' -zdefs'
++	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++
++	    hardcode_libdir_flag_spec_CXX='-R$libdir'
++	    hardcode_shlibpath_var_CXX=no
++	    case $host_os in
++	      solaris2.[0-5] | solaris2.[0-5].*) ;;
++	      *)
++		# The compiler driver will combine and reorder linker options,
++		# but understands `-z linker_flag'.
++	        # Supported since Solaris 2.6 (maybe 2.5.1?)
++		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
++	        ;;
++	    esac
++	    link_all_deplibs_CXX=yes
++
++	    output_verbose_link_cmd='func_echo_all'
++
++	    # Archives containing C++ object files must be created using
++	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	    # necessary to make sure instantiated templates are included
++	    # in the archive.
++	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	    ;;
++          gcx*)
++	    # Green Hills C++ Compiler
++	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++
++	    # The C++ compiler must be used to create the archive.
++	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	    ;;
++          *)
++	    # GNU C++ compiler with Solaris linker
++	    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
++	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++
++	        # Commands to make compiler produce verbose output that lists
++	        # what "hidden" libraries, object files and flags are used when
++	        # linking a shared library.
++	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++	      else
++	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	        # platform.
++	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++
++	        # Commands to make compiler produce verbose output that lists
++	        # what "hidden" libraries, object files and flags are used when
++	        # linking a shared library.
++	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++	      fi
++
++	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	      case $host_os in
++		solaris2.[0-5] | solaris2.[0-5].*) ;;
++		*)
++		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++		  ;;
++	      esac
++	    fi
++	    ;;
++        esac
++        ;;
 +
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++      no_undefined_flag_CXX='${wl}-z,text'
++      archive_cmds_need_lc_CXX=no
++      hardcode_shlibpath_var_CXX=no
++      runpath_var='LD_RUN_PATH'
 +
-+  fi
-+fi
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+       ac_prog_rejected=yes
-+       continue
-+     fi
-+    ac_cv_prog_CC="cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
++      case $cc_basename in
++        CC*)
++	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++      esac
++      ;;
 +
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $# != 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+  fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_GCJ
- 
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
-+fi
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in cl.exe
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
- 
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+    test -n "$CC" && break
-+  done
-+fi
-+if test -z "$CC"; then
-+  ac_ct_CC=$CC
-+  for ac_prog in cl.exe
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
- 
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
-+  test -n "$ac_ct_CC" && break
-+done
- 
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+fi
- 
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_GCJ
-+fi
- 
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
- 
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details" "$LINENO" 5 ; }
- 
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
--
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_GCJ
--
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_GCJ
--
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
--
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_GCJ
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+  fi
-+  rm -f conftest.er1 conftest.err
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
++      sysv5* | sco3.2v5* | sco5v6*)
++	# Note: We can NOT use -z defs as we might desire, because we do not
++	# link with -lc, and that would cause any symbols used from libc to
++	# always be unresolved, which means just about no library would
++	# ever link correctly.  If we're not using GNU ld we use -z text
++	# though, which does catch some bad symbols but isn't as heavy-handed
++	# as -z defs.
++	no_undefined_flag_CXX='${wl}-z,text'
++	allow_undefined_flag_CXX='${wl}-z,nodefs'
++	archive_cmds_need_lc_CXX=no
++	hardcode_shlibpath_var_CXX=no
++	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
++	hardcode_libdir_separator_CXX=':'
++	link_all_deplibs_CXX=yes
++	export_dynamic_flag_spec_CXX='${wl}-Bexport'
++	runpath_var='LD_RUN_PATH'
 +
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
- 
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_GCJ
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
-+  ac_compiler_gnu=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+int
-+main ()
-+{
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_GCJ"
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+else
-+  CFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_GCJ
-+int
-+main ()
-+{
- 
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
- 
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+else
-+  ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_GCJ
-+int
-+main ()
-+{
- 
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_GCJ
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
++	case $cc_basename in
++          CC*)
++	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
++	      '"$old_archive_cmds_CXX"
++	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
++	      '"$reload_cmds_CXX"
++	    ;;
++	  *)
++	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    ;;
++	esac
++      ;;
++
++      tandem*)
++        case $cc_basename in
++          NCC*)
++	    # NonStop-UX NCC 3.20
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++          *)
++	    # FIXME: insert proper C++ library support
++	    ld_shlibs_CXX=no
++	    ;;
++        esac
++        ;;
++
++      vxworks*)
++        # FIXME: insert proper C++ library support
++        ld_shlibs_CXX=no
++        ;;
++
++      *)
++        # FIXME: insert proper C++ library support
++        ld_shlibs_CXX=no
++        ;;
++    esac
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
++$as_echo "$ld_shlibs_CXX" >&6; }
++    test "$ld_shlibs_CXX" = no && can_build_shared=no
++
++    GCC_CXX="$GXX"
++    LD_CXX="$LD"
++
++    ## CAVEAT EMPTOR:
++    ## There is no encapsulation within the following macros, do not change
++    ## the running order or otherwise move them around unless you know exactly
++    ## what you are doing...
++    # Dependencies to place before and after the object being linked:
++predep_objects_CXX=
++postdep_objects_CXX=
++predeps_CXX=
++postdeps_CXX=
++compiler_lib_search_path_CXX=
++
++cat > conftest.$ac_ext <<_LT_EOF
++class Foo
+ {
+-exit (42);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++_LT_EOF
++
++
++_lt_libdeps_save_CFLAGS=$CFLAGS
++case "$CC $CFLAGS " in #(
++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
++esac
++
++if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++  (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
  
--# ### END LIBTOOL TAG CONFIG: $tagname
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+-fi
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
  
--__EOF__
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  for p in `eval "$output_verbose_link_cmd"`; do
++    case ${prev}${p} in
  
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_c89=$ac_arg
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" ||
++          test $p = "-R"; then
++	 prev=$p
++	 continue
++       fi
+ 
+-depcc="$CC"   am_compiler_list=
++       # Expand the sysroot to ease extracting the directories later.
++       if test -z "$prev"; then
++         case $p in
++         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
++         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
++         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
++         esac
++       fi
++       case $p in
++       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
++       esac
++       if test "$pre_test_object_deps_done" = no; then
++	 case ${prev} in
++	 -L | -R)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$compiler_lib_search_path_CXX"; then
++	     compiler_lib_search_path_CXX="${prev}${p}"
++	   else
++	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$postdeps_CXX"; then
++	   postdeps_CXX="${prev}${p}"
++	 else
++	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
++	 fi
++       fi
++       prev=
++       ;;
++
++    *.lto.$objext) ;; # Ignore GCC LTO objects
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
  
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--  # 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.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
--  fi
- fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-+  xno)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
+-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+-  # We make a subdir and do the tests there.  Otherwise we can end up
+-  # making bogus files that we don't know about and never remove.  For
+-  # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named `D' -- because `-MD' means `put the output
+-  # in D'.
+-  mkdir conftest.dir
+-  # Copy depcomp to subdir because otherwise we won't find it if we're
+-  # using a relative directory.
+-  cp "$am_depcomp" conftest.dir
+-  cd conftest.dir
+-  # We will build objects and dependencies in a subdirectory because
+-  # it helps to detect inapplicable dependency modes.  For instance
+-  # both Tru64's cc and ICC support -MD to output dependencies as a
+-  # side effect of compilation, but ICC will put the dependencies in
+-  # the current directory while Tru64 will put them in the object
+-  # directory.
+-  mkdir sub
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$predep_objects_CXX"; then
++	   predep_objects_CXX="$p"
++	 else
++	   predep_objects_CXX="$predep_objects_CXX $p"
++	 fi
++       else
++	 if test -z "$postdep_objects_CXX"; then
++	   postdep_objects_CXX="$p"
++	 else
++	   postdep_objects_CXX="$postdep_objects_CXX $p"
++	 fi
++       fi
++       ;;
  
-+fi
+-  am_cv_CC_dependencies_compiler_type=none
+-  if test "$am_compiler_list" = ""; then
+-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+-  fi
+-  for depmode in $am_compiler_list; do
+-    # Setup a source with many dependencies, because some compilers
+-    # like to wrap large dependency lists on column 80 (with \), and
+-    # we should not choose a depcomp mode which is confused by this.
+-    #
+-    # We need to recreate these files for each test, as the compiler may
+-    # overwrite some of them when testing with obscure command lines.
+-    # This happens at least with the AIX C compiler.
+-    : > sub/conftest.c
+-    for i in 1 2 3 4 5 6; do
+-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+-      # Solaris 8's {/usr,}/bin/sh.
+-      touch sub/conftst$i.h
+-    done
+-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++    *) ;; # Ignore the rest.
  
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -19573,1012 +12453,2030 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-    case $depmode in
+-    nosideeffect)
+-      # after this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested
+-      if test "x$enable_dependency_tracking" = xyes; then
+-	continue
+-      else
+-	break
+-      fi
+-      ;;
+-    none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+-    if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+-         >/dev/null 2>conftest.err &&
+-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+-      # icc doesn't choke on unknown options, it will just issue warnings
+-      # or remarks (even with -Werror).  So we grep stderr for any message
+-      # that says an option was ignored or not supported.
+-      # When given -MP, icc 7.0 and 7.1 complain thusly:
+-      #   icc: Command line warning: ignoring option '-M'; no argument required
+-      # The diagnosis changed in icc 8.0:
+-      #   icc: Command line remark: option '-MP' not supported
+-      if (grep 'ignoring option' conftest.err ||
+-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+-        am_cv_CC_dependencies_compiler_type=$depmode
+-        break
+-      fi
+-    fi
+   done
  
--CC="$lt_save_CC"
--
--	else
--	  tagname=""
--	fi
--	;;
--
--      RC)
--
--
--
--# Source file extension for RC test sources.
--ac_ext=rc
--
--# Object file extension for compiled RC test sources.
--objext=o
--objext_RC=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
--
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-  cd ..
+-  rm -rf conftest.dir
++  # Clean up.
++  rm -f a.out a.exe
+ else
+-  am_cv_CC_dependencies_compiler_type=none
+-fi
 -
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
-+depcc="$CC"   am_compiler_list=
- 
--# Allow CC to be a program name with arguments.
--compiler=$CC
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
++  echo "libtool.m4: error: problem compiling CXX test program"
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  am__universal=false
-+  case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac
++$RM -f confest.$objext
++CFLAGS=$_lt_libdeps_save_CFLAGS
  
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${RC-"windres"}
--compiler=$CC
--compiler_RC=$CC
--lt_cv_prog_compiler_c_o_RC=yes
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++# PORTME: override above test on systems where it is broken
++case $host_os in
++interix[3-9]*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  predep_objects_CXX=
++  postdep_objects_CXX=
++  postdeps_CXX=
++  ;;
  
--# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # See if we are running on zsh, and set the options which allow our commands through
--  # without removal of \ escapes.
--  if test -n "${ZSH_VERSION+set}" ; then
--    setopt NO_GLOB_SUBST
--  fi
--  # 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.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
--    SED SHELL STRIP \
--    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 \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    compiler_RC \
--    CC_RC \
--    LD_RC \
--    lt_prog_compiler_wl_RC \
--    lt_prog_compiler_pic_RC \
--    lt_prog_compiler_static_RC \
--    lt_prog_compiler_no_builtin_flag_RC \
--    export_dynamic_flag_spec_RC \
--    thread_safe_flag_spec_RC \
--    whole_archive_flag_spec_RC \
--    enable_shared_with_static_runtimes_RC \
--    old_archive_cmds_RC \
--    old_archive_from_new_cmds_RC \
--    predep_objects_RC \
--    postdep_objects_RC \
--    predeps_RC \
--    postdeps_RC \
--    compiler_lib_search_path_RC \
--    archive_cmds_RC \
--    archive_expsym_cmds_RC \
--    postinstall_cmds_RC \
--    postuninstall_cmds_RC \
--    old_archive_from_expsyms_cmds_RC \
--    allow_undefined_flag_RC \
--    no_undefined_flag_RC \
--    export_symbols_cmds_RC \
--    hardcode_libdir_flag_spec_RC \
--    hardcode_libdir_flag_spec_ld_RC \
--    hardcode_libdir_separator_RC \
--    hardcode_automatic_RC \
--    module_cmds_RC \
--    module_expsym_cmds_RC \
--    lt_cv_prog_compiler_c_o_RC \
--    exclude_expsyms_RC \
--    include_expsyms_RC; do
--
--    case $var in
--    old_archive_cmds_RC | \
--    old_archive_from_new_cmds_RC | \
--    archive_cmds_RC | \
--    archive_expsym_cmds_RC | \
--    module_cmds_RC | \
--    module_expsym_cmds_RC | \
--    old_archive_from_expsyms_cmds_RC | \
--    export_symbols_cmds_RC | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-       ;;
--    *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-       ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
+-if
+-  test "x$enable_dependency_tracking" != xno \
+-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+-  am__fastdepCC_TRUE=
+-  am__fastdepCC_FALSE='#'
+-else
+-  am__fastdepCC_TRUE='#'
+-  am__fastdepCC_FALSE=
+-fi
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
 +      ;;
-+    none) break ;;
-     esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
++    esac
+ 
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
+ 
++solaris*)
++  case $cc_basename in
++  CC* | sunCC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
+ 
+-  if test "$GCC" = yes; then
+-    :
+-  else
+-    cat >confcache <<\_ACEOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
+-#
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
+-#
+-# `ac_cv_env_foo' variables (set or unset) will be overridden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
 +    fi
-   done
++    ;;
++  esac
++  ;;
++esac
  
--  case $lt_echo in
--  *'\$0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
--    ;;
--  esac
--
--cfgfile="$ofile"
--
--  cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
--
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
--
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
--
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_RC
--
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
--
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
--
--# The host system.
--host_alias=$host_alias
--host=$host
--
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
--
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
--
--# A C compiler.
--LTCC=$lt_LTCC
--
--# A language-specific compiler.
--CC=$lt_compiler_RC
--
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_RC
--
--# An ERE matcher.
--EGREP=$lt_EGREP
--
--# The linker used to build libraries.
--LD=$lt_LD_RC
--
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
--
--# A BSD-compatible nm program.
--NM=$lt_NM
--
--# A symbol stripping program
--STRIP=$lt_STRIP
--
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
--
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
--
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
--
--# Used on cygwin: assembler.
--AS=$lt_AS
--
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
--
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
--
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_RC
--
--# Object file suffix (normally "o").
--objext="$ac_objext"
--
--# Old archive suffix (normally "a").
--libext="$libext"
--
--# Shared library suffix (normally ".so").
--shrext='$shrext'
--
--# Executable file suffix (normally "").
--exeext="$exeext"
--
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_RC
--pic_mode=$pic_mode
--
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+-_ACEOF
+ 
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-{
+-  (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+-      sed -n \
+-	"s/'/'\\\\''/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
+-    *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+-      ;;
+-    esac;
+-} |
+-  sed '
+-     t clear
+-     : clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
+-  else
+-    echo "not updating unwritable cache $cache_file"
+-  fi
++case " $postdeps_CXX " in
++*" -lc "*) archive_cmds_need_lc_CXX=no ;;
++esac
++ compiler_lib_search_dirs_CXX=
++if test -n "${compiler_lib_search_path_CXX}"; then
++ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ fi
+-rm -f confcache
+-   { { echo "$as_me:$LINENO: error: the C compiler '$CC' is not a GNU C compiler." >&5
+-echo "$as_me: error: the C compiler '$CC' is not a GNU C compiler." >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+ 
+ 
+ 
+-# Configure inlining (XXX: need to probe gcc for support?)
 -
--# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
+-cat >>confdefs.h <<\_ACEOF
+-#define CR_INLINE static __inline__ __attribute__ ((__unused__))
+-_ACEOF
  
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
--# Do we need a version for libraries?
--need_version=$need_version
-+ if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
+-# Check for additional flags needed when building libcr
+-if test x"$cr_build_libcr" = xyes; then
+-CR_LIBCR_CFLAGS=""
  
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
+-    echo "$as_me:$LINENO: checking whether gcc accepts -Wall" >&5
+-echo $ECHO_N "checking whether gcc accepts -Wall... $ECHO_C" >&6
+-if test "${cr_cv_gcc_flag_WALL+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
  
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
+-    SAVE_CFLAGS=$CFLAGS
+-    CFLAGS="$CFLAGS -Wall"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
  
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
-+  if test "$GCC" = yes; then
-+    :
-+  else
-+    cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
+-int
+-main ()
+-{
  
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_RC
-+_ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  cr_cv_gcc_flag_WALL=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
+-cr_cv_gcc_flag_WALL=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-    CFLAGS=$SAVE_CFLAGS
  
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
-+fi
-+rm -f confcache
-+   as_fn_error $? "the C compiler '$CC' is not a GNU C compiler." "$LINENO" 5
-+  fi
+-fi
+-echo "$as_me:$LINENO: result: $cr_cv_gcc_flag_WALL" >&5
+-echo "${ECHO_T}$cr_cv_gcc_flag_WALL" >&6
  
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+-  if eval test $cr_cv_gcc_flag_WALL = yes; then
+-    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wall"
+-  else
+-    :
+-  fi
  
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
  
--# Library versioning type.
--version_type=$version_type
-+# Configure inlining (XXX: need to probe gcc for support?)
  
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
-+$as_echo "#define CR_INLINE static __inline__ __attribute__ ((__unused__))" >>confdefs.h
+-    echo "$as_me:$LINENO: checking whether gcc accepts -Wno-unused-function" >&5
+-echo $ECHO_N "checking whether gcc accepts -Wno-unused-function... $ECHO_C" >&6
+-if test "${cr_cv_gcc_flag_WNO_UNUSED_FUNCTION+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
  
--# List of archive names.  First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
+-    SAVE_CFLAGS=$CFLAGS
+-    CFLAGS="$CFLAGS -Wno-unused-function"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
  
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
-+# Check for additional flags needed when building libcr
-+if test x"$cr_build_libcr" = xyes; then
-+CR_LIBCR_CFLAGS=""
+-int
+-main ()
+-{
  
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_RC
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wall" >&5
-+$as_echo_n "checking whether gcc accepts -Wall... " >&6; }
-+if test "${cr_cv_gcc_flag_WALL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-+    SAVE_CFLAGS=$CFLAGS
-+    CFLAGS="$CFLAGS -Wall"
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+-cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-    CFLAGS=$SAVE_CFLAGS
  
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-+int
-+main ()
-+{
+-fi
+-echo "$as_me:$LINENO: result: $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&5
+-echo "${ECHO_T}$cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&6
  
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_RC
--archive_expsym_cmds=$lt_archive_expsym_cmds_RC
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  cr_cv_gcc_flag_WALL=yes
-+else
-+  cr_cv_gcc_flag_WALL=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    CFLAGS=$SAVE_CFLAGS
+-  if eval test $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION = yes; then
+-    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wno-unused-function"
+-  else
+-    :
+-  fi
  
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_RC
--module_expsym_cmds=$lt_module_expsym_cmds_RC
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_gcc_flag_WALL" >&5
-+$as_echo "$cr_cv_gcc_flag_WALL" >&6; }
  
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
-+  if eval test $cr_cv_gcc_flag_WALL = yes; then
-+    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wall"
-+  else
-+    :
-+  fi
  
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_predep_objects_RC
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_RC
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_RC
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_RC
+-fi # cr_build_libcr
+ 
+-# Additional flags needed when linking utils, tests and examples
+-CR_CLIENT_LDADD=""
+-if test x"$enable_all_static" = xyes; then
+-  CR_CLIENT_LDADD="$CR_CLIENT_LDADD -all-static"
+-fi
  
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_RC
  
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wno-unused-function" >&5
-+$as_echo_n "checking whether gcc accepts -Wno-unused-function... " >&6; }
-+if test "${cr_cv_gcc_flag_WNO_UNUSED_FUNCTION+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+-# If building the tests, we can optionally test C++
+-# Note, however, that  bug 2619 reports that we can't call this conditionally.
  
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
-+    SAVE_CFLAGS=$CFLAGS
-+    CFLAGS="$CFLAGS -Wno-unused-function"
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+-  # Totally gross way to perform a non-fatal probe for CXX
  
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_RC
-+int
-+main ()
-+{
  
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_RC
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=yes
-+else
-+  cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    CFLAGS=$SAVE_CFLAGS
  
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&5
-+$as_echo "$cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&6; }
++    lt_prog_compiler_wl_CXX=
++lt_prog_compiler_pic_CXX=
++lt_prog_compiler_static_CXX=
  
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
-+  if eval test $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION = yes; then
-+    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wno-unused-function"
-+  else
-+    :
-+  fi
+-  # Now validate the choice
+-  if test "x$CXX" != xno; then
  
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    lt_prog_compiler_wl_CXX='-Wl,'
++    lt_prog_compiler_static_CXX='-static'
  
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-    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
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_CXX='-Bstatic'
++      fi
++      ;;
  
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+fi # cr_build_libcr
+-    echo "$as_me:$LINENO: checking for void *" >&5
+-echo $ECHO_N "checking for void *... $ECHO_C" >&6
+-if test "${ac_cv_type_void_p+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((void * *) 0)
+-  return 0;
+-if (sizeof (void *))
+-  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_cv_type_void_p=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            lt_prog_compiler_pic_CXX='-fPIC'
++        ;;
++      m68k)
++            # FIXME: we need at least 68020 code to build shared libraries, but
++            # adding the `-m68020' flag to GCC prevents building anything better,
++            # like `-m68040'.
++            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
++        ;;
++      esac
++      ;;
  
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
-+# Additional flags needed when linking utils, tests and examples
-+CR_CLIENT_LDADD=""
-+if test x"$enable_all_static" = xyes; then
-+  CR_CLIENT_LDADD="$CR_CLIENT_LDADD -all-static"
-+fi
+-ac_cv_type_void_p=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
+-echo "${ECHO_T}$ac_cv_type_void_p" >&6
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | cygwin* | os2* | pw32* | cegcc*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_CXX='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      lt_prog_compiler_pic_CXX=
++      ;;
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      lt_prog_compiler_static_CXX=
++      ;;
++    interix[3-9]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_CXX=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
++      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
++      # sets the default TLS model and affects inlining.
++      case $host_cpu in
++      hppa*64*)
++	;;
++      *)
++	lt_prog_compiler_pic_CXX='-fPIC'
++	;;
++      esac
++      ;;
++    *qnx* | *nto*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      lt_prog_compiler_pic_CXX='-fPIC -shared'
++      ;;
++    *)
++      lt_prog_compiler_pic_CXX='-fPIC'
++      ;;
++    esac
++  else
++    case $host_os in
++      aix[4-9]*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  lt_prog_compiler_static_CXX='-Bstatic'
++	else
++	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68*)
++	  # Green Hills C++ Compiler
++	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++      mingw* | cygwin* | os2* | pw32* | cegcc*)
++	# This hack is so that the source file can tell whether it is being
++	# built for inclusion in a dll (and should export symbols for example).
++	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++	;;
++      dgux*)
++	case $cc_basename in
++	  ec++*)
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  ghcx*)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | dragonfly*)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC*)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
++	    if test "$host_cpu" != ia64; then
++	      lt_prog_compiler_pic_CXX='+Z'
++	    fi
++	    ;;
++	  aCC*)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
++	    case $host_cpu in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      lt_prog_compiler_pic_CXX='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC*)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
++	case $cc_basename in
++	  KCC*)
++	    # KAI C++ Compiler
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    ;;
++	  ecpc* )
++	    # old Intel C++ for x86_64 which still supported -KPIC.
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-static'
++	    ;;
++	  icpc* )
++	    # Intel C++, used to be incompatible with GCC.
++	    # ICC 10 doesn't accept -KPIC any more.
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    lt_prog_compiler_static_CXX='-static'
++	    ;;
++	  pgCC* | pgcpp*)
++	    # Portland Group C++ compiler
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-fpic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  cxx*)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
++	    # IBM XL 8.0, 9.0 on PPC and BlueGene
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-qpic'
++	    lt_prog_compiler_static_CXX='-qstaticlink'
++	    ;;
++	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      lt_prog_compiler_pic_CXX='-KPIC'
++	      lt_prog_compiler_static_CXX='-Bstatic'
++	      lt_prog_compiler_wl_CXX='-Qoption ld '
++	      ;;
++	    esac
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx*)
++	    lt_prog_compiler_pic_CXX='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd* | netbsdelf*-gnu)
++	;;
++      *qnx* | *nto*)
++        # QNX uses GNU C++, but need to define -shared option too, otherwise
++        # it will coredump.
++        lt_prog_compiler_pic_CXX='-fPIC -shared'
++        ;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC*)
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    ;;
++	  RCC*)
++	    # Rational C++ 2.4.1
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  cxx*)
++	    # Digital/Compaq C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC* | sunCC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    lt_prog_compiler_wl_CXX='-Qoption ld '
++	    ;;
++	  gcx*)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.x
++	    lt_prog_compiler_pic_CXX='-pic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  lcc*)
++	    # Lucid
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC*)
++	    # NonStop-UX NCC 3.20
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      vxworks*)
++	;;
++      *)
++	lt_prog_compiler_can_build_shared_CXX=no
++	;;
++    esac
++  fi
  
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
+-echo "$as_me:$LINENO: checking size of void *" >&5
+-echo $ECHO_N "checking size of void *... $ECHO_C" >&6
+-if test "${ac_cv_sizeof_void_p+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test "$ac_cv_type_void_p" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)];
+-test_array [0] = 0
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_CXX=
++    ;;
++  *)
++    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
++    ;;
++esac
  
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+# If building the tests, we can optionally test C++
-+# Note, however, that  bug 2619 reports that we can't call this conditionally.
-+  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CXX+set}" = set; then :
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+-test_array [0] = 0
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
++$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+  if test -n "$CXX"; then
-+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_RC
-+fi
-+fi
-+CXX=$ac_cv_prog_CXX
-+if test -n "$CXX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-+$as_echo "$CXX" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
 +fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
++lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
  
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
- 
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-+    test -n "$CXX" && break
-+  done
-+fi
-+if test -z "$CXX"; then
-+  ac_ct_CXX=$CXX
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_CXX"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
++if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+  if test -n "$ac_ct_CXX"; then
-+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CXX="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
++  lt_cv_prog_compiler_pic_works_CXX=no
++   ac_outfile=conftest.$ac_objext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -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:$LINENO: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $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 other than the usual output.
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_pic_works_CXX=yes
++     fi
++   fi
++   $RM conftest*
  
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
--
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_RC
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_RC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)];
+-test_array [0] = 0
 -
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)];
+-test_array [0] = 0
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=$ac_mid; break
++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
++    case $lt_prog_compiler_pic_CXX in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
++     esac
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_RC
-+fi
-+fi
-+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++    lt_prog_compiler_pic_CXX=
++     lt_prog_compiler_can_build_shared_CXX=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+-test_array [0] = 0
  
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_RC
-+  test -n "$ac_ct_CXX" && break
-+done
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=$ac_mid
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+  if test "x$ac_ct_CXX" = x; then
-+    CXX="g++"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CXX=$ac_ct_CXX
-+  fi
-+fi
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_void_p=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (void *), 77
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-long longval () { return (long) (sizeof (void *)); }
+-unsigned long ulongval () { return (long) (sizeof (void *)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
  
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+  fi
-+fi
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+  fi
-+  rm -f conftest.er1 conftest.err
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if (((long) (sizeof (void *))) < 0)
+-    {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (void *))))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (void *))))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_sizeof_void_p=`cat conftest.val`
 +
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
++if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  lt_cv_prog_compiler_static_works_CXX=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_cv_prog_compiler_static_works_CXX=yes
++       fi
++     else
++       lt_cv_prog_compiler_static_works_CXX=yes
++     fi
++   fi
++   $RM -r conftest*
++   LDFLAGS="$save_LDFLAGS"
+ 
+-( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (void *), 77
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.val
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
++
++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
++    :
+ else
+-  ac_cv_sizeof_void_p=0
+-fi
++    lt_prog_compiler_static_CXX=
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+-_ACEOF
+-
+-
+-    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
  
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_RC"
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
+-    echo "$as_me:$LINENO: checking whether CXX='$CXX' acts like a C++ compiler" >&5
+-echo $ECHO_N "checking whether CXX='$CXX' acts like a C++ compiler... $ECHO_C" >&6
+-if test "${cr_cv_cxx_is_cxx+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
  
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_RC
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
-+  ac_compiler_gnu=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+-      cr_cv_cxx_is_cxx=no
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
  
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_RC
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GXX=yes
-+else
-+  GXX=
-+fi
-+ac_test_CXXFLAGS=${CXXFLAGS+set}
-+ac_save_CXXFLAGS=$CXXFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+-	#ifndef __cplusplus
+-	    #error __cplusplus must be defined in a C++ compilation!
+-	#endif
+ 
+-int
+-main ()
+-{
+- int x = 1;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { 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
+-  cr_cv_cxx_is_cxx=yes
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+   ac_cxx_werror_flag=yes
-+   ac_cv_prog_cxx_g=no
-+   CXXFLAGS="-g"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  lt_cv_prog_compiler_c_o_CXX=no
++   $RM -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+int
-+main ()
-+{
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -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:$LINENO: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $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
++     # So say no if there are warnings
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_c_o_CXX=yes
++     fi
++   fi
++   chmod u+w . 2>&5
++   $RM conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++   $RM out/* && rmdir out
++   cd ..
++   $RM -r conftest
++   $RM conftest*
  
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_RC
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
-+else
-+  CXXFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_cxx_is_cxx" >&5
+-echo "${ECHO_T}$cr_cv_cxx_is_cxx" >&6
+-    if test x"$cr_cv_cxx_is_cxx" = xyes; then
+-      echo "$as_me:$LINENO: checking whether CXX='$CXX' matches wordsize of CC" >&5
+-echo $ECHO_N "checking whether CXX='$CXX' matches wordsize of CC... $ECHO_C" >&6
+-if test "${cr_cv_cxx_voidp+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
  
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_RC
-+int
-+main ()
-+{
+-        cr_cv_cxx_voidp=no
+-        cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
  
--# ### END LIBTOOL TAG CONFIG: $tagname
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
+-	  #ifndef __cplusplus
+-	      #error __cplusplus must be defined in a C++ compilation!
+-	  #endif
  
--__EOF__
-+else
-+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+-int
+-main ()
+-{
+- int a[(($ac_cv_sizeof_void_p == sizeof(void *))? 1 : -1)];
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { 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
+-  cr_cv_cxx_voidp=yes
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
++if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  lt_cv_prog_compiler_c_o_CXX=no
++   $RM -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-+int
-+main ()
-+{
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -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:$LINENO: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $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
++     # So say no if there are warnings
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_c_o_CXX=yes
++     fi
++   fi
++   chmod u+w . 2>&5
++   $RM conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++   $RM out/* && rmdir out
++   cd ..
++   $RM -r conftest
++   $RM conftest*
  
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-+$as_echo "$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-+  fi
- else
--  # If 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.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-   fi
  fi
+-echo "$as_me:$LINENO: result: $cr_cv_cxx_voidp" >&5
+-echo "${ECHO_T}$cr_cv_cxx_voidp" >&6
+-    fi
+-    ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -
+-    if test x"$cr_cv_cxx_is_cxx$cr_cv_cxx_voidp" != xyesyes; then
+-      CXX=no
+-    fi
+-  fi
 -
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--CC="$lt_save_CC"
-+depcc="$CXX"  am_compiler_list=
+-
+-################################################################################
+-# Check libraries
+-################################################################################
+-
+-if test x"$cr_build_libcr" = xyes; then
+-# Check for a sufficiently new glibc
+-# XXX: What is our true lower bound?
+-
+-    echo "$as_me:$LINENO: checking for GNU libc version >= 2.2" >&5
+-echo $ECHO_N "checking for GNU libc version >= 2.2... $ECHO_C" >&6
+-if test "${cr_cv_check_glibc_2_2_or_higher+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
  
--	;;
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
+-	#include <features.h>
+-	#ifndef __GLIBC_PREREQ
+-	    #define __GLIBC_PREREQ(maj, min) \
+-		((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
+-	#endif
+-	#if !__GLIBC_PREREQ(2, 2)
+-	    #error "Bad glibc version"
+-	#endif
+-	extern int gnu_get_libc_version(void); /* Ensures this *is* glibc */
  
--      *)
--	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
--echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
--   { (exit 1); exit 1; }; }
--	;;
--      esac
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  am__universal=false
-+  case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac
+-int
+-main ()
+-{
  
--      # Append the new tag name to the list of available tags.
--      if test -n "$tagname" ; then
--      available_tags="$available_tags $tagname"
--    fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-     fi
-   done
--  IFS="$lt_save_ifs"
+-	return !gnu_get_libc_version();
  
--  # Now substitute the updated list of available tags.
--  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
--    mv "${ofile}T" "$ofile"
--    chmod +x "$ofile"
--  else
--    rm -f "${ofile}T"
--    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
--echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
--   { (exit 1); exit 1; }; }
--  fi
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  cr_cv_check_glibc_2_2_or_higher=yes
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
++$as_echo_n "checking if we can lock with hard links... " >&6; }
++  hard_links=yes
++  $RM conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
++$as_echo "$hard_links" >&6; }
++  if test "$hard_links" = no; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cr_cv_check_glibc_2_2_or_higher=no
++  need_locks=no
  fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
  
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+-fi
+-echo "$as_me:$LINENO: result: $cr_cv_check_glibc_2_2_or_higher" >&5
+-echo "${ECHO_T}$cr_cv_check_glibc_2_2_or_higher" >&6
  
-+ if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
+-  if eval test $cr_cv_check_glibc_2_2_or_higher = yes; then
+-    :
+-  else
+-    cat >confcache <<\_ACEOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
+-#
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
+-#
+-# `ac_cv_env_foo' variables (set or unset) will be overridden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
  
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
--
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--
--# Prevent multiple expansion
+-_ACEOF
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-{
+-  (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+-      sed -n \
+-	"s/'/'\\\\''/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
++  case $host_os in
++  aix[4-9]*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    # Also, AIX nm treats weak defined symbols like other global defined
++    # symbols, whereas GNU nm marks them as "W".
++    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
++      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++    else
++      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    export_symbols_cmds_CXX="$ltdll_cmds"
++    ;;
++  cygwin* | mingw* | cegcc*)
++    case $cc_basename in
++    cl*) ;;
+     *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
++      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+       ;;
+-    esac;
+-} |
+-  sed '
+-     t clear
+-     : clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
+-  else
+-    echo "not updating unwritable cache $cache_file"
+-  fi
+-fi
+-rm -f confcache
+-   { { echo "$as_me:$LINENO: error: the C library does not appear to be glibc 2.2 or higher." >&5
+-echo "$as_me: error: the C library does not appear to be glibc 2.2 or higher." >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
++    esac
++    ;;
++  linux* | k*bsd*-gnu | gnu*)
++    link_all_deplibs_CXX=no
++    ;;
++  *)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++    ;;
++  esac
  
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
++$as_echo "$ld_shlibs_CXX" >&6; }
++test "$ld_shlibs_CXX" = no && can_build_shared=no
  
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CXX"; then
-+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
++with_gnu_ld_CXX=$with_gnu_ld
  
-+fi
-+fi
-+CXX=$ac_cv_prog_CXX
-+if test -n "$CXX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-+$as_echo "$CXX" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+-# Checks for required libraries and fail if they are not found
+-# Note that we are NOT adding them to LIBS, just verifying their presence.
+-echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
+-echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlsym+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
  
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlsym ();
+-int
+-main ()
+-{
+-dlsym ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dl_dlsym=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
-+    test -n "$CXX" && break
-+  done
-+fi
-+if test -z "$CXX"; then
-+  ac_ct_CXX=$CXX
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CXX"; then
-+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CXX="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
+-ac_cv_lib_dl_dlsym=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
+-if test $ac_cv_lib_dl_dlsym = yes; then
+-  :
+-else
+-  cat >confcache <<\_ACEOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
+-#
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
+-#
+-# `ac_cv_env_foo' variables (set or unset) will be overridden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
  
-+fi
-+fi
-+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+-_ACEOF
  
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-{
+-  (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+-      sed -n \
+-	"s/'/'\\\\''/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
+-    *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+-      ;;
+-    esac;
+-} |
+-  sed '
+-     t clear
+-     : clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
+-  else
+-    echo "not updating unwritable cache $cache_file"
+-  fi
+-fi
+-rm -f confcache
+-   { { echo "$as_me:$LINENO: error: required library libdl not found." >&5
+-echo "$as_me: error: required library libdl not found." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
  
-+  test -n "$ac_ct_CXX" && break
-+done
+-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_CXX" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_CXX=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_CXX in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
++$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
++if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++  $RM conftest*
++	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-+  if test "x$ac_ct_CXX" = x; then
-+    CXX="g++"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CXX=$ac_ct_CXX
-+  fi
-+fi
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char pthread_create ();
+-int
+-main ()
+-{
+-pthread_create ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++  (eval $ac_compile) 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
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } 2>conftest.err; then
++	  soname=conftest
++	  lib=conftest
++	  libobjs=conftest.$ac_objext
++	  deplibs=
++	  wl=$lt_prog_compiler_wl_CXX
++	  pic_flag=$lt_prog_compiler_pic_CXX
++	  compiler_flags=-v
++	  linker_flags=-v
++	  verstring=
++	  output_objdir=.
++	  libname=conftest
++	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++	  allow_undefined_flag_CXX=
++	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_pthread_pthread_create=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++	  then
++	    lt_cv_archive_cmds_need_lc_CXX=no
++	  else
++	    lt_cv_archive_cmds_need_lc_CXX=yes
++	  fi
++	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++	else
++	  cat conftest.err 1>&5
++	fi
++	$RM conftest*
  
-+  fi
-+fi
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
+-ac_cv_lib_pthread_pthread_create=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+-if test $ac_cv_lib_pthread_pthread_create = yes; then
+-  :
+-else
+-  cat >confcache <<\_ACEOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
+-#
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
+-#
+-# `ac_cv_env_foo' variables (set or unset) will be overridden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
+-
+-_ACEOF
+-
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-{
+-  (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+-      sed -n \
+-	"s/'/'\\\\''/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
+-    *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
++$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
++      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+       ;;
+-    esac;
+-} |
+-  sed '
+-     t clear
+-     : clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
+-  else
+-    echo "not updating unwritable cache $cache_file"
++    esac
+   fi
+-fi
+-rm -f confcache
+-   { { echo "$as_me:$LINENO: error: required library libpthread not found." >&5
+-echo "$as_me: error: required library libpthread not found." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
++  ;;
 +esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+  fi
-+  rm -f conftest.er1 conftest.err
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
  
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
-+  ac_compiler_gnu=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GXX=yes
-+else
-+  GXX=
-+fi
-+ac_test_CXXFLAGS=${CXXFLAGS+set}
-+ac_save_CXXFLAGS=$CXXFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-+if test "${ac_cv_prog_cxx_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+   ac_cxx_werror_flag=yes
-+   ac_cv_prog_cxx_g=no
-+   CXXFLAGS="-g"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+-# Prep a variable for possible use in messages below
+-if test x"$enable_multilib" = xyes; then
+-  ldsuggest='-L/usr/lib/nptl -L/usr/lib64/nptl'
+-elif test x"$ac_cv_sizeof_void_p" = x8; then
+-  ldsuggest='-L/usr/lib64/nptl'
+-else
+-  ldsuggest='-L/usr/lib/nptl'
+-fi
  
-+int
-+main ()
-+{
+-# Helper for LinuxThreads probes
+-# CR_LT_PROBE(cv_varname, cross_varname)
  
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
-+else
-+  CXXFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
-+int
-+main ()
-+{
+-# Look for LinuxThreads in the default (probably dynamic) library
+-echo "$as_me:$LINENO: checking whether default pthreads library is LinuxThreads" >&5
+-echo $ECHO_N "checking whether default pthreads library is LinuxThreads... $ECHO_C" >&6
+-if test "${cr_cv_pt_default_lt+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
  
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
+-  SAVE_LIBS="$LIBS"
+-  LIBS="-lpthread $LIBS"
  
-+else
-+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+-  if test "$cross_compiling" = yes; then
  
-+int
-+main ()
-+{
  
--if test x"$enable_static$enable_all_static" = xnoyes; then
--  { { echo "$as_me:$LINENO: error: You cannot pass --enable-all-static without one of --enable-static or --disable-shared" >&5
--echo "$as_me: error: You cannot pass --enable-all-static without one of --enable-static or --disable-shared" >&2;}
+-  if test "${cross_linuxthreads-unset}" = unset; then
+-    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_linuxthreads must be set." >&5
+-echo "$as_me: error: When cross-compiling, variable cross_linuxthreads must be set." >&2;}
 -   { (exit 1); exit 1; }; }
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-+$as_echo "$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-+  fi
-+else
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
- fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+depcc="$CXX"  am_compiler_list=
- 
--if test $enable_static = yes; then
--  CR_ENABLE_STATIC_TRUE=
--  CR_ENABLE_STATIC_FALSE='#'
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  CR_ENABLE_STATIC_TRUE='#'
--  CR_ENABLE_STATIC_FALSE=
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  am__universal=false
-+  case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac
-+
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
- fi
- 
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
--
--if test $enable_shared = yes; then
--  CR_ENABLE_SHARED_TRUE=
--  CR_ENABLE_SHARED_FALSE='#'
-+ if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
- else
--  CR_ENABLE_SHARED_TRUE='#'
--  CR_ENABLE_SHARED_FALSE=
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
- fi
- 
- 
--# Check for rpmbuild
--
--  for ac_prog in rpmbuild rpmb rpm
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_RPMBUILD+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-+if test -z "$CXXCPP"; then
-+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  case $RPMBUILD in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_RPMBUILD="$RPMBUILD" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--as_dummy="$PATH:/usr/lib/rpm"
--for as_dir in $as_dummy
-+      # Double quotes because CXXCPP needs to be expanded
-+    for CXXCPP in "$CXX -E" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
- do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
 -  fi
--done
--done
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
- 
--  ;;
--esac
-+else
-+  # Broken: fails on valid input.
-+continue
- fi
--RPMBUILD=$ac_cv_path_RPMBUILD
-+rm -f conftest.err conftest.i conftest.$ac_ext
  
--if test -n "$RPMBUILD"; then
--  echo "$as_me:$LINENO: result: $RPMBUILD" >&5
--echo "${ECHO_T}$RPMBUILD" >&6
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
- fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
+-    if test x"$cross_linuxthreads" != x0; then
+-  cr_cv_pt_default_lt=yes
+-else
+-  cr_cv_pt_default_lt=no
+-fi
  
--  test -n "$RPMBUILD" && break
- done
--test -n "$RPMBUILD" || RPMBUILD="none"
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.i conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  break
-+fi
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
  
--  if $RPMBUILD -bs 2>&1 | grep 'no spec' >/dev/null 2>/dev/null; then
--    :
--  else
--    RPMBUILD=none
--  fi
-+    done
-+    ac_cv_prog_CXXCPP=$CXXCPP
+-	#include <sys/types.h>
+-	#include <unistd.h>
+-	#include <stdio.h>
+-	#include <pthread.h>
  
-+fi
-+  CXXCPP=$ac_cv_prog_CXXCPP
-+else
-+  ac_cv_prog_CXXCPP=$CXXCPP
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-+$as_echo "$CXXCPP" >&6; }
-+ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
+-	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
  
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
+-	int main(void) {
+-	    pthread_t th;
+-	    void *join_val;
  
--if test $RPMBUILD != none; then
--  HAVE_RPMBUILD_TRUE=
--  HAVE_RPMBUILD_FALSE='#'
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
- else
--  HAVE_RPMBUILD_TRUE='#'
--  HAVE_RPMBUILD_FALSE=
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
- fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
+-	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
+-		fputs("Error calling pthread_create()\n", stderr);
+-		return -1;
+-	    }
+-	    if (0 != pthread_join(th, &join_val)) {
+-		fputs("Error calling pthread_join()\n", stderr);
+-		return -1;
+-	    }
  
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.i conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
+-	    /* zero = NOT equal pids = LinuxThreads */
+-	    return ((long)join_val == (long)getpid());
+-	}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_pt_default_lt=yes
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
--# Check for a GNU C compiler (or a work alike?)
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+_lt_caught_CXX_error=yes; }
-+fi
+-( exit $ac_status )
+-cr_cv_pt_default_lt=no
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
  
--  ac_ext=c
-+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
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
--set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
- else
--  if test -n "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
-+  _lt_caught_CXX_error=yes
-+fi
-+
-+
-+
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CXX"; then
-+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_CC="${ac_tool_prefix}gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
-+IFS=$as_save_IFS
+-  LIBS="$SAVE_LIBS"
  
- fi
- fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+CXX=$ac_cv_prog_CXX
-+if test -n "$CXX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-+$as_echo "$CXX" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
+-echo "$as_me:$LINENO: result: $cr_cv_pt_default_lt" >&5
+-echo "${ECHO_T}$cr_cv_pt_default_lt" >&6
+-if test x"$cr_cv_pt_default_lt" = xyes; then
+-  { { echo "$as_me:$LINENO: error: linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&5
+-echo "$as_me: error: linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
  
-+
-+    test -n "$CXX" && break
-+  done
- fi
--if test -z "$ac_cv_prog_CC"; then
--  ac_ct_CC=$CC
--  # Extract the first word of "gcc", so it can be a program name with args.
--set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-# Now look for LinuxThreads in the static libs if we are building static ones ourself
+-if test x"$enable_static" = xyes; then
+-  # Look for LinuxThreads in the static library
+-  echo "$as_me:$LINENO: checking whether static pthreads library is LinuxThreads" >&5
+-echo $ECHO_N "checking whether static pthreads library is LinuxThreads... $ECHO_C" >&6
+-if test "${cr_cv_pt_static_lt+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -z "$CXX"; then
-+  ac_ct_CXX=$CXX
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+  if test -n "$ac_ct_CXX"; then
-+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CXX="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_CXX" && break
- done
+-else
  
-+  if test "x$ac_ct_CXX" = x; then
-+    CXX="g++"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CXX=$ac_ct_CXX
-+  fi
- fi
-+
-+  fi
- fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+  fi
-+  rm -f conftest.er1 conftest.err
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  ac_compiler_gnu=no
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+-    SAVE_LIBS="$LIBS"
+-    SAVE_LDFLAGS="$LDFLAGS"
+-    LDFLAGS="$LDFLAGS -static"
+-    LIBS="-lpthread $LIBS"
  
--  CC=$ac_ct_CC
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GXX=yes
- else
--  CC="$ac_cv_prog_CC"
-+  GXX=
- fi
-+ac_test_CXXFLAGS=${CXXFLAGS+set}
-+ac_save_CXXFLAGS=$CXXFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-+if test "${ac_cv_prog_cxx_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+   ac_cxx_werror_flag=yes
-+   ac_cv_prog_cxx_g=no
-+   CXXFLAGS="-g"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+-  if test "$cross_compiling" = yes; then
  
--if test -z "$CC"; then
--  if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
--set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
- else
--  if test -n "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
-+  CXXFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+
- else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_CC="${ac_tool_prefix}cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
+ 
+-  if test "${cross_linuxthreads_static-unset}" = unset; then
+-    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_linuxthreads_static must be set." >&5
+-echo "$as_me: error: When cross-compiling, variable cross_linuxthreads_static must be set." >&2;}
+-   { (exit 1); exit 1; }; }
 -  fi
--done
--done
-+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
+-    if test x"$cross_linuxthreads_static" != x0; then
+-  cr_cv_pt_static_lt=yes
 -else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- fi
--if test -z "$ac_cv_prog_CC"; then
--  ac_ct_CC=$CC
--  # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-+$as_echo "$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-+  fi
- else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+depcc="$CXX"  am_compiler_list=
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
+-  cr_cv_pt_static_lt=no
+-fi
+ 
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-	#include <sys/types.h>
+-	#include <unistd.h>
+-	#include <stdio.h>
+-	#include <pthread.h>
+ 
+-	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
+ 
+-	int main(void) {
+-	    pthread_t th;
+-	    void *join_val;
+ 
+-	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
+-		fputs("Error calling pthread_create()\n", stderr);
+-		return -1;
+-	    }
+-	    if (0 != pthread_join(th, &join_val)) {
+-		fputs("Error calling pthread_join()\n", stderr);
+-		return -1;
+-	    }
+ 
+-	    /* zero = NOT equal pids = LinuxThreads */
+-	    return ((long)join_val == (long)getpid());
+-	}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_pt_static_lt=yes
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+-cr_cv_pt_static_lt=no
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+ 
+-    LIBS="$SAVE_LIBS"
+-    LDFLAGS="$SAVE_LDFLAGS"
+ 
+-fi
+-echo "$as_me:$LINENO: result: $cr_cv_pt_static_lt" >&5
+-echo "${ECHO_T}$cr_cv_pt_static_lt" >&6
+-  if test x"$cr_cv_pt_static_lt" = xyes; then
+-    { echo "$as_me:$LINENO: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&5
+-echo "$as_me: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&2;}
+-    cr_static_link_warning="yes"
+-    if test x"$enable_all_static" = xyes; then
+-      cat >confcache <<\_ACEOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
+-#
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
+-#
+-# `ac_cv_env_foo' variables (set or unset) will be overridden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
+ 
+-_ACEOF
+ 
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-{
+-  (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+-      sed -n \
+-	"s/'/'\\\\''/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
+-    *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+-      ;;
+-    esac;
+-} |
+-  sed '
+-     t clear
+-     : clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-   fi
--done
--done
-+  am__universal=false
-+  case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac
 +
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 +
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
 +
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
- 
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 +
-+ if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
- fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
 +
 +
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +
-+archive_cmds_need_lc_CXX=no
-+allow_undefined_flag_CXX=
-+always_export_symbols_CXX=no
-+archive_expsym_cmds_CXX=
-+compiler_needs_object_CXX=no
-+export_dynamic_flag_spec_CXX=
-+hardcode_direct_CXX=no
-+hardcode_direct_absolute_CXX=no
-+hardcode_libdir_flag_spec_CXX=
-+hardcode_libdir_flag_spec_ld_CXX=
-+hardcode_libdir_separator_CXX=
-+hardcode_minus_L_CXX=no
-+hardcode_shlibpath_var_CXX=unsupported
-+hardcode_automatic_CXX=no
-+inherit_rpath_CXX=no
-+module_cmds_CXX=
-+module_expsym_cmds_CXX=
-+link_all_deplibs_CXX=unknown
-+old_archive_cmds_CXX=$old_archive_cmds
-+no_undefined_flag_CXX=
-+whole_archive_flag_spec_CXX=
-+enable_shared_with_static_runtimes_CXX=no
 +
-+# Source file extension for C++ test sources.
-+ac_ext=cpp
 +
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+objext_CXX=$objext
 +
-+# No sense in running all these tests if we already determined that
-+# the CXX compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_caught_CXX_error" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="int some_variable = 0;"
 +
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 +
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +
 +
 +
 +
 +
 +
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
 +
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
 +
 +
-+  # save warnings/boilerplate of simple test code
-+  ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$RM conftest*
 +
-+  ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$RM -r conftest*
 +
 +
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC=$CC
-+  lt_save_LD=$LD
-+  lt_save_GCC=$GCC
-+  GCC=$GXX
-+  lt_save_with_gnu_ld=$with_gnu_ld
-+  lt_save_path_LD=$lt_cv_path_LD
-+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+  else
-+    $as_unset lt_cv_prog_gnu_ld
-+  fi
-+  if test -n "${lt_cv_path_LDCXX+set}"; then
-+    lt_cv_path_LD=$lt_cv_path_LDCXX
++
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
++$as_echo_n "checking dynamic linker characteristics... " >&6; }
++
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix[4-9]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
+   else
+-    echo "not updating unwritable cache $cache_file"
+-  fi
+-fi
+-rm -f confcache
+-      { { echo "$as_me:$LINENO: error: static linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&5
+-echo "$as_me: error: static linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&2;}
+-   { (exit 1); exit 1; }; }
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
+     fi
++    shlibpath_var=LIBPATH
+   fi
+-fi
++  ;;
+ 
+-# Check for atfork handling
++amigaos*)
++  case $host_cpu in
++  powerpc)
++    # Since July 2007 AmigaOS4 officially supports .so libraries.
++    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    ;;
++  m68k)
++    library_names_spec='$libname.ixlibrary $libname.a'
++    # Create ${libname}_ixlibrary.a entries in /sys/libs.
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    ;;
++  esac
++  ;;
+ 
+-for ac_func in __register_atfork
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++cygwin* | mingw* | pw32* | cegcc*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
+ 
+-#undef $ac_func
++  case $GCC,$cc_basename in
++  yes,*)
++    # gcc
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname~
++      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++      fi'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ 
+-int
+-main ()
+-{
+-return f != $ac_func;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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 "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++      ;;
++    mingw* | cegcc*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    dynamic_linker='Win32 ld.exe'
++    ;;
+ 
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++  *,cl*)
++    # Native MSVC
++    libname_spec='$name'
++    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++    library_names_spec='${libname}.dll.lib'
+ 
+-fi
+-done
++    case $build_os in
++    mingw*)
++      sys_lib_search_path_spec=
++      lt_save_ifs=$IFS
++      IFS=';'
++      for lt_path in $LIB
++      do
++        IFS=$lt_save_ifs
++        # Let DOS variable expansion print the short 8.3 style file name.
++        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
++        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
++      done
++      IFS=$lt_save_ifs
++      # Convert to MSYS style.
++      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
++      ;;
++    cygwin*)
++      # Convert to unix form, then to dos form, then back to unix form
++      # but this time dos style (no spaces!) so that the unix form looks
++      # like /cygdrive/c/PROGRA~1:/cygdr...
++      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
++      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
++      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++      ;;
++    *)
++      sys_lib_search_path_spec="$LIB"
++      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH.
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      # FIXME: find the short name or the path components, as spaces are
++      # common. (e.g. "Program Files" -> "PROGRA~1")
++      ;;
++    esac
+ 
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
++    dynamic_linker='Win32 link.exe'
++    ;;
+ 
+-# Check for call to disable NSCD
++  *)
++    # Assume MSVC wrapper
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    dynamic_linker='Win32 ld.exe'
++    ;;
++  esac
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
+ 
+-for ac_func in __nss_disable_nscd
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
 +  else
-+    $as_unset lt_cv_path_LD
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
 +  fi
-+  test -z "${LDCXX+set}" || LD=$LDCXX
-+  CC=${CXX-"c++"}
-+  compiler=$CC
-+  compiler_CXX=$CC
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
 +  esac
-+done
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+
-+  if test -n "$compiler"; then
-+    # We don't want -fno-exception when compiling C++ code, so set the
-+    # no_builtin_flag separately
-+    if test "$GXX" = yes; then
-+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.[01]* | freebsdelf3.[01]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
+ 
+-#undef $ac_func
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++haiku*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  dynamic_linker="$host_os runtime_loader"
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
++  hardcode_into_libs=yes
++  ;;
+ 
+-int
+-main ()
+-{
+-return f != $ac_func;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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 "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case $host_cpu in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
 +    else
-+      lt_prog_compiler_no_builtin_flag_CXX=
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
 +    fi
-+
-+    if test "$GXX" = yes; then
-+      # Set up default GNU C++ configuration
-+
-+
-+
-+# Check whether --with-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then :
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
-+fi
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-+$as_echo_n "checking for ld used by $CC... " >&6; }
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++  hppa*64*)
++    shrext_cmds='.sl'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
 +  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
 +  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [\\/]* | ?:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
++  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
++  postinstall_cmds='chmod 555 $lib'
++  # or fails outright, so override atomically:
++  install_override_mode=555
++  ;;
+ 
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++interix[3-9]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
+ 
+-fi
+-done
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
 +    ;;
 +  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
 +    ;;
 +  esac
-+elif test "$with_gnu_ld" = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-+$as_echo_n "checking for GNU ld... " >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-+$as_echo_n "checking for non-GNU ld... " >&6; }
-+fi
-+if test "${lt_cv_path_LD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some variants of GNU ld only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
+ 
+-# Check for pthread_attr_setstacksize
+-SAVE_LIBS="$LIBS"
+-LIBS="-lpthread $LIBS"
++# This must be Linux ELF.
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
+ 
+-for ac_func in pthread_attr_setstacksize
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  # Some binutils ld are patched to set DT_RUNPATH
++  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  lt_cv_shlibpath_overrides_runpath=no
++    save_LDFLAGS=$LDFLAGS
++    save_libdir=$libdir
++    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
++	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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 "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
++if ac_fn_cxx_try_link "$LINENO"; then :
++  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
++  lt_cv_shlibpath_overrides_runpath=yes
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++    LDFLAGS=$save_LDFLAGS
++    libdir=$save_libdir
+ 
+ fi
+-done
+-
+-LIBS="$SAVE_LIBS"
+-
+-# Look for prctl(PR_SET_PDEATHSIG, ...)
+-echo "$as_me:$LINENO: checking for pctrl()" >&5
+-echo $ECHO_N "checking for pctrl()... $ECHO_C" >&6
+-if test "${cr_cv_prctl+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+ 
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+ 
+-    #include <sys/prctl.h>
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
+ 
+-int
+-main ()
+-{
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
+ 
+-    int rc = prctl(PR_SET_PDEATHSIG, 0);
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  cr_cv_prctl=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
+ 
+-cr_cv_prctl=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
+ 
+-fi
+-echo "$as_me:$LINENO: result: $cr_cv_prctl" >&5
+-echo "${ECHO_T}$cr_cv_prctl" >&6
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-  if test x$cr_cv_prctl = xyes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PRCTL 1
+-_ACEOF
++*nto* | *qnx*)
++  version_type=qnx
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='ldqnx.so'
++  ;;
+ 
++openbsd*)
++  version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
++    *)				need_version=no  ;;
++  esac
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
 +	;;
 +      *)
-+	test "$with_gnu_ld" != yes && break
++	shlibpath_overrides_runpath=yes
 +	;;
 +      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
- fi
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PRCTL 0
+-_ACEOF
 -
--  CC=$ac_ct_CC
--else
--  CC="$ac_cv_prog_CC"
- fi
++    shlibpath_overrides_runpath=yes
+   fi
++  ;;
  
--fi
--if test -z "$CC"; then
--  # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
+ 
+-# Check various constants needed for asm
+-SAVE_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS -I${TOP_SRCDIR}/include"
+-
+-    CR_ASM_OP_HAND_CHKPT=""
+-
+-    echo "$as_me:$LINENO: checking for value for CR_ASM_OP_HAND_CHKPT" >&5
+-echo $ECHO_N "checking for value for CR_ASM_OP_HAND_CHKPT... $ECHO_C" >&6
+-if test "${cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--  if test -n "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-+$as_echo "$LD" >&6; }
- else
--  ac_prog_rejected=no
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
--       ac_prog_rejected=yes
--       continue
--     fi
--    ac_cv_prog_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--if test $ac_prog_rejected = yes; then
--  # We found a bogon in the path, so make sure we never use it.
--  set dummy $ac_cv_prog_CC
--  shift
--  if test $# != 0; then
--    # We chose a different compiler from the bogus one.
--    # However, it has the same basename, so the bogon will be chosen
--    # first if we set CC to just the basename; use the full file name.
--    shift
--    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
--  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--fi
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
+-    cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT="not found"
+-    if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) >= 0)];
+-test_array [0] = 0
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) <= $ac_mid)];
+-test_array [0] = 0
++sysv4 | sysv4.3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 -fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+test -z "$LD" && CXX=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) < 0)];
+-test_array [0] = 0
++tpf*)
++  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) >= $ac_mid)];
+-test_array [0] = 0
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +*)
-+  lt_cv_prog_gnu_ld=no
++  dynamic_linker=no
 +  ;;
 +esac
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
++$as_echo "$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-+with_gnu_ld=$lt_cv_prog_gnu_ld
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) <= $ac_mid)];
+-test_array [0] = 0
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=$ac_mid
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 -fi
--if test -z "$CC"; then
--  if test -n "$ac_tool_prefix"; then
--  for ac_prog in cl
--  do
--    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
--set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=$ac_lo;;
+-'')  ;;
+-esac
 -else
--  if test -n "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
 -else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
+-long longval () { return CR_OP_HAND_CHKPT; }
+-unsigned long ulongval () { return CR_OP_HAND_CHKPT; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+ 
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if ((CR_OP_HAND_CHKPT) < 0)
+-    {
+-      long i = longval ();
+-      if (i != (CR_OP_HAND_CHKPT))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != (CR_OP_HAND_CHKPT))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=`cat conftest.val`
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
 -fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
 -fi
+-rm -f conftest.val
  
--    test -n "$CC" && break
--  done
 -fi
--if test -z "$CC"; then
--  ac_ct_CC=$CC
--  for ac_prog in cl
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
+-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&5
+-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&6
+-  if test "$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" != "not found"; then
+-    CR_ASM_OP_HAND_CHKPT="$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"
 -  fi
--done
--done
  
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
+-  if test -n "$CR_ASM_OP_HAND_CHKPT"; then
+-    cat >>confdefs.h <<_ACEOF
+-#define CR_ASM_OP_HAND_CHKPT $CR_ASM_OP_HAND_CHKPT
+-_ACEOF
  
--  test -n "$ac_ct_CC" && break
--done
  
--  CC=$ac_ct_CC
--fi
  
--fi
-+      # 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
-+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+
-+        # If archive_cmds runs LD, not CC, wlarc should be empty
-+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+        #     investigate it a little bit more. (MM)
-+        wlarc='${wl}'
-+
-+        # ancient GNU ld didn't support --whole-archive et. al.
-+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-+	  $GREP 'no-whole-archive' > /dev/null; then
-+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+        else
-+          whole_archive_flag_spec_CXX=
-+        fi
-+      else
-+        with_gnu_ld=no
-+        wlarc=
+-  fi
  
-+        # A generic and very simple default shared library creation
-+        # command for GNU C++ for the case where it uses the native
-+        # 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.
-+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      fi
  
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+      # Commands to make compiler produce verbose output that lists
-+      # what "hidden" libraries, object files and flags are used when
-+      # linking a shared library.
-+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+-    CR_ASM_CHECKPOINT_STUB=""
  
--# Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
+-    echo "$as_me:$LINENO: checking for value for CR_ASM_CHECKPOINT_STUB" >&5
+-echo $ECHO_N "checking for value for CR_ASM_CHECKPOINT_STUB... $ECHO_C" >&6
+-if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+ 
+-    cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB="not found"
+-    if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include "blcr_common.h.in"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) >= 0)];
+-test_array [0] = 0
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&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); }
-+    else
-+      GXX=no
-+      with_gnu_ld=no
-+      wlarc=
-+    fi
- 
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
+-  (exit $ac_status); }; }; then
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+    # PORTME: fill in a description of your system's C++ link characteristics
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+    ld_shlibs_CXX=yes
-+    case $host_os in
-+      aix3*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+        ;;
-+      aix[4-9]*)
-+        if test "$host_cpu" = ia64; then
-+          # On IA64, the linker does run time linking by default, so we don't
-+          # have to do anything special.
-+          aix_use_runtimelinking=no
-+          exp_sym_flag='-Bexport'
-+          no_entry_flag=""
-+        else
-+          aix_use_runtimelinking=no
-+
-+          # Test if we are trying to use run time linking or normal
-+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+          # need to do runtime linking.
-+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-+	    for ld_flag in $LDFLAGS; do
-+	      case $ld_flag in
-+	      *-brtl*)
-+	        aix_use_runtimelinking=yes
-+	        break
-+	        ;;
-+	      esac
-+	    done
-+	    ;;
-+          esac
-+
-+          exp_sym_flag='-bexport'
-+          no_entry_flag='-bnoentry'
-+        fi
-+
-+        # When large executables or shared objects are built, AIX ld can
-+        # have problems creating the table of contents.  If linking a library
-+        # or program results in "error TOC overflow" add -mminimal-toc to
-+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+        archive_cmds_CXX=''
-+        hardcode_direct_CXX=yes
-+        hardcode_direct_absolute_CXX=yes
-+        hardcode_libdir_separator_CXX=':'
-+        link_all_deplibs_CXX=yes
-+        file_list_spec_CXX='${wl}-f,'
-+
-+        if test "$GXX" = yes; then
-+          case $host_os in aix4.[012]|aix4.[012].*)
-+          # We only want to do this on AIX 4.2 and lower, the check
-+          # below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" &&
-+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+	  then
-+	    # We have reworked collect2
-+	    :
-+	  else
-+	    # We have old collect2
-+	    hardcode_direct_CXX=unsupported
-+	    # It fails to find uninstalled libraries when the uninstalled
-+	    # path is not listed in the libpath.  Setting hardcode_minus_L
-+	    # to unsupported forces relinking
-+	    hardcode_minus_L_CXX=yes
-+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
-+	    hardcode_libdir_separator_CXX=
-+	  fi
-+          esac
-+          shared_flag='-shared'
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag="$shared_flag "'${wl}-G'
-+	  fi
-+        else
-+          # not using gcc
-+          if test "$host_cpu" = ia64; then
-+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	  # chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+          else
-+	    if test "$aix_use_runtimelinking" = yes; then
-+	      shared_flag='${wl}-G'
-+	    else
-+	      shared_flag='${wl}-bM:SRE'
-+	    fi
-+          fi
-+        fi
-+
-+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
-+        # It seems that -bexpall does not export symbols beginning with
-+        # underscore (_), so it is better to generate a list of symbols to
-+	# export.
-+        always_export_symbols_CXX=yes
-+        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.
-+          allow_undefined_flag_CXX='-berok'
-+          # Determine the default libpath from the value encoded in an empty
-+          # executable.
-+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
- main ()
- {
--#ifndef __GNUC__
--       choke me
--#endif
+-/* end confdefs.h.  */
+-#include "blcr_common.h.in"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) <= $ac_mid)];
+-test_array [0] = 0
  
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -62339,68 +68642,82 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_compiler_gnu=yes
+-  ac_hi=$ac_mid; break
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_cxx_try_link "$LINENO"; then :
  
--ac_compiler_gnu=no
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--ac_cv_c_compiler_gnu=$ac_compiler_gnu
--
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
--GCC=`test $ac_compiler_gnu = yes && echo yes`
--ac_test_CFLAGS=${CFLAGS+set}
--ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  done
 -else
--  cat >conftest.$ac_ext <<_ACEOF
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
-+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+        else
-+          if test "$host_cpu" = ia64; then
-+	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-+	    allow_undefined_flag_CXX="-z nodefs"
-+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+          else
-+	    # Determine the default libpath from the value encoded in an
-+	    # empty executable.
-+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
+-#include "blcr_common.h.in"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) < 0)];
+-test_array [0] = 0
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include "blcr_common.h.in"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) >= $ac_mid)];
+-test_array [0] = 0
  
- int
-@@ -20589,4658 +14487,3432 @@
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -62423,957 +68740,1439 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_prog_cc_g=yes
+-  ac_lo=$ac_mid; break
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_cxx_try_link "$LINENO"; then :
  
--ac_cv_prog_cc_g=no
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
+-  done
 -else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	    # Warning - without using the other run time loading flags,
-+	    # -berok will link without error, but may produce a broken library.
-+	    no_undefined_flag_CXX=' ${wl}-bernotok'
-+	    allow_undefined_flag_CXX=' ${wl}-berok'
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    whole_archive_flag_spec_CXX='$convenience'
-+	    archive_cmds_need_lc_CXX=yes
-+	    # This is similar to how AIX traditionally builds its shared
-+	    # libraries.
-+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+          fi
-+        fi
-+        ;;
-+
-+      beos*)
-+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	  allow_undefined_flag_CXX=unsupported
-+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+	  # support --undefined.  This deserves some investigation.  FIXME
-+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	else
-+	  ld_shlibs_CXX=no
-+	fi
-+	;;
-+
-+      chorus*)
-+        case $cc_basename in
-+          *)
-+	  # FIXME: insert proper C++ library support
-+	  ld_shlibs_CXX=no
-+	  ;;
-+        esac
-+        ;;
-+
-+      cygwin* | mingw* | pw32* | cegcc*)
-+        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-+        # as there is no search path for DLLs.
-+        hardcode_libdir_flag_spec_CXX='-L$libdir'
-+        allow_undefined_flag_CXX=unsupported
-+        always_export_symbols_CXX=no
-+        enable_shared_with_static_runtimes_CXX=yes
-+
-+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+          # 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
-+	    cp $export_symbols $output_objdir/$soname.def;
-+          else
-+	    echo EXPORTS > $output_objdir/$soname.def;
-+	    cat $export_symbols >> $output_objdir/$soname.def;
-+          fi~
-+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+        else
-+          ld_shlibs_CXX=no
-+        fi
-+        ;;
-+      darwin* | rhapsody*)
-+
-+
-+  archive_cmds_need_lc_CXX=no
-+  hardcode_direct_CXX=no
-+  hardcode_automatic_CXX=yes
-+  hardcode_shlibpath_var_CXX=unsupported
-+  whole_archive_flag_spec_CXX=''
-+  link_all_deplibs_CXX=yes
-+  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-+  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
-+     *) _lt_dar_can_shared=$GCC ;;
-+  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
-+    output_verbose_link_cmd=echo
-+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-+    fi
-+
-   else
--    CFLAGS=
-+  ld_shlibs_CXX=no
-   fi
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
 -fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_prog_cc_stdc=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
--     char **p;
--     int i;
+-#include "blcr_common.h.in"
+-int
+-main ()
 -{
--  return p[i];
+-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) <= $ac_mid)];
+-test_array [0] = 0
+ 
+-  ;
+-  return 0;
 -}
--static char *f (char * (*g) (char **, int), char **p, ...)
-+
-+	;;
-+
-+      dgux*)
-+        case $cc_basename in
-+          ec++*)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          ghcx*)
-+	    # Green Hills C++ Compiler
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+        esac
-+        ;;
-+
-+      freebsd[12]*)
-+        # C++ shared libraries reported to be fairly broken before
-+	# switch to ELF
-+        ld_shlibs_CXX=no
-+        ;;
-+
-+      freebsd-elf*)
-+        archive_cmds_need_lc_CXX=no
-+        ;;
-+
-+      freebsd* | dragonfly*)
-+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+        # conventions
-+        ld_shlibs_CXX=yes
-+        ;;
-+
-+      gnu*)
-+        ;;
-+
-+      hpux9*)
-+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+        hardcode_libdir_separator_CXX=:
-+        export_dynamic_flag_spec_CXX='${wl}-E'
-+        hardcode_direct_CXX=yes
-+        hardcode_minus_L_CXX=yes # Not in the search PATH,
-+				             # but as the default
-+				             # location of the library.
-+
-+        case $cc_basename in
-+          CC*)
-+            # FIXME: insert proper C++ library support
-+            ld_shlibs_CXX=no
-+            ;;
-+          aCC*)
-+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+            # Commands to make compiler produce verbose output that lists
-+            # what "hidden" libraries, object files and flags are used when
-+            # linking a shared library.
-+            #
-+            # There doesn't appear to be a way to prevent this compiler from
-+            # explicitly linking system object files so we need to strip them
-+            # from the output so that they don't get included in the library
-+            # dependencies.
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+            ;;
-+          *)
-+            if test "$GXX" = yes; then
-+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+            else
-+              # FIXME: insert proper C++ library support
-+              ld_shlibs_CXX=no
-+            fi
-+            ;;
-+        esac
-+        ;;
-+
-+      hpux10*|hpux11*)
-+        if test $with_gnu_ld = no; then
-+	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+	  hardcode_libdir_separator_CXX=:
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=$ac_mid
 +
-+          case $host_cpu in
-+            hppa*64*|ia64*)
-+              ;;
-+            *)
-+	      export_dynamic_flag_spec_CXX='${wl}-E'
-+              ;;
-+          esac
-+        fi
-+        case $host_cpu in
-+          hppa*64*|ia64*)
-+            hardcode_direct_CXX=no
-+            hardcode_shlibpath_var_CXX=no
-+            ;;
-+          *)
-+            hardcode_direct_CXX=yes
-+            hardcode_direct_absolute_CXX=yes
-+            hardcode_minus_L_CXX=yes # Not in the search PATH,
-+					         # but as the default
-+					         # location of the library.
-+            ;;
-+        esac
 +
-+        case $cc_basename in
-+          CC*)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          aCC*)
-+	    case $host_cpu in
-+	      hppa*64*)
-+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      ia64*)
-+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      *)
-+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	    esac
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    ;;
-+          *)
-+	    if test "$GXX" = yes; then
-+	      if test $with_gnu_ld = no; then
-+	        case $host_cpu in
-+	          hppa*64*)
-+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          ia64*)
-+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          *)
-+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	        esac
-+	      fi
-+	    else
-+	      # FIXME: insert proper C++ library support
-+	      ld_shlibs_CXX=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
 +
-+      interix[3-9]*)
-+	hardcode_direct_CXX=no
-+	hardcode_shlibpath_var_CXX=no
-+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	export_dynamic_flag_spec_CXX='${wl}-E'
-+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+	# Instead, shared libraries are loaded at an image base (0x10000000 by
-+	# default) and relocated if they conflict, which is a slow very memory
-+	# consuming and fragmenting process.  To avoid this, we pick a random,
-+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	;;
-+      irix5* | irix6*)
-+        case $cc_basename in
-+          CC*)
-+	    # SGI C++
-+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 +
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-+	    # necessary to make sure instantiated templates are included
-+	    # in the archive.
-+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+	    ;;
-+          *)
-+	    if test "$GXX" = yes; then
-+	      if test "$with_gnu_ld" = no; then
-+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	      else
-+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-+	      fi
-+	    fi
-+	    link_all_deplibs_CXX=yes
-+	    ;;
-+        esac
-+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+        hardcode_libdir_separator_CXX=:
-+        inherit_rpath_CXX=yes
-+        ;;
 +
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+        case $cc_basename in
-+          KCC*)
-+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
 +
-+	    # KCC will only create a shared library if the output file
-+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	    # to its proper name (with version) after linking.
-+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 +
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 +
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-+	    ;;
-+	  icpc* | ecpc* )
-+	    # Intel C++
-+	    with_gnu_ld=yes
-+	    # version 8.0 and above of icpc choke on multiply defined symbols
-+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-+	    # earlier do not add the objects themselves.
-+	    case `$CC -V 2>&1` in
-+	      *"Version 7."*)
-+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+		;;
-+	      *)  # Version 8.0 or newer
-+	        tmp_idyn=
-+	        case $host_cpu in
-+		  ia64*) tmp_idyn=' -i_dynamic';;
-+		esac
-+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+		;;
-+	    esac
-+	    archive_cmds_need_lc_CXX=no
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	    ;;
-+          pgCC* | pgcpp*)
-+            # Portland Group C++ compiler
-+	    case `$CC -V` in
-+	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
-+	      prelink_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-+	      old_archive_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-+		$RANLIB $oldlib'
-+	      archive_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+	      ;;
-+	    *) # Version 6 will use weak symbols
-+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+	      ;;
-+	    esac
 +
-+	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+            ;;
-+	  cxx*)
-+	    # Compaq C++
-+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 +
-+	    runpath_var=LD_RUN_PATH
-+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-+	    hardcode_libdir_separator_CXX=:
 +
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    ;;
-+	  xl*)
-+	    # IBM XL 8.0 on PPC, with GNU ld
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    if test "x$supports_anon_versioning" = xyes; then
-+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
-+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+		echo "local: *; };" >> $output_objdir/$libname.ver~
-+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	    fi
-+	    ;;
-+	  *)
-+	    case `$CC -V 2>&1 | sed 5q` in
-+	    *Sun\ C*)
-+	      # Sun C++ 5.9
-+	      no_undefined_flag_CXX=' -zdefs'
-+	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	      compiler_needs_object_CXX=yes
 +
-+	      # Not sure whether something based on
-+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+	      # would be better.
-+	      output_verbose_link_cmd='echo'
 +
-+	      # Archives containing C++ object files must be created using
-+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	      # necessary to make sure instantiated templates are included
-+	      # in the archive.
-+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
 +
-+      lynxos*)
-+        # FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
 +
-+      m88k*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+	;;
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
++$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
++hardcode_action_CXX=
++if test -n "$hardcode_libdir_flag_spec_CXX" ||
++   test -n "$runpath_var_CXX" ||
++   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 +
-+      mvs*)
-+        case $cc_basename in
-+          cxx*)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+	  *)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+	esac
-+	;;
++  # We can hardcode non-existent directories.
++  if test "$hardcode_direct_CXX" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
++     test "$hardcode_minus_L_CXX" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_CXX=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_CXX=immediate
++  fi
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_CXX=unsupported
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
++$as_echo "$hardcode_action_CXX" >&6; }
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++if test "$hardcode_action_CXX" = relink ||
++   test "$inherit_rpath_CXX" = yes; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=$ac_lo;;
+-'')  ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include "blcr_common.h.in"
+-long longval () { return _CR_CHECKPOINT_STUB; }
+-unsigned long ulongval () { return _CR_CHECKPOINT_STUB; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+ 
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if ((_CR_CHECKPOINT_STUB) < 0)
+-    {
+-      long i = longval ();
+-      if (i != (_CR_CHECKPOINT_STUB))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != (_CR_CHECKPOINT_STUB))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=`cat conftest.val`
 +
-+      netbsd*)
-+        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=
-+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-+	  hardcode_direct_CXX=yes
-+	  hardcode_shlibpath_var_CXX=no
-+	fi
-+	# 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::"'
-+	;;
 +
-+      *nto* | *qnx*)
-+        ld_shlibs_CXX=yes
-+	;;
 +
-+      openbsd2*)
-+        # C++ shared libraries are fairly broken
-+	ld_shlibs_CXX=no
-+	;;
 +
-+      openbsd*)
-+	if test -f /usr/libexec/ld.so; then
-+	  hardcode_direct_CXX=yes
-+	  hardcode_shlibpath_var_CXX=no
-+	  hardcode_direct_absolute_CXX=yes
-+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+	    export_dynamic_flag_spec_CXX='${wl}-E'
-+	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+	  fi
-+	  output_verbose_link_cmd=echo
-+	else
-+	  ld_shlibs_CXX=no
-+	fi
-+	;;
 +
-+      osf3* | osf4* | osf5*)
-+        case $cc_basename in
-+          KCC*)
-+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
++  fi # test -n "$compiler"
 +
-+	    # KCC will only create a shared library if the output file
-+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	    # to its proper name (with version) after linking.
-+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++  CC=$lt_save_CC
++  CFLAGS=$lt_save_CFLAGS
++  LDCXX=$LD
++  LD=$lt_save_LD
++  GCC=$lt_save_GCC
++  with_gnu_ld=$lt_save_with_gnu_ld
++  lt_cv_path_LDCXX=$lt_cv_path_LD
++  lt_cv_path_LD=$lt_save_path_LD
++  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++fi # test "$_lt_caught_CXX_error" != yes
 +
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	    hardcode_libdir_separator_CXX=:
++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
 +
-+	    # Archives containing C++ object files must be created using
-+	    # the KAI C++ compiler.
-+	    case $host in
-+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
-+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
-+	    esac
-+	    ;;
-+          RCC*)
-+	    # Rational C++ 2.4.1
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          cxx*)
-+	    case $host in
-+	      osf3*)
-+	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+		;;
-+	      *)
-+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	          echo "-hidden">> $lib.exp~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $RM $lib.exp'
-+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-+		;;
-+	    esac
 +
-+	    hardcode_libdir_separator_CXX=:
 +
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    ;;
-+	  *)
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+	      case $host in
-+	        osf3*)
-+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+		  ;;
-+	        *)
-+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+		  ;;
-+	      esac
++  # Totally gross way to perform a non-fatal probe for CXX
 +
-+	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+	      hardcode_libdir_separator_CXX=:
 +
-+	      # Commands to make compiler produce verbose output that lists
-+	      # what "hidden" libraries, object files and flags are used when
-+	      # linking a shared library.
-+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 +
-+	    else
-+	      # FIXME: insert proper C++ library support
-+	      ld_shlibs_CXX=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
 +
-+      psos*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+        ;;
++  # Now validate the choice
++  if test "x$CXX" != xno; then
 +
-+      sunos4*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.x
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          lcc*)
-+	    # Lucid
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+        esac
-+        ;;
++    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
 +
-+      solaris*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+            archive_cmds_need_lc_CXX=yes
-+	    no_undefined_flag_CXX=' -zdefs'
-+	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++    # The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
++$as_echo_n "checking size of void *... " >&6; }
++if ${ac_cv_sizeof_void_p+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
+ 
++else
++  if test "$ac_cv_type_void_p" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error 77 "cannot compute sizeof (void *)
++See \`config.log' for more details" "$LINENO" 5; }
++   else
++     ac_cv_sizeof_void_p=0
++   fi
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.val
+ 
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&5
+-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&6
+-  if test "$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" != "not found"; then
+-    CR_ASM_CHECKPOINT_STUB="$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"
+-  fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
++$as_echo "$ac_cv_sizeof_void_p" >&6; }
+ 
+-  if test -n "$CR_ASM_CHECKPOINT_STUB"; then
+-    cat >>confdefs.h <<_ACEOF
+-#define CR_ASM_CHECKPOINT_STUB $CR_ASM_CHECKPOINT_STUB
+-_ACEOF
+ 
+ 
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
++_ACEOF
+ 
+-  fi
+-    # ICK!
+ 
+-    CR_ASM_OP_HAND_ABORT=""
++    ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-    echo "$as_me:$LINENO: checking for value for CR_ASM_OP_HAND_ABORT" >&5
+-echo $ECHO_N "checking for value for CR_ASM_OP_HAND_ABORT... $ECHO_C" >&6
+-if test "${cr_cv_compute_int_CR_ASM_OP_HAND_ABORT+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CXX='$CXX' acts like a C++ compiler" >&5
++$as_echo_n "checking whether CXX='$CXX' acts like a C++ compiler... " >&6; }
++if ${cr_cv_cxx_is_cxx+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+-    cr_cv_compute_int_CR_ASM_OP_HAND_ABORT="not found"
+-    if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++      cr_cv_cxx_is_cxx=no
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) >= 0)];
+-test_array [0] = 0
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
++	#ifndef __cplusplus
++	    #error __cplusplus must be defined in a C++ compilation!
++	#endif
 +
-+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
-+	    hardcode_shlibpath_var_CXX=no
-+	    case $host_os in
-+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
-+	      *)
-+		# The compiler driver will combine and reorder linker options,
-+		# but understands `-z linker_flag'.
-+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-+	        ;;
-+	    esac
-+	    link_all_deplibs_CXX=yes
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) <= $ac_mid)];
+-test_array [0] = 0
+-
++ int x = 1;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_hi=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_cxx_try_compile "$LINENO"; then :
++  cr_cv_cxx_is_cxx=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_cxx_is_cxx" >&5
++$as_echo "$cr_cv_cxx_is_cxx" >&6; }
++    if test x"$cr_cv_cxx_is_cxx" = xyes; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CXX='$CXX' matches wordsize of CC" >&5
++$as_echo_n "checking whether CXX='$CXX' matches wordsize of CC... " >&6; }
++if ${cr_cv_cxx_voidp+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++        cr_cv_cxx_voidp=no
++        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) < 0)];
+-test_array [0] = 0
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
++	  #ifndef __cplusplus
++	      #error __cplusplus must be defined in a C++ compilation!
++	  #endif
 +
-+	    output_verbose_link_cmd='echo'
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) >= $ac_mid)];
+-test_array [0] = 0
+-
++ int a[(($ac_cv_sizeof_void_p == sizeof(void *))? 1 : -1)];
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_lo=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_cxx_try_compile "$LINENO"; then :
++  cr_cv_cxx_voidp=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_cxx_voidp" >&5
++$as_echo "$cr_cv_cxx_voidp" >&6; }
++    fi
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	    # necessary to make sure instantiated templates are included
-+	    # in the archive.
-+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-+	    ;;
-+          gcx*)
-+	    # Green Hills C++ Compiler
-+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++    if test x"$cr_cv_cxx_is_cxx$cr_cv_cxx_voidp" != xyesyes; then
++      CXX=no
++    fi
++  fi
 +
-+	    # The C++ compiler must be used to create the archive.
-+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+	    ;;
-+          *)
-+	    # GNU C++ compiler with Solaris linker
-+	    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
-+	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 +
-+	        # Commands to make compiler produce verbose output that lists
-+	        # what "hidden" libraries, object files and flags are used when
-+	        # linking a shared library.
-+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      else
-+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+	        # platform.
-+	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++################################################################################
++# Check libraries
++################################################################################
 +
-+	        # Commands to make compiler produce verbose output that lists
-+	        # what "hidden" libraries, object files and flags are used when
-+	        # linking a shared library.
-+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      fi
++if test x"$cr_build_libcr" = xyes; then
++# Check for a sufficiently new glibc
++# XXX: What is our true lower bound?
 +
-+	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-+	      case $host_os in
-+		solaris2.[0-5] | solaris2.[0-5].*) ;;
-+		*)
-+		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+		  ;;
-+	      esac
-+	    fi
-+	    ;;
-+        esac
-+        ;;
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc version >= 2.2" >&5
++$as_echo_n "checking for GNU libc version >= 2.2... " >&6; }
++if ${cr_cv_check_glibc_2_2_or_higher+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) <= $ac_mid)];
+-test_array [0] = 0
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=$ac_mid
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++	#include <features.h>
++	#ifndef __GLIBC_PREREQ
++	    #define __GLIBC_PREREQ(maj, min) \
++		((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
++	#endif
++	#if !__GLIBC_PREREQ(2, 2)
++	    #error "Bad glibc version"
++	#endif
++	extern int gnu_get_libc_version(void); /* Ensures this *is* glibc */
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=$ac_lo;;
+-'')  ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/ioctl.h>
+-	 #include "blcr_ioctl.h"
+-long longval () { return CR_OP_HAND_ABORT; }
+-unsigned long ulongval () { return CR_OP_HAND_ABORT; }
+-#include <stdio.h>
+-#include <stdlib.h>
+ int
+ main ()
+ {
+ 
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if ((CR_OP_HAND_ABORT) < 0)
+-    {
+-      long i = longval ();
+-      if (i != (CR_OP_HAND_ABORT))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != (CR_OP_HAND_ABORT))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
++	return !gnu_get_libc_version();
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=`cat conftest.val`
++if ac_fn_c_try_link "$LINENO"; then :
++  cr_cv_check_glibc_2_2_or_higher=yes
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++  cr_cv_check_glibc_2_2_or_higher=no
+ fi
+-fi
+-rm -f conftest.val
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&5
+-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&6
+-  if test "$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" != "not found"; then
+-    CR_ASM_OP_HAND_ABORT="$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"
+-  fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_check_glibc_2_2_or_higher" >&5
++$as_echo "$cr_cv_check_glibc_2_2_or_higher" >&6; }
+ 
+-  if test -n "$CR_ASM_OP_HAND_ABORT"; then
+-    cat >>confdefs.h <<_ACEOF
+-#define CR_ASM_OP_HAND_ABORT $CR_ASM_OP_HAND_ABORT
+-_ACEOF
++  if eval test $cr_cv_check_glibc_2_2_or_higher = yes; then
++    :
++  else
++    cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
+ 
++_ACEOF
+ 
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, we kill variables containing newlines.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
+ 
++  (set) 2>&1 |
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;; #(
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
++      ;;
++    esac |
++    sort
++) |
++  sed '
++     /^ac_cv_env_/b end
++     t clear
++     :clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
++  else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
++  fi
++fi
++rm -f confcache
++   as_fn_error $? "the C library does not appear to be glibc 2.2 or higher." "$LINENO" 5
+   fi
+ 
+ 
+-    CR_ASM_CHECKPOINT_OMIT=""
+-
+-    echo "$as_me:$LINENO: checking for value for CR_ASM_CHECKPOINT_OMIT" >&5
+-echo $ECHO_N "checking for value for CR_ASM_CHECKPOINT_OMIT... $ECHO_C" >&6
+-if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-    cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT="not found"
+-    if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include "blcr_common.h.in"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include "blcr_common.h.in"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++# Checks for required libraries and fail if they are not found
++# Note that we are NOT adding them to LIBS, just verifying their presence.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
++$as_echo_n "checking for dlsym in -ldl... " >&6; }
++if ${ac_cv_lib_dl_dlsym+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include "blcr_common.h.in"
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) < 0)];
+-test_array [0] = 0
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include "blcr_common.h.in"
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlsym ();
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) >= $ac_mid)];
+-test_array [0] = 0
+-
++return dlsym ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=$ac_mid; break
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dl_dlsym=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++  ac_cv_lib_dl_dlsym=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
++$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
++if test "x$ac_cv_lib_dl_dlsym" = xyes; then :
++  :
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
 +
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag_CXX='${wl}-z,text'
-+      archive_cmds_need_lc_CXX=no
-+      hardcode_shlibpath_var_CXX=no
-+      runpath_var='LD_RUN_PATH'
++_ACEOF
 +
-+      case $cc_basename in
-+        CC*)
-+	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, we kill variables containing newlines.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 +      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
+ 
+-ac_lo= ac_hi=
++  (set) 2>&1 |
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;; #(
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
 +      ;;
-+
-+      sysv5* | sco3.2v5* | sco5v6*)
-+	# Note: We can NOT use -z defs as we might desire, because we do not
-+	# link with -lc, and that would cause any symbols used from libc to
-+	# always be unresolved, which means just about no library would
-+	# ever link correctly.  If we're not using GNU ld we use -z text
-+	# though, which does catch some bad symbols but isn't as heavy-handed
-+	# as -z defs.
-+	no_undefined_flag_CXX='${wl}-z,text'
-+	allow_undefined_flag_CXX='${wl}-z,nodefs'
-+	archive_cmds_need_lc_CXX=no
-+	hardcode_shlibpath_var_CXX=no
-+	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
-+	hardcode_libdir_separator_CXX=':'
-+	link_all_deplibs_CXX=yes
-+	export_dynamic_flag_spec_CXX='${wl}-Bexport'
-+	runpath_var='LD_RUN_PATH'
-+
-+	case $cc_basename in
-+          CC*)
-+	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    ;;
-+	  *)
-+	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    ;;
++    esac |
++    sort
++) |
++  sed '
++     /^ac_cv_env_/b end
++     t clear
++     :clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
 +	esac
-+      ;;
-+
-+      tandem*)
-+        case $cc_basename in
-+          NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+        esac
-+        ;;
-+
-+      vxworks*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+        ;;
-+
-+      *)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+        ;;
-+    esac
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
-+    test "$ld_shlibs_CXX" = no && can_build_shared=no
-+
-+    GCC_CXX="$GXX"
-+    LD_CXX="$LD"
++      fi
++    fi
++  else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
++  fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f confcache
++   as_fn_error $? "required library libdl not found." "$LINENO" 5
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    # Dependencies to place before and after the object being linked:
-+predep_objects_CXX=
-+postdep_objects_CXX=
-+predeps_CXX=
-+postdeps_CXX=
-+compiler_lib_search_path_CXX=
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
++$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
++if ${ac_cv_lib_pthread_pthread_create+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lpthread  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include "blcr_common.h.in"
 +
-+cat > conftest.$ac_ext <<_LT_EOF
-+class Foo
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char pthread_create ();
+ int
+ main ()
  {
--  char *s;
--  va_list v;
--  va_start (v,p);
--  s = g (p, va_arg (v,int));
--  va_end (v);
--  return s;
+-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) <= $ac_mid)];
+-test_array [0] = 0
+-
++return pthread_create ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=$ac_mid
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_pthread_pthread_create=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++  ac_cv_lib_pthread_pthread_create=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=$ac_lo;;
+-'')  ;;
+-esac
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
++$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
++if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
++  :
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include "blcr_common.h.in"
+-long longval () { return CR_CHECKPOINT_OMIT; }
+-unsigned long ulongval () { return CR_CHECKPOINT_OMIT; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if ((CR_CHECKPOINT_OMIT) < 0)
+-    {
+-      long i = longval ();
+-      if (i != (CR_CHECKPOINT_OMIT))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != (CR_CHECKPOINT_OMIT))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
++  cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
+ 
+-  ;
+-  return 0;
 -}
-+public:
-+  Foo (void) { a = 0; }
-+private:
-+  int a;
-+};
-+_LT_EOF
-+
-+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  # Parse the compiler output and extract the necessary
-+  # objects, libraries and library flags.
-+
-+  # Sentinel used to keep track of whether or not we are before
-+  # the conftest object file.
-+  pre_test_object_deps_done=no
-+
-+  for p in `eval "$output_verbose_link_cmd"`; do
-+    case $p in
-+
-+    -L* | -R* | -l*)
-+       # Some compilers place space between "-{L,R}" and the path.
-+       # Remove the space.
-+       if test $p = "-L" ||
-+          test $p = "-R"; then
-+	 prev=$p
-+	 continue
-+       else
-+	 prev=
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case $p in
-+	 -L* | -R*)
-+	   # Internal compiler library paths should come after those
-+	   # provided the user.  The postdeps already come after the
-+	   # user supplied libs so there is no need to process them.
-+	   if test -z "$compiler_lib_search_path_CXX"; then
-+	     compiler_lib_search_path_CXX="${prev}${p}"
-+	   else
-+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-+	   fi
-+	   ;;
-+	 # The "-l" case would never come before the object being
-+	 # linked, so don't bother handling this case.
-+	 esac
-+       else
-+	 if test -z "$postdeps_CXX"; then
-+	   postdeps_CXX="${prev}${p}"
-+	 else
-+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-+	 fi
-+       fi
-+       ;;
-+
-+    *.$objext)
-+       # This assumes that the test object file only shows up
-+       # once in the compiler output.
-+       if test "$p" = "conftest.$objext"; then
-+	 pre_test_object_deps_done=yes
-+	 continue
-+       fi
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=`cat conftest.val`
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, we kill variables containing newlines.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
 +
-+       if test "$pre_test_object_deps_done" = no; then
-+	 if test -z "$predep_objects_CXX"; then
-+	   predep_objects_CXX="$p"
-+	 else
-+	   predep_objects_CXX="$predep_objects_CXX $p"
-+	 fi
-+       else
-+	 if test -z "$postdep_objects_CXX"; then
-+	   postdep_objects_CXX="$p"
-+	 else
-+	   postdep_objects_CXX="$postdep_objects_CXX $p"
-+	 fi
-+       fi
-+       ;;
++  (set) 2>&1 |
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;; #(
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
++      ;;
++    esac |
++    sort
++) |
++  sed '
++     /^ac_cv_env_/b end
++     t clear
++     :clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
++  else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
++  fi
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
++rm -f confcache
++   as_fn_error $? "required library libpthread not found." "$LINENO" 5
+ fi
+-rm -f conftest.val
  
--/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
--   function prototypes and stuff, but not '\xHH' hex character constants.
--   These don't provoke an error unfortunately, instead are silently treated
--   as 'x'.  The following induces an error, until -std1 is added to get
--   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
--   array size at least.  It's necessary to write '\x00'==0 to get something
--   that's true only with -std1.  */
--int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+    *) ;; # Ignore the rest.
+-fi
+-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&5
+-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&6
+-  if test "$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" != "not found"; then
+-    CR_ASM_CHECKPOINT_OMIT="$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"
+-  fi
  
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
+-  if test -n "$CR_ASM_CHECKPOINT_OMIT"; then
+-    cat >>confdefs.h <<_ACEOF
+-#define CR_ASM_CHECKPOINT_OMIT $CR_ASM_CHECKPOINT_OMIT
+-_ACEOF
++# Prep a variable for possible use in messages below
++if test x"$enable_multilib" = xyes; then
++  ldsuggest='-L/usr/lib/nptl -L/usr/lib64/nptl'
++elif test x"$ac_cv_sizeof_void_p" = x8; then
++  ldsuggest='-L/usr/lib64/nptl'
++else
++  ldsuggest='-L/usr/lib/nptl'
++fi
+ 
++# Helper for LinuxThreads probes
++# CR_LT_PROBE(cv_varname, cross_varname)
+ 
+ 
+-  fi
+-    # ICK!
++# Look for LinuxThreads in the default (probably dynamic) library
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether default pthreads library is LinuxThreads" >&5
++$as_echo_n "checking whether default pthreads library is LinuxThreads... " >&6; }
++if ${cr_cv_pt_default_lt+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
+ 
+-    CR_ASM_SI_PID_OFFSET=""
++  SAVE_LIBS="$LIBS"
++  LIBS="-lpthread $LIBS"
+ 
+-    echo "$as_me:$LINENO: checking for value for CR_ASM_SI_PID_OFFSET" >&5
+-echo $ECHO_N "checking for value for CR_ASM_SI_PID_OFFSET... $ECHO_C" >&6
+-if test "${cr_cv_compute_int_CR_ASM_SI_PID_OFFSET+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++  if test "$cross_compiling" = yes; then :
+ 
+-    cr_cv_compute_int_CR_ASM_SI_PID_OFFSET="not found"
+-    if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <signal.h>
+-	 #ifndef offsetof
+-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+-	 #endif
 -int
 -main ()
 -{
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) >= 0)];
+-test_array [0] = 0
+ 
 -  ;
 -  return 0;
 -}
 -_ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX 10.20 and later	-Ae
--# HP-UX older versions	-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
@@ -63395,99 +70194,30 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_prog_cc_stdc=$ac_arg
--break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+    esac
-+  done
- 
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling CXX test program"
- fi
--rm -f conftest.err conftest.$ac_objext
--done
--rm -f conftest.$ac_ext conftest.$ac_objext
--CC=$ac_save_CC
- 
--fi
-+$RM -f confest.$objext
- 
--case "x$ac_cv_prog_cc_stdc" in
--  x|xno)
--    echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
--  *)
--    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
--    CC="$CC $ac_cv_prog_cc_stdc" ;;
-+# PORTME: override above test on systems where it is broken
-+case $host_os in
-+interix[3-9]*)
-+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+  # hack all around it, let's just trust "g++" to DTRT.
-+  predep_objects_CXX=
-+  postdep_objects_CXX=
-+  postdeps_CXX=
-+  ;;
-+
-+linux*)
-+  case `$CC -V 2>&1 | sed 5q` in
-+  *Sun\ C*)
-+    # Sun C++ 5.9
-+
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    if test "$solaris_use_stlport4" != yes; then
-+      postdeps_CXX='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
-+
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    if test "$solaris_use_stlport4" != yes; then
-+      postdeps_CXX='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
- esac
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <signal.h>
+-	 #ifndef offsetof
+-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+-	 #endif
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) <= $ac_mid)];
+-test_array [0] = 0
++  if test "${cross_linuxthreads-unset}" = unset; then
++    as_fn_error $? "When cross-compiling, variable cross_linuxthreads must be set." "$LINENO" 5
++  fi
  
--# Some people use a C++ compiler to compile C.  Since we use `exit',
--# in C++ we need to declare it.  In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
--  choke me
--#endif
+-  ;
+-  return 0;
+-}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -63511,26 +70241,44 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_hi=$ac_mid; break
++    if test x"$cross_linuxthreads" != x0; then :
++  cr_cv_pt_default_lt=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++  cr_cv_pt_default_lt=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_declaration
--#include <stdlib.h>
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <signal.h>
+-	 #ifndef offsetof
+-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+-	 #endif
 -int
 -main ()
 -{
--exit (42);
+-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) < 0)];
+-test_array [0] = 0
+ 
 -  ;
 -  return 0;
 -}
@@ -63557,35 +70305,50 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--continue
-+case " $postdeps_CXX " in
-+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-+esac
-+ compiler_lib_search_dirs_CXX=
-+if test -n "${compiler_lib_search_path_CXX}"; then
-+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_declaration
+-#include <signal.h>
+-	 #ifndef offsetof
+-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+-	 #endif
 -int
 -main ()
 -{
--exit (42);
+-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) >= $ac_mid)];
+-test_array [0] = 0
++	#include <sys/types.h>
++	#include <unistd.h>
++	#include <stdio.h>
++	#include <pthread.h>
+ 
 -  ;
 -  return 0;
 -}
--_ACEOF
++	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
++
++	int main(void) {
++	    pthread_t th;
++	    void *join_val;
++
++	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
++		fputs("Error calling pthread_create()\n", stderr);
++		return -1;
++	    }
++	    if (0 != pthread_join(th, &join_val)) {
++		fputs("Error calling pthread_join()\n", stderr);
++		return -1;
++	    }
++
++	    /* zero = NOT equal pids = LinuxThreads */
++	    return ((long)join_val == (long)getpid());
++	}
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -63608,231 +70371,60 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  break
--else
+-  ac_lo=$ac_mid; break
++if ac_fn_c_try_run "$LINENO"; then :
++  cr_cv_pt_default_lt=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
+-
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++  cr_cv_pt_default_lt=no
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
--fi
- 
+-  done
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++
++  LIBS="$SAVE_LIBS"
  
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--depcc="$CC"   am_compiler_list=
- 
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
--  # We make a subdir and do the tests there.  Otherwise we can end up
--  # making bogus files that we don't know about and never remove.  For
--  # instance it was reported that on HP-UX the gcc test will end up
--  # making a dummy file named `D' -- because `-MD' means `put the output
--  # in D'.
--  mkdir conftest.dir
--  # Copy depcomp to subdir because otherwise we won't find it if we're
--  # using a relative directory.
--  cp "$am_depcomp" conftest.dir
--  cd conftest.dir
--  # We will build objects and dependencies in a subdirectory because
--  # it helps to detect inapplicable dependency modes.  For instance
--  # both Tru64's cc and ICC support -MD to output dependencies as a
--  # side effect of compilation, but ICC will put the dependencies in
--  # the current directory while Tru64 will put them in the object
--  # directory.
--  mkdir sub
- 
--  am_cv_CC_dependencies_compiler_type=none
--  if test "$am_compiler_list" = ""; then
--     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
--  fi
--  for depmode in $am_compiler_list; do
--    # Setup a source with many dependencies, because some compilers
--    # like to wrap large dependency lists on column 80 (with \), and
--    # we should not choose a depcomp mode which is confused by this.
--    #
--    # We need to recreate these files for each test, as the compiler may
--    # overwrite some of them when testing with obscure command lines.
--    # This happens at least with the AIX C compiler.
--    : > sub/conftest.c
--    for i in 1 2 3 4 5 6; do
--      echo '#include "conftst'$i'.h"' >> sub/conftest.c
--      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
--      touch sub/conftst$i.h
--    done
--    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
--    case $depmode in
--    nosideeffect)
--      # after this tag, mechanisms are not by side-effect, so they'll
--      # only be used when explicitly requested
--      if test "x$enable_dependency_tracking" = xyes; then
--	continue
--      else
--	break
--      fi
--      ;;
--    none) break ;;
--    esac
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.
--    if depmode=$depmode \
--       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
--       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
--         >/dev/null 2>conftest.err &&
--       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
--       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      # icc doesn't choke on unknown options, it will just issue warnings
--      # (even with -Werror).  So we grep stderr for any message
--      # that says an option was ignored.
--      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
--        am_cv_CC_dependencies_compiler_type=$depmode
--        break
--      fi
--    fi
--  done
- 
--  cd ..
--  rm -rf conftest.dir
--else
--  am_cv_CC_dependencies_compiler_type=none
--fi
- 
--fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
--CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
- 
- 
--if
--  test "x$enable_dependency_tracking" != xno \
--  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
--  am__fastdepCC_TRUE=
--  am__fastdepCC_FALSE='#'
--else
--  am__fastdepCC_TRUE='#'
--  am__fastdepCC_FALSE=
--fi
- 
- 
- 
--  if test "$GCC" = yes; then
--    :
--  else
--    cat >confcache <<\_ACEOF
--# This file is a shell script that caches the results of configure
--# tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
--#
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
--#
--# `ac_cv_env_foo' variables (set or unset) will be overridden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
- 
--_ACEOF
- 
--# The following way of writing the cache mishandles newlines in values,
--# but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
--# Ultrix sh set writes to stderr and can't be redirected directly,
--# and sets the high bit in the cache file unless we assign to the vars.
--{
--  (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
--      sed -n \
--	"s/'/'\\\\''/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
--    *)
--      # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--      ;;
--    esac;
--} |
--  sed '
--     t clear
--     : clear
--     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--     t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--    cat confcache >$cache_file
--  else
--    echo "not updating unwritable cache $cache_file"
--  fi
--fi
--rm -f confcache
--   { { echo "$as_me:$LINENO: error: the C compiler '$CC' is not a GNU C compiler." >&5
--echo "$as_me: error: the C compiler '$CC' is not a GNU C compiler." >&2;}
--   { (exit 1); exit 1; }; }
--  fi
- 
- 
- 
--# Configure inlining (XXX: need to probe gcc for support?)
- 
--cat >>confdefs.h <<\_ACEOF
--#define CR_INLINE static __inline__ __attribute__ ((__unused__))
--_ACEOF
- 
- 
--# Check for additional flags needed when building libcr
--if test x"$cr_build_libcr" = xyes; then
--CR_LIBCR_CFLAGS=""
- 
--    echo "$as_me:$LINENO: checking whether gcc accepts -Wall" >&5
--echo $ECHO_N "checking whether gcc accepts -Wall... $ECHO_C" >&6
--if test "${cr_cv_gcc_flag_WALL+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
- 
--    SAVE_CFLAGS=$CFLAGS
--    CFLAGS="$CFLAGS -Wall"
--    cat >conftest.$ac_ext <<_ACEOF
+-ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_pt_default_lt" >&5
++$as_echo "$cr_cv_pt_default_lt" >&6; }
++if test x"$cr_cv_pt_default_lt" = xyes; then
++  as_fn_error $? "linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." "$LINENO" 5
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
+-#include <signal.h>
+-	 #ifndef offsetof
+-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+-	 #endif
 -int
 -main ()
 -{
+-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) <= $ac_mid)];
+-test_array [0] = 0
  
 -  ;
 -  return 0;
@@ -63860,372 +70452,354 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  cr_cv_gcc_flag_WALL=yes
--else
+-  ac_hi=$ac_mid
++# Now look for LinuxThreads in the static libs if we are building static ones ourself
++if test x"$enable_static" = xyes; then
++  # Look for LinuxThreads in the static library
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether static pthreads library is LinuxThreads" >&5
++$as_echo_n "checking whether static pthreads library is LinuxThreads... " >&6; }
++if ${cr_cv_pt_static_lt+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
--cr_cv_gcc_flag_WALL=no
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS=$SAVE_CFLAGS
- 
--fi
--echo "$as_me:$LINENO: result: $cr_cv_gcc_flag_WALL" >&5
--echo "${ECHO_T}$cr_cv_gcc_flag_WALL" >&6
+-done
+-case $ac_lo in
+-?*) cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=$ac_lo;;
+-'')  ;;
+-esac
++    SAVE_LIBS="$LIBS"
++    SAVE_LDFLAGS="$LDFLAGS"
++    LDFLAGS="$LDFLAGS -static"
++    LIBS="-lpthread $LIBS"
++
++  if test "$cross_compiling" = yes; then :
++
++
++  if test "${cross_linuxthreads_static-unset}" = unset; then
++    as_fn_error $? "When cross-compiling, variable cross_linuxthreads_static must be set." "$LINENO" 5
++  fi
++
++    if test x"$cross_linuxthreads_static" != x0; then :
++  cr_cv_pt_static_lt=yes
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++  cr_cv_pt_static_lt=no
++fi
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <signal.h>
+-	 #ifndef offsetof
+-  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+-	 #endif
+-long longval () { return offsetof(struct siginfo, si_pid); }
+-unsigned long ulongval () { return offsetof(struct siginfo, si_pid); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
  
--  if eval test $cr_cv_gcc_flag_WALL = yes; then
--    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wall"
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if ((offsetof(struct siginfo, si_pid)) < 0)
+-    {
+-      long i = longval ();
+-      if (i != (offsetof(struct siginfo, si_pid)))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
 -  else
--    :
--  fi
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != (offsetof(struct siginfo, si_pid)))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
++	#include <sys/types.h>
++	#include <unistd.h>
++	#include <stdio.h>
++	#include <pthread.h>
  
-+    lt_prog_compiler_wl_CXX=
-+lt_prog_compiler_pic_CXX=
-+lt_prog_compiler_static_CXX=
+-  ;
+-  return 0;
+-}
++	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
 +
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++	int main(void) {
++	    pthread_t th;
++	    void *join_val;
 +
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    lt_prog_compiler_wl_CXX='-Wl,'
-+    lt_prog_compiler_static_CXX='-static'
++	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
++		fputs("Error calling pthread_create()\n", stderr);
++		return -1;
++	    }
++	    if (0 != pthread_join(th, &join_val)) {
++		fputs("Error calling pthread_join()\n", stderr);
++		return -1;
++	    }
 +
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static_CXX='-Bstatic'
-+      fi
-+      ;;
++	    /* zero = NOT equal pids = LinuxThreads */
++	    return ((long)join_val == (long)getpid());
++	}
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=`cat conftest.val`
++if ac_fn_c_try_run "$LINENO"; then :
++  cr_cv_pt_static_lt=yes
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++  cr_cv_pt_static_lt=no
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+-rm -f conftest.val
 +
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            lt_prog_compiler_pic_CXX='-fPIC'
-+        ;;
-+      m68k)
-+            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
-+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
++
++    LIBS="$SAVE_LIBS"
++    LDFLAGS="$SAVE_LDFLAGS"
  
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    mingw* | cygwin* | os2* | pw32* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+      # (--disable-auto-import) libraries
-+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic_CXX='-fno-common'
-+      ;;
-+    *djgpp*)
-+      # DJGPP does not support shared libraries at all
-+      lt_prog_compiler_pic_CXX=
-+      ;;
-+    interix[3-9]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic_CXX=-Kconform_pic
-+      fi
-+      ;;
-+    hpux*)
-+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-+      # sets the default TLS model and affects inlining.
-+      case $host_cpu in
-+      hppa*64*)
-+	;;
-+      *)
-+	lt_prog_compiler_pic_CXX='-fPIC'
-+	;;
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&5
+-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&6
+-  if test "$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" != "not found"; then
+-    CR_ASM_SI_PID_OFFSET="$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"
+-  fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_pt_static_lt" >&5
++$as_echo "$cr_cv_pt_static_lt" >&6; }
++  if test x"$cr_cv_pt_static_lt" = xyes; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&5
++$as_echo "$as_me: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&2;}
++    cr_static_link_warning="yes"
++    if test x"$enable_all_static" = xyes; then
++      cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
+ 
+-  if test -n "$CR_ASM_SI_PID_OFFSET"; then
+-    cat >>confdefs.h <<_ACEOF
+-#define CR_ASM_SI_PID_OFFSET $CR_ASM_SI_PID_OFFSET
+ _ACEOF
+ 
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, we kill variables containing newlines.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 +      esac
-+      ;;
-+    *qnx* | *nto*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic_CXX='-fPIC -shared'
-+      ;;
-+    *)
-+      lt_prog_compiler_pic_CXX='-fPIC'
-+      ;;
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
 +    esac
-+  else
-+    case $host_os in
-+      aix[4-9]*)
-+	# All AIX code is PIC.
-+	if test "$host_cpu" = ia64; then
-+	  # AIX 5 now supports IA64 processor
-+	  lt_prog_compiler_static_CXX='-Bstatic'
-+	else
-+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-+	fi
-+	;;
-+      chorus*)
-+	case $cc_basename in
-+	cxch68*)
-+	  # Green Hills C++ Compiler
-+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-+	  ;;
-+	esac
-+	;;
-+      dgux*)
-+	case $cc_basename in
-+	  ec++*)
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    ;;
-+	  ghcx*)
-+	    # Green Hills C++ Compiler
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      freebsd* | dragonfly*)
-+	# FreeBSD uses GNU C++
-+	;;
-+      hpux9* | hpux10* | hpux11*)
-+	case $cc_basename in
-+	  CC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-+	    if test "$host_cpu" != ia64; then
-+	      lt_prog_compiler_pic_CXX='+Z'
-+	    fi
-+	    ;;
-+	  aCC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-+	    case $host_cpu in
-+	    hppa*64*|ia64*)
-+	      # +Z the default
-+	      ;;
-+	    *)
-+	      lt_prog_compiler_pic_CXX='+Z'
-+	      ;;
-+	    esac
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      interix*)
-+	# This is c89, which is MS Visual C++ (no shared libs)
-+	# Anyone wants to do a port?
-+	;;
-+      irix5* | irix6* | nonstopux*)
-+	case $cc_basename in
-+	  CC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_static_CXX='-non_shared'
-+	    # CC pic flag -KPIC is the default.
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+	case $cc_basename in
-+	  KCC*)
-+	    # KAI C++ Compiler
-+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-+	    lt_prog_compiler_pic_CXX='-fPIC'
-+	    ;;
-+	  ecpc* )
-+	    # old Intel C++ for x86_64 which still supported -KPIC.
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    lt_prog_compiler_static_CXX='-static'
-+	    ;;
-+	  icpc* )
-+	    # Intel C++, used to be incompatible with GCC.
-+	    # ICC 10 doesn't accept -KPIC any more.
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-fPIC'
-+	    lt_prog_compiler_static_CXX='-static'
-+	    ;;
-+	  pgCC* | pgcpp*)
-+	    # Portland Group C++ compiler
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-fpic'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	  cxx*)
-+	    # Compaq C++
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    lt_prog_compiler_pic_CXX=
-+	    lt_prog_compiler_static_CXX='-non_shared'
-+	    ;;
-+	  xlc* | xlC*)
-+	    # IBM XL 8.0 on PPC
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-qpic'
-+	    lt_prog_compiler_static_CXX='-qstaticlink'
-+	    ;;
-+	  *)
-+	    case `$CC -V 2>&1 | sed 5q` in
-+	    *Sun\ C*)
-+	      # Sun C++ 5.9
-+	      lt_prog_compiler_pic_CXX='-KPIC'
-+	      lt_prog_compiler_static_CXX='-Bstatic'
-+	      lt_prog_compiler_wl_CXX='-Qoption ld '
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
-+      lynxos*)
-+	;;
-+      m88k*)
-+	;;
-+      mvs*)
-+	case $cc_basename in
-+	  cxx*)
-+	    lt_prog_compiler_pic_CXX='-W c,exportall'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      netbsd* | netbsdelf*-gnu)
-+	;;
-+      *qnx* | *nto*)
-+        # QNX uses GNU C++, but need to define -shared option too, otherwise
-+        # it will coredump.
-+        lt_prog_compiler_pic_CXX='-fPIC -shared'
-+        ;;
-+      osf3* | osf4* | osf5*)
-+	case $cc_basename in
-+	  KCC*)
-+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-+	    ;;
-+	  RCC*)
-+	    # Rational C++ 2.4.1
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    ;;
-+	  cxx*)
-+	    # Digital/Compaq C++
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    lt_prog_compiler_pic_CXX=
-+	    lt_prog_compiler_static_CXX='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      psos*)
-+	;;
-+      solaris*)
-+	case $cc_basename in
-+	  CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    lt_prog_compiler_wl_CXX='-Qoption ld '
-+	    ;;
-+	  gcx*)
-+	    # Green Hills C++ Compiler
-+	    lt_prog_compiler_pic_CXX='-PIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sunos4*)
-+	case $cc_basename in
-+	  CC*)
-+	    # Sun C++ 4.x
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	  lcc*)
-+	    # Lucid
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+	case $cc_basename in
-+	  CC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	esac
-+	;;
-+      tandem*)
-+	case $cc_basename in
-+	  NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    ;;
-+	  *)
-+	    ;;
++  done
+ 
+-
++  (set) 2>&1 |
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;; #(
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
++      ;;
++    esac |
++    sort
++) |
++  sed '
++     /^ac_cv_env_/b end
++     t clear
++     :clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
 +	esac
-+	;;
-+      vxworks*)
-+	;;
-+      *)
-+	lt_prog_compiler_can_build_shared_CXX=no
-+	;;
-+    esac
++      fi
++    fi
++  else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
 +  fi
++fi
++rm -f confcache
++      as_fn_error $? "static linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." "$LINENO" 5
++    fi
+   fi
++fi
  
--    echo "$as_me:$LINENO: checking whether gcc accepts -Wno-unused-function" >&5
--echo $ECHO_N "checking whether gcc accepts -Wno-unused-function... $ECHO_C" >&6
--if test "${cr_cv_gcc_flag_WNO_UNUSED_FUNCTION+set}" = set; then
++# Check for atfork handling
++for ac_func in __register_atfork
++do :
++  ac_fn_c_check_func "$LINENO" "__register_atfork" "ac_cv_func___register_atfork"
++if test "x$ac_cv_func___register_atfork" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE___REGISTER_ATFORK 1
++_ACEOF
+ 
+-    CR_ASM_NR_ioctl=""
++fi
++done
+ 
+-    echo "$as_me:$LINENO: checking for value for CR_ASM_NR_ioctl" >&5
+-echo $ECHO_N "checking for value for CR_ASM_NR_ioctl... $ECHO_C" >&6
+-if test "${cr_cv_compute_int_CR_ASM_NR_ioctl+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic_CXX=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-+    ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
  
--    SAVE_CFLAGS=$CFLAGS
--    CFLAGS="$CFLAGS -Wno-unused-function"
+-    cr_cv_compute_int_CR_ASM_NR_ioctl="not found"
+-    if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++# Check for call to disable NSCD
++for ac_func in __nss_disable_nscd
++do :
++  ac_fn_c_check_func "$LINENO" "__nss_disable_nscd" "ac_cv_func___nss_disable_nscd"
++if test "x$ac_cv_func___nss_disable_nscd" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE___NSS_DISABLE_NSCD 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((__NR_ioctl) >= 0)];
+-test_array [0] = 0
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=0 ac_mid=0
+-  while :; do
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
 -int
 -main ()
 -{
+-static int test_array [1 - 2 * !((__NR_ioctl) <= $ac_mid)];
+-test_array [0] = 0
++fi
++done
  
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++# Check for pthread_attr_setstacksize
++SAVE_LIBS="$LIBS"
++LIBS="-lpthread $LIBS"
++for ac_func in pthread_attr_setstacksize
++do :
++  ac_fn_c_check_func "$LINENO" "pthread_attr_setstacksize" "ac_cv_func_pthread_attr_setstacksize"
++if test "x$ac_cv_func_pthread_attr_setstacksize" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -64248,125 +70822,207 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=yes
+-  ac_hi=$ac_mid; break
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic_CXX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_pic_works_CXX=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   # The option is referenced via a variable to avoid confusing sed.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -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:15807: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
-+   echo "$as_me:15811: \$? = $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 other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_pic_works_CXX=yes
-+     fi
-+   fi
-+   $RM conftest*
  
--cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=no
- fi
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS=$SAVE_CFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+-  done
++fi
++done
++
++LIBS="$SAVE_LIBS"
++
++# Look for prctl(PR_SET_PDEATHSIG, ...)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pctrl()" >&5
++$as_echo_n "checking for pctrl()... " >&6; }
++if ${cr_cv_prctl+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
-+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-+    case $lt_prog_compiler_pic_CXX in
-+     "" | " "*) ;;
-+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-+     esac
-+else
-+    lt_prog_compiler_pic_CXX=
-+     lt_prog_compiler_can_build_shared_CXX=no
- fi
--echo "$as_me:$LINENO: result: $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&5
--echo "${ECHO_T}$cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&6
--
--  if eval test $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION = yes; then
--    CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wno-unused-function"
--  else
--    :
--  fi
--
--
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((__NR_ioctl) < 0)];
+-test_array [0] = 0
  
--fi # cr_build_libcr
--
--# Additional flags needed when linking utils, tests and examples
--CR_CLIENT_LDADD=""
--if test x"$enable_all_static" = xyes; then
--  CR_CLIENT_LDADD="$CR_CLIENT_LDADD -all-static"
- fi
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
++    #include <sys/prctl.h>
++
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !((__NR_ioctl) >= $ac_mid)];
+-test_array [0] = 0
++
++    int rc = prctl(PR_SET_PDEATHSIG, 0);
  
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=$ac_mid; break
++if ac_fn_c_try_compile "$LINENO"; then :
++  cr_cv_prctl=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  cr_cv_prctl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--# If building the tests, we can optionally test C++
--if test x"$cr_build_tests" = xyes; then
--
--  # Totally gross way to perform a non-fatal probe for CXX
--
--
--
--
--  # Now validate the choice
--  if test "x$CXX" != xno; then
--
--
--    ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_prctl" >&5
++$as_echo "$cr_cv_prctl" >&6; }
++
++  if test x$cr_cv_prctl = xyes; then
++    $as_echo "#define HAVE_PRCTL 1" >>confdefs.h
++
++  else
++    $as_echo "#define HAVE_PRCTL 0" >>confdefs.h
++
++  fi
++
++
++
++# Check various constants needed for asm
++SAVE_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -I${TOP_SRCDIR}/include"
++
++    CR_ASM_OP_HAND_CHKPT=""
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value for CR_ASM_OP_HAND_CHKPT" >&5
++$as_echo_n "checking for value for CR_ASM_OP_HAND_CHKPT... " >&6; }
++if ${cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
--    echo "$as_me:$LINENO: checking for void *" >&5
--echo $ECHO_N "checking for void *... $ECHO_C" >&6
--if test "${ac_cv_type_void_p+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+-ac_lo= ac_hi=
++    cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT="not found"
++    if ac_fn_c_compute_int "$LINENO" "CR_OP_HAND_CHKPT" "cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"        "#include <sys/ioctl.h>
++	 #include \"blcr_ioctl.h\""; then :
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
 -int
 -main ()
 -{
--if ((void * *) 0)
--  return 0;
--if (sizeof (void *))
--  return 0;
+-static int test_array [1 - 2 * !((__NR_ioctl) <= $ac_mid)];
+-test_array [0] = 0
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&5
++$as_echo "$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&6; }
++  if test "$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" != "not found"; then
++    CR_ASM_OP_HAND_CHKPT="$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"
++  fi
+ 
 -  ;
 -  return 0;
 -}
--_ACEOF
++  if test -n "$CR_ASM_OP_HAND_CHKPT"; then
++    cat >>confdefs.h <<_ACEOF
++#define CR_ASM_OP_HAND_CHKPT $CR_ASM_OP_HAND_CHKPT
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -64389,58 +71045,167 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_type_void_p=yes
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
+-  ac_hi=$ac_mid
++
++
++  fi
++
++
++    CR_ASM_CHECKPOINT_STUB=""
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value for CR_ASM_CHECKPOINT_STUB" >&5
++$as_echo_n "checking for value for CR_ASM_CHECKPOINT_STUB... " >&6; }
++if ${cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  lt_cv_prog_compiler_static_works_CXX=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_cv_prog_compiler_static_works_CXX=yes
-+       fi
-+     else
-+       lt_cv_prog_compiler_static_works_CXX=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
  
--ac_cv_type_void_p=no
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++    cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB="not found"
++    if ac_fn_c_compute_int "$LINENO" "_CR_CHECKPOINT_STUB" "cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"        "#include \"blcr_common.h.in\""; then :
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) cr_cv_compute_int_CR_ASM_NR_ioctl=$ac_lo;;
+-'')  ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
+-long longval () { return __NR_ioctl; }
+-unsigned long ulongval () { return __NR_ioctl; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+ 
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if ((__NR_ioctl) < 0)
+-    {
+-      long i = longval ();
+-      if (i != (__NR_ioctl))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != (__NR_ioctl))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
+ 
+-  ;
+-  return 0;
+-}
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&5
++$as_echo "$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&6; }
++  if test "$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" != "not found"; then
++    CR_ASM_CHECKPOINT_STUB="$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"
++  fi
++
++  if test -n "$CR_ASM_CHECKPOINT_STUB"; then
++    cat >>confdefs.h <<_ACEOF
++#define CR_ASM_CHECKPOINT_STUB $CR_ASM_CHECKPOINT_STUB
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_compute_int_CR_ASM_NR_ioctl=`cat conftest.val`
++
++
++  fi
++    # ICK!
++
++    CR_ASM_OP_HAND_ABORT=""
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value for CR_ASM_OP_HAND_ABORT" >&5
++$as_echo_n "checking for value for CR_ASM_OP_HAND_ABORT... " >&6; }
++if ${cr_cv_compute_int_CR_ASM_OP_HAND_ABORT+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++
++    cr_cv_compute_int_CR_ASM_OP_HAND_ABORT="not found"
++    if ac_fn_c_compute_int "$LINENO" "CR_OP_HAND_ABORT" "cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"        "#include <sys/ioctl.h>
++	 #include \"blcr_ioctl.h\""; then :
+ 
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
--echo "${ECHO_T}$ac_cv_type_void_p" >&6
+-fi
+-rm -f conftest.val
++
+ 
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_NR_ioctl" >&5
+-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_NR_ioctl" >&6
+-  if test "$cr_cv_compute_int_CR_ASM_NR_ioctl" != "not found"; then
+-    CR_ASM_NR_ioctl="$cr_cv_compute_int_CR_ASM_NR_ioctl"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&5
++$as_echo "$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&6; }
++  if test "$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" != "not found"; then
++    CR_ASM_OP_HAND_ABORT="$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"
+   fi
+ 
+-  if test -n "$CR_ASM_NR_ioctl"; then
++  if test -n "$CR_ASM_OP_HAND_ABORT"; then
+     cat >>confdefs.h <<_ACEOF
+-#define CR_ASM_NR_ioctl $CR_ASM_NR_ioctl
++#define CR_ASM_OP_HAND_ABORT $CR_ASM_OP_HAND_ABORT
+ _ACEOF
+ 
+ 
 -
--echo "$as_me:$LINENO: checking size of void *" >&5
--echo $ECHO_N "checking size of void *... $ECHO_C" >&6
--if test "${ac_cv_sizeof_void_p+set}" = set; then
+   fi
+ 
+ 
+-    CR_ASM_NR_rt_sigreturn=""
++    CR_ASM_CHECKPOINT_OMIT=""
+ 
+-    echo "$as_me:$LINENO: checking for value for CR_ASM_NR_rt_sigreturn" >&5
+-echo $ECHO_N "checking for value for CR_ASM_NR_rt_sigreturn... $ECHO_C" >&6
+-if test "${cr_cv_compute_int_CR_ASM_NR_rt_sigreturn+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test "$ac_cv_type_void_p" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
--  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--  # This bug is HP SR number 8606223364.
--  if test "$cross_compiling" = yes; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value for CR_ASM_CHECKPOINT_OMIT" >&5
++$as_echo_n "checking for value for CR_ASM_CHECKPOINT_OMIT... " >&6; }
++if ${cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+-    cr_cv_compute_int_CR_ASM_NR_rt_sigreturn="not found"
+-    if test "$cross_compiling" = yes; then
 -  # Depending upon the size, compute the lo and hi bounds.
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -64448,13 +71213,16 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
 -int
 -main ()
 -{
--static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)];
+-static int test_array [1 - 2 * !((__NR_rt_sigreturn) >= 0)];
 -test_array [0] = 0
--
++    cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT="not found"
++    if ac_fn_c_compute_int "$LINENO" "CR_CHECKPOINT_OMIT" "cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"        "#include \"blcr_common.h.in\""; then :
+ 
 -  ;
 -  return 0;
 -}
@@ -64489,14 +71257,14 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
 -int
 -main ()
 -{
--static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+-static int test_array [1 - 2 * !((__NR_rt_sigreturn) <= $ac_mid)];
 -test_array [0] = 0
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
++fi
  
 -  ;
 -  return 0;
@@ -64525,39 +71293,45 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_hi=$ac_mid; break
-+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-+    :
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -ac_lo=`expr $ac_mid + 1`
 -		    if test $ac_lo -le $ac_mid; then
 -		      ac_lo= ac_hi=
 -		      break
 -		    fi
 -		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+    lt_prog_compiler_static_CXX=
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&5
++$as_echo "$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&6; }
++  if test "$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" != "not found"; then
++    CR_ASM_CHECKPOINT_OMIT="$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"
++  fi
+ 
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++  if test -n "$CR_ASM_CHECKPOINT_OMIT"; then
++    cat >>confdefs.h <<_ACEOF
++#define CR_ASM_CHECKPOINT_OMIT $CR_ASM_CHECKPOINT_OMIT
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
 -int
 -main ()
 -{
--static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)];
+-static int test_array [1 - 2 * !((__NR_rt_sigreturn) < 0)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -64592,13 +71366,14 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
 -int
 -main ()
 -{
--static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)];
+-static int test_array [1 - 2 * !((__NR_rt_sigreturn) >= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -64629,6 +71404,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  fi
++    # ICK!
  
 -ac_hi=`expr '(' $ac_mid ')' - 1`
 -		       if test $ac_mid -le $ac_hi; then
@@ -64639,14 +71416,28 @@
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
--else
++    CR_ASM_SI_PID_OFFSET=""
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value for CR_ASM_SI_PID_OFFSET" >&5
++$as_echo_n "checking for value for CR_ASM_SI_PID_OFFSET... " >&6; }
++if ${cr_cv_compute_int_CR_ASM_SI_PID_OFFSET+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_lo= ac_hi=
--fi
++    cr_cv_compute_int_CR_ASM_SI_PID_OFFSET="not found"
++    if ac_fn_c_compute_int "$LINENO" "offsetof(struct siginfo, si_pid)" "cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"        "#include <signal.h>
++	 #ifndef offsetof
++  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
++	 #endif"; then :
++
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -# Binary search between lo and hi bounds.
 -while test "x$ac_lo" != "x$ac_hi"; do
@@ -64657,17 +71448,26 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
 -int
 -main ()
 -{
--static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+-static int test_array [1 - 2 * !((__NR_rt_sigreturn) <= $ac_mid)];
 -test_array [0] = 0
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&5
++$as_echo "$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&6; }
++  if test "$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" != "not found"; then
++    CR_ASM_SI_PID_OFFSET="$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"
++  fi
  
 -  ;
 -  return 0;
 -}
--_ACEOF
++  if test -n "$CR_ASM_SI_PID_OFFSET"; then
++    cat >>confdefs.h <<_ACEOF
++#define CR_ASM_SI_PID_OFFSET $CR_ASM_SI_PID_OFFSET
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -64691,27 +71491,34 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_hi=$ac_mid
--else
++
++
++  fi
++
++
++    CR_ASM_NR_ioctl=""
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value for CR_ASM_NR_ioctl" >&5
++$as_echo_n "checking for value for CR_ASM_NR_ioctl... " >&6; }
++if ${cr_cv_compute_int_CR_ASM_NR_ioctl+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
++    cr_cv_compute_int_CR_ASM_NR_ioctl="not found"
++    if ac_fn_c_compute_int "$LINENO" "__NR_ioctl" "cr_cv_compute_int_CR_ASM_NR_ioctl"        "#include <asm/unistd.h>
++	 #include <linux/unistd.h>"; then :
++
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -case $ac_lo in
--?*) ac_cv_sizeof_void_p=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (void *), 77
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
+-?*) cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=$ac_lo;;
+-'')  ;;
 -esac
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
@@ -64725,44 +71532,49 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
--long longval () { return (long) (sizeof (void *)); }
--unsigned long ulongval () { return (long) (sizeof (void *)); }
+-#include <asm/unistd.h>
+-	 #include <linux/unistd.h>
+-long longval () { return __NR_rt_sigreturn; }
+-unsigned long ulongval () { return __NR_rt_sigreturn; }
 -#include <stdio.h>
 -#include <stdlib.h>
 -int
 -main ()
 -{
--
+ 
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
 -    exit (1);
--  if (((long) (sizeof (void *))) < 0)
+-  if ((__NR_rt_sigreturn) < 0)
 -    {
 -      long i = longval ();
--      if (i != ((long) (sizeof (void *))))
+-      if (i != (__NR_rt_sigreturn))
 -	exit (1);
 -      fprintf (f, "%ld\n", i);
 -    }
 -  else
 -    {
 -      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (void *))))
+-      if (i != (__NR_rt_sigreturn))
 -	exit (1);
 -      fprintf (f, "%lu\n", i);
 -    }
 -  exit (ferror (f) || fclose (f) != 0);
-+  lt_cv_prog_compiler_c_o_CXX=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
 -  ;
 -  return 0;
 -}
--_ACEOF
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_NR_ioctl" >&5
++$as_echo "$cr_cv_compute_int_CR_ASM_NR_ioctl" >&6; }
++  if test "$cr_cv_compute_int_CR_ASM_NR_ioctl" != "not found"; then
++    CR_ASM_NR_ioctl="$cr_cv_compute_int_CR_ASM_NR_ioctl"
++  fi
++
++  if test -n "$CR_ASM_NR_ioctl"; then
++    cat >>confdefs.h <<_ACEOF
++#define CR_ASM_NR_ioctl $CR_ASM_NR_ioctl
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
@@ -64774,535 +71586,168 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_sizeof_void_p=`cat conftest.val`
--else
+-  cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=`cat conftest.val`
++
++
++  fi
++
++
++    CR_ASM_NR_rt_sigreturn=""
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value for CR_ASM_NR_rt_sigreturn" >&5
++$as_echo_n "checking for value for CR_ASM_NR_rt_sigreturn... " >&6; }
++if ${cr_cv_compute_int_CR_ASM_NR_rt_sigreturn+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:15906: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:15910: \$? = $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
-+     # So say no if there are warnings
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o_CXX=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
++
++    cr_cv_compute_int_CR_ASM_NR_rt_sigreturn="not found"
++    if ac_fn_c_compute_int "$LINENO" "__NR_rt_sigreturn" "cr_cv_compute_int_CR_ASM_NR_rt_sigreturn"        "#include <asm/unistd.h>
++	 #include <linux/unistd.h>"; then :
  
--( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (void *), 77
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
+ fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
 -fi
 -rm -f conftest.val
--else
--  ac_cv_sizeof_void_p=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
--echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
- 
- 
--    ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--    echo "$as_me:$LINENO: checking whether CXX='$CXX' acts like a C++ compiler" >&5
--echo $ECHO_N "checking whether CXX='$CXX' acts like a C++ compiler... $ECHO_C" >&6
--if test "${cr_cv_cxx_is_cxx+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
-+  lt_cv_prog_compiler_c_o_CXX=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--      cr_cv_cxx_is_cxx=no
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--	#ifndef __cplusplus
--	    #error __cplusplus must be defined in a C++ compilation!
--	#endif
--
--int
--main ()
--{
-- int x = 1;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { 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
--  cr_cv_cxx_is_cxx=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:15958: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:15962: \$? = $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
-+     # So say no if there are warnings
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o_CXX=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
++
  
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
- 
--fi
--echo "$as_me:$LINENO: result: $cr_cv_cxx_is_cxx" >&5
--echo "${ECHO_T}$cr_cv_cxx_is_cxx" >&6
--    if test x"$cr_cv_cxx_is_cxx" = xyes; then
--      echo "$as_me:$LINENO: checking whether CXX='$CXX' matches wordsize of CC" >&5
--echo $ECHO_N "checking whether CXX='$CXX' matches wordsize of CC... $ECHO_C" >&6
--if test "${cr_cv_cxx_voidp+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
- 
--        cr_cv_cxx_voidp=no
--        cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
+-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&5
+-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&5
++$as_echo "$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&6; }
+   if test "$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" != "not found"; then
+     CR_ASM_NR_rt_sigreturn="$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn"
+   fi
+@@ -24944,25 +18647,22 @@
+ _ACEOF
  
--	  #ifndef __cplusplus
--	      #error __cplusplus must be defined in a C++ compilation!
--	  #endif
  
--int
--main ()
--{
-- int a[(($ac_cv_sizeof_void_p == sizeof(void *))? 1 : -1)];
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { 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
--  cr_cv_cxx_voidp=yes
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-+$as_echo_n "checking if we can lock with hard links... " >&6; }
-+  hard_links=yes
-+  $RM conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-+  if test "$hard_links" = no; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    need_locks=warn
-+  fi
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--
-+  need_locks=no
- fi
--echo "$as_me:$LINENO: result: $cr_cv_cxx_voidp" >&5
--echo "${ECHO_T}$cr_cv_cxx_voidp" >&6
--    fi
--    ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -
--    if test x"$cr_cv_cxx_is_cxx$cr_cv_cxx_voidp" != xyesyes; then
--      CXX=no
--    fi
--  fi
- 
--fi
+   fi
  
--################################################################################
--# Check libraries
--################################################################################
+ CFLAGS="$SAVE_CFLAGS"
  
--if test x"$cr_build_libcr" = xyes; then
--# Check for a sufficiently new glibc
--# XXX: What is our true lower bound?
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+ # Probe for direction of stack growth
  
--    echo "$as_me:$LINENO: checking for GNU libc version >= 2.2" >&5
--echo $ECHO_N "checking for GNU libc version >= 2.2... $ECHO_C" >&6
--if test "${cr_cv_check_glibc_2_2_or_higher+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  case $host_os in
-+  aix[4-9]*)
-+    # If we're using GNU nm, then we don't want the "-C" option.
-+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+    else
-+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+    fi
-+    ;;
-+  pw32*)
-+    export_symbols_cmds_CXX="$ltdll_cmds"
-+  ;;
-+  cygwin* | mingw* | cegcc*)
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_CXX=no
-+  ;;
-+  *)
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  esac
-+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+-    echo "$as_me:$LINENO: checking for direction of stack growth" >&5
+-echo $ECHO_N "checking for direction of stack growth... $ECHO_C" >&6
+-if test "${cr_cv_check_stack_direction+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for direction of stack growth" >&5
++$as_echo_n "checking for direction of stack growth... " >&6; }
++if ${cr_cv_check_stack_direction+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
--    cat >conftest.$ac_ext <<_ACEOF
+-   if test "$cross_compiling" = yes; then
++   if test "$cross_compiling" = yes; then :
+ 
+   if test "${cross_stack_direction-unset}" = unset; then
+-    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_stack_direction must be set." >&5
+-echo "$as_me: error: When cross-compiling, variable cross_stack_direction must be set." >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "When cross-compiling, variable cross_stack_direction must be set." "$LINENO" 5
+   fi
+ 
+ 	 if test $cross_stack_direction = 1; then
+@@ -24971,11 +18671,7 @@
+ 	   cr_cv_check_stack_direction=down
+ 	 fi
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
-+test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
--	#include <features.h>
--	#ifndef __GLIBC_PREREQ
--	    #define __GLIBC_PREREQ(maj, min) \
--		((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
--	#endif
--	#if !__GLIBC_PREREQ(2, 2)
--	    #error "Bad glibc version"
--	#endif
--	extern int gnu_get_libc_version(void); /* Ensures this *is* glibc */
-+with_gnu_ld_CXX=$with_gnu_ld
- 
--int
--main ()
--{
- 
--	return !gnu_get_libc_version();
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+     int find_stack_direction (void) {
+@@ -24992,32 +18688,19 @@
+       return find_stack_direction();
+     }
+ _ACEOF
+-rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  (eval $ac_link) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+-  (exit $ac_status); } && { ac_try='./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
--  cr_cv_check_glibc_2_2_or_higher=yes
--else
--  echo "$as_me: failed program was:" >&5
++if ac_fn_c_try_run "$LINENO"; then :
+   cr_cv_check_stack_direction=up
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--cr_cv_check_glibc_2_2_or_higher=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
- 
--fi
--echo "$as_me:$LINENO: result: $cr_cv_check_glibc_2_2_or_higher" >&5
--echo "${ECHO_T}$cr_cv_check_glibc_2_2_or_higher" >&6
- 
--  if eval test $cr_cv_check_glibc_2_2_or_higher = yes; then
--    :
--  else
--    cat >confcache <<\_ACEOF
--# This file is a shell script that caches the results of configure
--# tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
- #
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
-+# Do we need to explicitly link libc?
- #
--# `ac_cv_env_foo' variables (set or unset) will be overridden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
 -
--_ACEOF
-+case "x$archive_cmds_need_lc_CXX" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc_CXX=yes
+-( exit $ac_status )
+-cr_cv_check_stack_direction=down
++  cr_cv_check_stack_direction=down
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
  
--# The following way of writing the cache mishandles newlines in values,
--# but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
--# Ultrix sh set writes to stderr and can't be redirected directly,
--# and sets the high bit in the cache file unless we assign to the vars.
--{
--  (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
--      sed -n \
--	"s/'/'\\\\''/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
--    *)
--      # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds_CXX in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-       ;;
--    esac;
--} |
--  sed '
--     t clear
--     : clear
--     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--     t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--    cat confcache >$cache_file
--  else
--    echo "not updating unwritable cache $cache_file"
--  fi
--fi
--rm -f confcache
--   { { echo "$as_me:$LINENO: error: the C library does not appear to be glibc 2.2 or higher." >&5
--echo "$as_me: error: the C library does not appear to be glibc 2.2 or higher." >&2;}
--   { (exit 1); exit 1; }; }
-+    '$CC '*)
-+      # Test whether the compiler implicitly links with -lc since on some
-+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+      # to ld, don't add -lc before -lgcc.
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+      $RM conftest*
-+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +
-+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl_CXX
-+	pic_flag=$lt_prog_compiler_pic_CXX
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-+        allow_undefined_flag_CXX=
-+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+        then
-+	  archive_cmds_need_lc_CXX=no
-+        else
-+	  archive_cmds_need_lc_CXX=yes
-+        fi
-+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-+      ;;
-+    esac
-   fi
-+  ;;
-+esac
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_check_stack_direction" >&5
+-echo "${ECHO_T}$cr_cv_check_stack_direction" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_check_stack_direction" >&5
++$as_echo "$cr_cv_check_stack_direction" >&6; }
+   if test $cr_cv_check_stack_direction = up; then
+     cr_stack_direction=1
+   else
+@@ -25030,7 +18713,6 @@
  
  
  
--# Checks for required libraries and fail if they are not found
--# Note that we are NOT adding them to LIBS, just verifying their presence.
--echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
--echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlsym+set}" = set; then
+-
+ # Look for FTB header and libs
+  cr_have_ftb=no
+  if test x"$FTB_HOME" != xno; then
+@@ -25040,20 +18722,16 @@
+   SAVE_LIBS="$LIBS"
+   CR_FTB_INCLUDES=""
+   CR_FTB_LDFLAGS=""
+-  echo "$as_me:$LINENO: checking for FTB headers" >&5
+-echo $ECHO_N "checking for FTB headers... $ECHO_C" >&6
+-if test "${cr_cv_ftb_incdir+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FTB headers" >&5
++$as_echo_n "checking for FTB headers... " >&6; }
++if ${cr_cv_ftb_incdir+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+     cr_result=no
+     for cr_tmp in "" "${FTB_HOME}/include"; do
+       CPPFLAGS="$SAVE_CPPFLAGS${cr_tmp:+ -I$cr_tmp}"
+-      cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlsym ();
--int
--main ()
--{
--dlsym ();
--  ;
--  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
+         #include <libftb.h>
+@@ -25068,35 +18746,10 @@
+   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
@@ -65316,116 +71761,65 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_lib_dl_dlsym=yes
++if ac_fn_c_try_compile "$LINENO"; then :
+   cr_result="$cr_tmp"; break
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     done
+     if test -z "$cr_result"; then
+       cr_cv_ftb_incdir="default"
+@@ -25105,17 +18758,17 @@
+     fi
  
--ac_cv_lib_dl_dlsym=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
--if test $ac_cv_lib_dl_dlsym = yes; then
--  :
--else
--  cat >confcache <<\_ACEOF
--# This file is a shell script that caches the results of configure
--# tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
--#
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
--#
--# `ac_cv_env_foo' variables (set or unset) will be overridden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
- 
--_ACEOF
- 
--# The following way of writing the cache mishandles newlines in values,
--# but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
--# Ultrix sh set writes to stderr and can't be redirected directly,
--# and sets the high bit in the cache file unless we assign to the vars.
--{
--  (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
--      sed -n \
--	"s/'/'\\\\''/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
--    *)
--      # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--      ;;
--    esac;
--} |
--  sed '
--     t clear
--     : clear
--     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--     t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--    cat confcache >$cache_file
--  else
--    echo "not updating unwritable cache $cache_file"
--  fi
--fi
--rm -f confcache
--   { { echo "$as_me:$LINENO: error: required library libdl not found." >&5
--echo "$as_me: error: required library libdl not found." >&2;}
--   { (exit 1); exit 1; }; }
--fi
- 
--echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
--if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_ftb_incdir" >&5
+-echo "${ECHO_T}$cr_cv_ftb_incdir" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_ftb_incdir" >&5
++$as_echo "$cr_cv_ftb_incdir" >&6; }
+   if test x"$cr_cv_ftb_incdir" = xno; then
+     cr_have_ftb=no
+   elif test x"$cr_cv_ftb_incdir" != "xdefault"; then
+     CR_FTB_INCLUDES="-I$cr_cv_ftb_incdir"
+   fi
+-  echo "$as_me:$LINENO: checking for FTB libs" >&5
+-echo $ECHO_N "checking for FTB libs... $ECHO_C" >&6
+-if test "${cr_cv_ftb_libdir+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FTB libs" >&5
++$as_echo_n "checking for FTB libs... " >&6; }
++if ${cr_cv_ftb_libdir+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+     CPPFLAGS="$SAVE_CPPFLAGS $CR_FTB_INCLUDES"
+@@ -25123,11 +18776,7 @@
+     cr_result=no
+     for cr_tmp in "" "${FTB_HOME}/lib64" "${FTB_HOME}/lib32" "${FTB_HOME}/lib"; do
+       LDFLAGS="$SAVE_LDFLAGS${cr_tmp:+-L$cr_tmp}"
+-      cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char pthread_create ();
--int
--main ()
--{
--pthread_create ();
--  ;
--  return 0;
--}
--_ACEOF
+         #include <libftb.h>
+@@ -25142,36 +18791,11 @@
+   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
@@ -65448,151 +71842,104 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_lib_pthread_pthread_create=yes
++if ac_fn_c_try_link "$LINENO"; then :
+   cr_result="$cr_tmp"; break
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_pthread_pthread_create=no
--fi
+-
+ fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
--echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
--if test $ac_cv_lib_pthread_pthread_create = yes; then
--  :
--else
--  cat >confcache <<\_ACEOF
--# This file is a shell script that caches the results of configure
--# tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
--#
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
--#
--# `ac_cv_env_foo' variables (set or unset) will be overridden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
- 
--_ACEOF
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+     done
+     if test -z "$cr_result"; then
+       cr_cv_ftb_libdir="default"
+@@ -25180,8 +18804,8 @@
+     fi
  
--# The following way of writing the cache mishandles newlines in values,
--# but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
--# Ultrix sh set writes to stderr and can't be redirected directly,
--# and sets the high bit in the cache file unless we assign to the vars.
--{
--  (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
--      sed -n \
--	"s/'/'\\\\''/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
--    *)
--      # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--      ;;
--    esac;
--} |
--  sed '
--     t clear
--     : clear
--     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--     t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--    cat confcache >$cache_file
--  else
--    echo "not updating unwritable cache $cache_file"
--  fi
--fi
--rm -f confcache
--   { { echo "$as_me:$LINENO: error: required library libpthread not found." >&5
--echo "$as_me: error: required library libpthread not found." >&2;}
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_ftb_libdir" >&5
+-echo "${ECHO_T}$cr_cv_ftb_libdir" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_ftb_libdir" >&5
++$as_echo "$cr_cv_ftb_libdir" >&6; }
+   if test x"$cr_cv_ftb_libdir" = xno; then
+     cr_have_ftb=no
+   elif test x"$cr_cv_ftb_libdir" != "xdefault"; then
+@@ -25192,9 +18816,7 @@
+   LDFLAGS="$SAVE_LDFLAGS"
+   CPPFLAGS="$SAVE_CPPFLAGS"
+   if test x"$cr_have_ftb$cr_force_ftb" = xnoyes; then
+-    { { echo "$as_me:$LINENO: error: Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" >&5
+-echo "$as_me: error: Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" >&2;}
 -   { (exit 1); exit 1; }; }
--fi
++    as_fn_error $? "Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" "$LINENO" 5
+   fi
  
  
--# Prep a variable for possible use in messages below
--if test x"$enable_multilib" = xyes; then
--  ldsuggest='-L/usr/lib/nptl -L/usr/lib64/nptl'
--elif test x"$ac_cv_sizeof_void_p" = x8; then
--  ldsuggest='-L/usr/lib64/nptl'
--else
--  ldsuggest='-L/usr/lib/nptl'
--fi
+@@ -25202,48 +18824,37 @@
+  fi
  
--# Helper for LinuxThreads probes
--# CR_LT_PROBE(cv_varname, cross_varname)
+   if test x$cr_have_ftb = xyes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FTB 1
+-_ACEOF
++    $as_echo "#define HAVE_FTB 1" >>confdefs.h
  
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FTB 0
+-_ACEOF
++    $as_echo "#define HAVE_FTB 0" >>confdefs.h
  
--# Look for LinuxThreads in the default (probably dynamic) library
--echo "$as_me:$LINENO: checking whether default pthreads library is LinuxThreads" >&5
--echo $ECHO_N "checking whether default pthreads library is LinuxThreads... $ECHO_C" >&6
--if test "${cr_cv_pt_default_lt+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+   fi
  
--  SAVE_LIBS="$LIBS"
--  LIBS="-lpthread $LIBS"
  
--  if test "$cross_compiling" = yes; then
  
+-
+ fi # cr_build_libcr
  
--  if test "${cross_linuxthreads-unset}" = unset; then
--    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_linuxthreads must be set." >&5
--echo "$as_me: error: When cross-compiling, variable cross_linuxthreads must be set." >&2;}
--   { (exit 1); exit 1; }; }
--  fi
+ # Probe libc for the RT signal number to use
+ 
+-    echo "$as_me:$LINENO: checking for value of CR_SIGNUM" >&5
+-echo $ECHO_N "checking for value of CR_SIGNUM... $ECHO_C" >&6
+-if test "${cr_cv_check_cr_signum+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_SIGNUM" >&5
++$as_echo_n "checking for value of CR_SIGNUM... " >&6; }
++if ${cr_cv_check_cr_signum+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+     cr_cv_check_cr_signum="failed"
+     SAVE_LIBS="$LIBS"
+     LIBS="-ldl -lpthread $LIBS"
+-    if test "$cross_compiling" = yes; then
++    if test "$cross_compiling" = yes; then :
  
--    if test x"$cross_linuxthreads" != x0; then
--  cr_cv_pt_default_lt=yes
--else
--  cr_cv_pt_default_lt=no
--fi
+   if test "${cross_signum-unset}" = unset; then
+-    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_signum must be set." >&5
+-echo "$as_me: error: When cross-compiling, variable cross_signum must be set." >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "When cross-compiling, variable cross_signum must be set." "$LINENO" 5
+   fi
  
--else
+ 	 cr_cv_check_cr_signum=$cross_signum
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--	#include <sys/types.h>
--	#include <unistd.h>
--	#include <stdio.h>
--	#include <pthread.h>
- 
--	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
- 
--	int main(void) {
--	    pthread_t th;
--	    void *join_val;
- 
--	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
--		fputs("Error calling pthread_create()\n", stderr);
--		return -1;
--	    }
--	    if (0 != pthread_join(th, &join_val)) {
--		fputs("Error calling pthread_join()\n", stderr);
--		return -1;
--	    }
- 
--	    /* zero = NOT equal pids = LinuxThreads */
--	    return ((long)join_val == (long)getpid());
--	}
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdio.h>
+ 	#include <dlfcn.h>
+@@ -25266,450 +18877,54 @@
+ 	  fprintf(f, "%d\n", s);
+ 	  return(0);
+ 	}
 -_ACEOF
 -rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -65605,249 +71952,159 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  cr_cv_pt_default_lt=yes
+-  cr_cv_check_cr_signum=`cat conftestval`
 -else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -( exit $ac_status )
--cr_cv_pt_default_lt=no
+-{ { echo "$as_me:$LINENO: error: Failed to probe CR_SIGNUM" >&5
+-echo "$as_me: error: Failed to probe CR_SIGNUM" >&2;}
+-   { (exit 1); exit 1; }; }
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
- 
--  LIBS="$SAVE_LIBS"
- 
--fi
--echo "$as_me:$LINENO: result: $cr_cv_pt_default_lt" >&5
--echo "${ECHO_T}$cr_cv_pt_default_lt" >&6
--if test x"$cr_cv_pt_default_lt" = xyes; then
--  { { echo "$as_me:$LINENO: error: linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&5
--echo "$as_me: error: linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&2;}
--   { (exit 1); exit 1; }; }
+-    LIBS="$SAVE_LIBS"
+-
 -fi
- 
--# Now look for LinuxThreads in the static libs if we are building static ones ourself
--if test x"$enable_static" = xyes; then
--  # Look for LinuxThreads in the static library
--  echo "$as_me:$LINENO: checking whether static pthreads library is LinuxThreads" >&5
--echo $ECHO_N "checking whether static pthreads library is LinuxThreads... $ECHO_C" >&6
--if test "${cr_cv_pt_static_lt+set}" = set; then
+-echo "$as_me:$LINENO: result: $cr_cv_check_cr_signum" >&5
+-echo "${ECHO_T}$cr_cv_check_cr_signum" >&6
+-  CR_SIGNUM=$cr_cv_check_cr_signum
+-
+-
+-
+-# Check for 32- or 64-bit architecture
+-echo "$as_me:$LINENO: checking for void *" >&5
+-echo $ECHO_N "checking for void *... $ECHO_C" >&6
+-if test "${ac_cv_type_void_p+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
- 
--    SAVE_LIBS="$LIBS"
--    SAVE_LDFLAGS="$LDFLAGS"
--    LDFLAGS="$LDFLAGS -static"
--    LIBS="-lpthread $LIBS"
- 
--  if test "$cross_compiling" = yes; then
- 
- 
--  if test "${cross_linuxthreads_static-unset}" = unset; then
--    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_linuxthreads_static must be set." >&5
--echo "$as_me: error: When cross-compiling, variable cross_linuxthreads_static must be set." >&2;}
--   { (exit 1); exit 1; }; }
--  fi
- 
--    if test x"$cross_linuxthreads_static" != x0; then
--  cr_cv_pt_static_lt=yes
--else
--  cr_cv_pt_static_lt=no
--fi
- 
--else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
--	#include <sys/types.h>
--	#include <unistd.h>
--	#include <stdio.h>
--	#include <pthread.h>
- 
--	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
- 
--	int main(void) {
--	    pthread_t th;
--	    void *join_val;
- 
--	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
--		fputs("Error calling pthread_create()\n", stderr);
--		return -1;
--	    }
--	    if (0 != pthread_join(th, &join_val)) {
--		fputs("Error calling pthread_join()\n", stderr);
--		return -1;
--	    }
- 
--	    /* zero = NOT equal pids = LinuxThreads */
--	    return ((long)join_val == (long)getpid());
--	}
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((void * *) 0)
+-  return 0;
+-if (sizeof (void *))
+-  return 0;
+-  ;
+-  return 0;
+-}
 -_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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='./conftest$ac_exeext'
+-  (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
--  cr_cv_pt_static_lt=yes
+-  ac_cv_type_void_p=yes
 -else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
+-  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--( exit $ac_status )
--cr_cv_pt_static_lt=no
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
- 
--    LIBS="$SAVE_LIBS"
--    LDFLAGS="$SAVE_LDFLAGS"
- 
--fi
--echo "$as_me:$LINENO: result: $cr_cv_pt_static_lt" >&5
--echo "${ECHO_T}$cr_cv_pt_static_lt" >&6
--  if test x"$cr_cv_pt_static_lt" = xyes; then
--    { echo "$as_me:$LINENO: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&5
--echo "$as_me: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&2;}
--    cr_static_link_warning="yes"
--    if test x"$enable_all_static" = xyes; then
--      cat >confcache <<\_ACEOF
--# This file is a shell script that caches the results of configure
--# tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
--#
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
--#
--# `ac_cv_env_foo' variables (set or unset) will be overridden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
- 
--_ACEOF
- 
--# The following way of writing the cache mishandles newlines in values,
--# but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
--# Ultrix sh set writes to stderr and can't be redirected directly,
--# and sets the high bit in the cache file unless we assign to the vars.
--{
--  (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
--      sed -n \
--	"s/'/'\\\\''/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
--    *)
--      # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--      ;;
--    esac;
--} |
--  sed '
--     t clear
--     : clear
--     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--     t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--    cat confcache >$cache_file
--  else
--    echo "not updating unwritable cache $cache_file"
--  fi
+-
+-ac_cv_type_void_p=no
 -fi
--rm -f confcache
--      { { echo "$as_me:$LINENO: error: static linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&5
--echo "$as_me: error: static linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&2;}
--   { (exit 1); exit 1; }; }
--    fi
--  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
- 
--# Check for atfork handling
- 
--for ac_func in __register_atfork
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
+-echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
+-echo "${ECHO_T}$ac_cv_type_void_p" >&6
+-
+-echo "$as_me:$LINENO: checking size of void *" >&5
+-echo $ECHO_N "checking size of void *... $ECHO_C" >&6
+-if test "${ac_cv_sizeof_void_p+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--  cat >conftest.$ac_ext <<_ACEOF
+-  if test "$ac_cv_type_void_p" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
- 
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
- 
--#undef $ac_func
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
+-$ac_includes_default
+-int
+-main ()
 -{
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
+-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
 -}
--#endif
- 
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
 -int
 -main ()
 -{
--return f != $ac_func;
+-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+-test_array [0] = 0
+-
 -  ;
 -  return 0;
 -}
 -_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -65861,101 +72118,156 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  eval "$as_ac_var=yes"
+-  ac_hi=$ac_mid; break
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_var=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
- 
+-
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
 -fi
--done
- 
- 
--# Check for pthread_attr_setstacksize
--SAVE_LIBS="$LIBS"
--LIBS="-lpthread $LIBS"
- 
--for ac_func in pthread_attr_setstacksize
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
 -else
--  cat >conftest.$ac_ext <<_ACEOF
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
- 
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
- 
--#undef $ac_func
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
+-$ac_includes_default
+-int
+-main ()
 -{
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
+-static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
 -}
--#endif
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- 
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
 -int
 -main ()
 -{
--return f != $ac_func;
+-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+-test_array [0] = 0
+-
 -  ;
 -  return 0;
 -}
 -_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -65969,1628 +72281,1237 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  eval "$as_ac_var=yes"
+-  ac_hi=$ac_mid
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
- 
--eval "$as_ac_var=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
- 
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
 -fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
- 
--LIBS="$SAVE_LIBS"
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
- 
--# Look for prctl(PR_SET_PDEATHSIG, ...)
--echo "$as_me:$LINENO: checking for pctrl()" >&5
--echo $ECHO_N "checking for pctrl()... $ECHO_C" >&6
--if test "${cr_cv_prctl+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-case $ac_lo in
+-?*) ac_cv_sizeof_void_p=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (void *), 77
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
 -else
-+aix[4-9]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
- 
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+amigaos*)
-+  case $host_cpu in
-+  powerpc)
-+    # Since July 2007 AmigaOS4 officially supports .so libraries.
-+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    ;;
-+  m68k)
-+    library_names_spec='$libname.ixlibrary $libname.a'
-+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    ;;
-+  esac
-+  ;;
- 
--    #include <sys/prctl.h>
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
- 
+-$ac_includes_default
+-long longval () { return (long) (sizeof (void *)); }
+-unsigned long ulongval () { return (long) (sizeof (void *)); }
+-#include <stdio.h>
+-#include <stdlib.h>
 -int
 -main ()
 -{
-+bsdi[45]*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if (((long) (sizeof (void *))) < 0)
+-    {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (void *))))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (void *))))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_sizeof_void_p=`cat conftest.val`
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  cr_cv_check_cr_signum=`cat conftestval`
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (void *), 77
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "Failed to probe CR_SIGNUM" "$LINENO" 5
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
 +
-+cygwin* | mingw* | pw32* | cegcc*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
++    LIBS="$SAVE_LIBS"
 +
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname~
-+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+      fi'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
+ fi
+-rm -f conftest.val
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_check_cr_signum" >&5
++$as_echo "$cr_cv_check_cr_signum" >&6; }
++  CR_SIGNUM=$cr_cv_check_cr_signum
++
++
++
++# Check for 32- or 64-bit architecture
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
++$as_echo_n "checking size of void *... " >&6; }
++if ${ac_cv_sizeof_void_p+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
++
+ else
+-  ac_cv_sizeof_void_p=0
++  if test "$ac_cv_type_void_p" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error 77 "cannot compute sizeof (void *)
++See \`config.log' for more details" "$LINENO" 5; }
++   else
++     ac_cv_sizeof_void_p=0
++   fi
+ fi
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
++$as_echo "$ac_cv_sizeof_void_p" >&6; }
++
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+ _ACEOF
+@@ -25718,11 +18933,9 @@
+ CR_LIBARCH=$CR_ARCH
+ if test $ac_cv_sizeof_void_p != $cr_wordsize; then
+   if test $cr_wordsize = 8; then
+-    CR_LIBARCH=$CR_ARCH32
++    CR_LIBARCH=${CR_LIBARCH32:-$CR_ARCH32}
+   else
+-    { { echo "$as_me:$LINENO: error: CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" >&5
+-echo "$as_me: error: CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" "$LINENO" 5
+   fi
+ fi
+ 
+@@ -25734,25 +18947,15 @@
+ cr_build_libcr32=no
+ if test x"$enable_multilib" = xyes; then
+   if test x"$cr_build_libcr" != xyes; then
+-    { { echo "$as_me:$LINENO: error: --enable-multilib requested but not building libcr" >&5
+-echo "$as_me: error: --enable-multilib requested but not building libcr" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "--enable-multilib requested but not building libcr" "$LINENO" 5
+   elif test -f "${TOP_BUILDDIR}/configure.ac"; then # More robust than TOP_BUILDDIR == TOP_SRCDIR
+-    { { echo "$as_me:$LINENO: error: When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" >&5
+-echo "$as_me: error: When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" "$LINENO" 5
+   elif test -z "$CR_ARCH32"; then
+-    { { echo "$as_me:$LINENO: error: --enable-multilib not supported on architecture $CR_ARCH" >&5
+-echo "$as_me: error: --enable-multilib not supported on architecture $CR_ARCH" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "--enable-multilib not supported on architecture $CR_ARCH" "$LINENO" 5
+   elif test $ac_cv_sizeof_void_p = 4; then
+-    { { echo "$as_me:$LINENO: error: --enable-multilib requested but CC='$CC' generates 32-bit objects.  Perhaps try configuring with CC='$CC -m64' or similar." >&5
+-echo "$as_me: error: --enable-multilib requested but CC='$CC' generates 32-bit objects.  Perhaps try configuring with CC='$CC -m64' or similar." >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "--enable-multilib requested but CC='$CC' generates 32-bit objects.  Perhaps try configuring with CC='$CC -m64' or similar." "$LINENO" 5
+   elif test \! -d /lib64; then
+-    { { echo "$as_me:$LINENO: error: --enable-multilib requested but /lib64 does not exist" >&5
+-echo "$as_me: error: --enable-multilib requested but /lib64 does not exist" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "--enable-multilib requested but /lib64 does not exist" "$LINENO" 5
+   fi
+   if test -z "$libdir32"; then
+     if expr "$libdir" : '.*/lib64$' >/dev/null; then
+@@ -25761,9 +18964,7 @@
+       libdir32='${exec_prefix}/lib'
+       libdir='${exec_prefix}/lib64'
+     else
+-      { { echo "$as_me:$LINENO: error: --enable-multilib requested but libdir='$libdir' does not end in 'lib64'" >&5
+-echo "$as_me: error: --enable-multilib requested but libdir='$libdir' does not end in 'lib64'" >&2;}
+-   { (exit 1); exit 1; }; };
++      as_fn_error $? "--enable-multilib requested but libdir='$libdir' does not end in 'lib64'" "$LINENO" 5;
+     fi
+   fi
+   SUBCMD="${TOP_SRCDIR}/configure '--srcdir=${TOP_SRCDIR}' '--build=${CR_ARCH32}-linux' '--libdir=${libdir32}' --with-components=libcr,tests,examples"
+@@ -25826,25 +19027,21 @@
+     SUBCMD="$SUBCMD 'RANLIB=$RANLIB32'"
+   fi
+   # Others?
+-  { echo "$as_me:$LINENO: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&5
+-echo "$as_me: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&6;}
+-  { echo "$as_me:$LINENO: ${SUBCMD}" >&5
+-echo "$as_me: ${SUBCMD}" >&6;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&5
++$as_echo "$as_me: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&6;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: ${SUBCMD}" >&5
++$as_echo "$as_me: ${SUBCMD}" >&6;}
+   ( mkdir -p libcr32 && cd libcr32 && ln -sf ../util util && eval "${SUBCMD}" )
+   if test "$?" = 0; then
+-    { echo "$as_me:$LINENO: <<<< END sub-configure for 32-bit libs <<<<" >&5
+-echo "$as_me: <<<< END sub-configure for 32-bit libs <<<<" >&6;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: <<<< END sub-configure for 32-bit libs <<<<" >&5
++$as_echo "$as_me: <<<< END sub-configure for 32-bit libs <<<<" >&6;}
+     cr_build_libcr32=yes
+   else
+     rm -rf libcr32
+-    { { echo "$as_me:$LINENO: error: --enable-multilib requested but FAILED sub-configure for 32-bit libs" >&5
+-echo "$as_me: error: --enable-multilib requested but FAILED sub-configure for 32-bit libs" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "--enable-multilib requested but FAILED sub-configure for 32-bit libs" "$LINENO" 5
+   fi
+ fi
+-
+-
+-if test x$cr_build_libcr32 = xyes; then
++ if test x$cr_build_libcr32 = xyes; then
+   CR_BUILD_LIBCR32_TRUE=
+   CR_BUILD_LIBCR32_FALSE='#'
+ else
+@@ -25860,23 +19057,23 @@
+ if test x"$cr_build_modules" = xyes; then
+ 
+ # Compiler to build kernel modules
+-echo "$as_me:$LINENO: checking compiler to build kernel modules" >&5
+-echo $ECHO_N "checking compiler to build kernel modules... $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler to build kernel modules" >&5
++$as_echo_n "checking compiler to build kernel modules... " >&6; }
+ if test -n "${KCC}"; then
+-  echo "$as_me:$LINENO: result: $KCC (user setting)" >&5
+-echo "${ECHO_T}$KCC (user setting)" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KCC (user setting)" >&5
++$as_echo "$KCC (user setting)" >&6; }
+ else
+   KCC=$CC
+-  echo "$as_me:$LINENO: result: $KCC (default)" >&5
+-echo "${ECHO_T}$KCC (default)" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KCC (default)" >&5
++$as_echo "$KCC (default)" >&6; }
+ fi
+ 
+ 
+ # Find BSD-compatible NM command
+-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+-if test "${lt_cv_path_NM+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
++$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
++if ${lt_cv_path_NM+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NM"; then
+   # Let the user override the test.
+@@ -25919,12 +19116,158 @@
+     done
+     IFS="$lt_save_ifs"
+   done
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++  : ${lt_cv_path_NM=no}
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
++$as_echo "$lt_cv_path_NM" >&6; }
++if test "$lt_cv_path_NM" != "no"; then
++  NM="$lt_cv_path_NM"
++else
++  # Didn't find any BSD compatible name lister, look for dumpbin.
++  if test -n "$DUMPBIN"; then :
++    # Let the user override the test.
++  else
++    if test -n "$ac_tool_prefix"; then
++  for ac_prog in dumpbin "link -dump"
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_DUMPBIN+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$DUMPBIN"; then
++  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++DUMPBIN=$ac_cv_prog_DUMPBIN
++if test -n "$DUMPBIN"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
++$as_echo "$DUMPBIN" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++    test -n "$DUMPBIN" && break
++  done
++fi
++if test -z "$DUMPBIN"; then
++  ac_ct_DUMPBIN=$DUMPBIN
++  for ac_prog in dumpbin "link -dump"
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_DUMPBIN"; then
++  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
++if test -n "$ac_ct_DUMPBIN"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
++$as_echo "$ac_ct_DUMPBIN" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
 +
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw* | cegcc*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
++
++  test -n "$ac_ct_DUMPBIN" && break
++done
++
++  if test "x$ac_ct_DUMPBIN" = x; then
++    DUMPBIN=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    DUMPBIN=$ac_ct_DUMPBIN
++  fi
++fi
++
++    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
++    *COFF*)
++      DUMPBIN="$DUMPBIN -symbols"
 +      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++    *)
++      DUMPBIN=:
 +      ;;
 +    esac
-+    ;;
- 
--    int rc = prctl(PR_SET_PDEATHSIG, 0);
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
++  fi
++
++  if test "$DUMPBIN" != ":"; then
++    NM="$DUMPBIN"
++  fi
+ fi
++test -z "$NM" && NM=nm
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
++$as_echo_n "checking the name lister ($NM) interface... " >&6; }
++if ${lt_cv_nm_interface+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_nm_interface="BSD nm"
++  echo "int some_variable = 0;" > conftest.$ac_ext
++  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
++  (eval "$ac_compile" 2>conftest.err)
++  cat conftest.err >&5
++  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
++  cat conftest.err >&5
++  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
++  cat conftest.out >&5
++  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
++    lt_cv_nm_interface="MS dumpbin"
++  fi
++  rm -f conftest*
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6
+-NM="$lt_cv_path_NM"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
++$as_echo "$lt_cv_nm_interface" >&6; }
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  cr_cv_prctl=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+ NM=$NM
  
--cr_cv_prctl=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
+@@ -25935,26 +19278,22 @@
+   *)
+   cr_kernel_type=`echo "$with_kernel_type" | tr 'a-z' 'A-Z'`
+   cr_header="/boot/kernel.h"
+-  echo "$as_me:$LINENO: checking for $cr_header" >&5
+-echo $ECHO_N "checking for $cr_header... $ECHO_C" >&6;
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $cr_header" >&5
++$as_echo_n "checking for $cr_header... " >&6; };
+   cr_result=ok
+   if test \! -e "$cr_header"; then
+     cr_result='missing'
+   elif test \! -r "$cr_header"; then
+     cr_result='not readable'
+   fi
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+   if test "$cr_result" != "ok"; then
+-    { { echo "$as_me:$LINENO: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." >&5
+-echo "$as_me: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." "$LINENO" 5
+   fi
+   cr_kernel_var="__BOOT_KERNEL_$cr_kernel_type"
+   if test -z "`grep \"$cr_kernel_var\" $cr_header 2>/dev/null`"; then
+-    { { echo "$as_me:$LINENO: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." >&5
+-echo "$as_me: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." "$LINENO" 5
+   fi
+   # The following sed command transforms all the #ifndef lines from kernel.h into
+   # corresponding preprocessor flags (on one line) which select the desired kernel type.
+@@ -25976,9 +19315,7 @@
  
--fi
--echo "$as_me:$LINENO: result: $cr_cv_prctl" >&5
--echo "${ECHO_T}$cr_cv_prctl" >&6
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
+     if test "${LINUX_OBJ_ARG+set}${cr_cv_var_LINUX_OBJ_ARG+set}" = setset; then
+     if test "$LINUX_OBJ_ARG" != "$cr_cv_var_LINUX_OBJ_ARG"; then
+-      { { echo "$as_me:$LINENO: error: Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG).  Remove '$cache_file' before re-running configure." >&5
+-echo "$as_me: error: Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG).  Remove '$cache_file' before re-running configure." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG).  Remove '$cache_file' before re-running configure." "$LINENO" 5
+     fi
+   elif test "${cr_cv_var_LINUX_OBJ_ARG+set}" = set; then
+     LINUX_OBJ_ARG="$cr_cv_var_LINUX_OBJ_ARG"
+@@ -25987,11 +19324,11 @@
+   if expr X"$LINUX_OBJ_ARG" : X/ >/dev/null; then
+     # User provided a path
  
--  if test x$cr_cv_prctl = xyes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PRCTL 1
--_ACEOF
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
+-  echo "$as_me:$LINENO: checking for Linux kernel build in ${LINUX_OBJ_ARG}" >&5
+-echo $ECHO_N "checking for Linux kernel build in ${LINUX_OBJ_ARG}... $ECHO_C" >&6
+-  cr_cvname=cr_cv_kernel_obj_`echo "${LINUX_OBJ_ARG}" | $as_tr_sh`
+-  if eval "test \"\${${cr_cvname}+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel build in ${LINUX_OBJ_ARG}" >&5
++$as_echo_n "checking for Linux kernel build in ${LINUX_OBJ_ARG}... " >&6; }
++  cr_cvname=cr_cv_kernel_obj_`$as_echo "${LINUX_OBJ_ARG}" | $as_tr_sh`
++  if eval \${${cr_cvname}+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
+     if test -d "${LINUX_OBJ_ARG}"; then
+@@ -26040,11 +19377,11 @@
+   eval "cr_result=\$$cr_cvname"
+   unset cr_cvname
+   if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
+-    echo "$as_me:$LINENO: result: found version $cr_result" >&5
+-echo "${ECHO_T}found version $cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $cr_result" >&5
++$as_echo "found version $cr_result" >&6; }
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PRCTL 0
--_ACEOF
--
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
    fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  *) # from 4.6 on, and DragonFly
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
- 
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
- 
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  case $host_cpu in
-+  ia64*)
-+    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  hppa*64*)
-+    shrext_cmds='.sl'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  *)
-+    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
+   # Check that version appears acceptible
  
-+interix[3-9]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
+@@ -26057,9 +19394,7 @@
  
--# Check various constants needed for asm
--SAVE_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS -I${TOP_SRCDIR}/include"
--
--    CR_ASM_OP_HAND_CHKPT=""
--
--    echo "$as_me:$LINENO: checking for value of CR_ASM_OP_HAND_CHKPT" >&5
--echo $ECHO_N "checking for value of CR_ASM_OP_HAND_CHKPT... $ECHO_C" >&6
--if test "${cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--    cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=""
--    if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) >= 0)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_lo=0 ac_mid=0
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) <= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=$ac_mid; break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
  
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
+   if test -z "$cr_linux_obj_ver"; then
+-    { { echo "$as_me:$LINENO: error: Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" >&5
+-echo "$as_me: error: Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" "$LINENO" 5
+   else
+     :
+   fi
+@@ -26071,9 +19406,7 @@
+     elif expr "$LINUX_OBJ_ARG" : '2\.[46]\.' >/dev/null; then
+       cr_tmp_ver="$LINUX_OBJ_ARG"
+     else
+-      { { echo "$as_me:$LINENO: error: --with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" >&5
+-echo "$as_me: error: --with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "--with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" "$LINENO" 5
+     fi
+     cr_ver_patt="`echo $cr_tmp_ver | sed -e 's/\./\\\\./g;'`\$"
+     # Search standard locations
+@@ -26084,11 +19417,11 @@
+ 	     		/usr/src/kernels/${cr_tmp_ver} \
+ 			; do
  
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # Some binutils ld are patched to set DT_RUNPATH
-+  save_LDFLAGS=$LDFLAGS
-+  save_libdir=$libdir
-+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) < 0)];
--test_array [0] = 0
+-  echo "$as_me:$LINENO: checking for Linux kernel build in ${cr_linux_dir}" >&5
+-echo $ECHO_N "checking for Linux kernel build in ${cr_linux_dir}... $ECHO_C" >&6
+-  cr_cvname=cr_cv_kernel_obj_`echo "${cr_linux_dir}" | $as_tr_sh`
+-  if eval "test \"\${${cr_cvname}+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel build in ${cr_linux_dir}" >&5
++$as_echo_n "checking for Linux kernel build in ${cr_linux_dir}... " >&6; }
++  cr_cvname=cr_cv_kernel_obj_`$as_echo "${cr_linux_dir}" | $as_tr_sh`
++  if eval \${${cr_cvname}+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=-1 ac_mid=-1
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
- int
- main ()
- {
--static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) >= $ac_mid)];
--test_array [0] = 0
+     if test -d "${cr_linux_dir}"; then
+@@ -26137,11 +19470,11 @@
+   eval "cr_result=\$$cr_cvname"
+   unset cr_cvname
+   if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
+-    echo "$as_me:$LINENO: result: found version $cr_result" >&5
+-echo "${ECHO_T}found version $cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $cr_result" >&5
++$as_echo "found version $cr_result" >&6; }
+   else
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+   fi
+   # Check that version appears acceptible
  
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_lo=$ac_mid; break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_lo= ac_hi=
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-+  shlibpath_overrides_runpath=yes
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
--  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) <= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=$ac_mid
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  LDFLAGS=$save_LDFLAGS
-+  libdir=$save_libdir
+@@ -26159,9 +19492,7 @@
+     done
  
--ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=$ac_lo;;
--'')  ;;
--esac
--else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
+   if test -z "$cr_linux_obj_ver"; then
+-    { { echo "$as_me:$LINENO: error: Could not find a directory containing a Linux kernel ${cr_tmp_ver} build.  Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" >&5
+-echo "$as_me: error: Could not find a directory containing a Linux kernel ${cr_tmp_ver} build.  Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" >&2;}
 -   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--long longval () { return CR_OP_HAND_CHKPT; }
--unsigned long ulongval () { return CR_OP_HAND_CHKPT; }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
++    as_fn_error $? "Could not find a directory containing a Linux kernel ${cr_tmp_ver} build.  Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" "$LINENO" 5
+   else
+     :
+   fi
+@@ -26176,9 +19507,7 @@
  
--  FILE *f = fopen ("conftest.val", "w");
--  if (! f)
--    exit (1);
--  if ((CR_OP_HAND_CHKPT) < 0)
--    {
--      long i = longval ();
--      if (i != (CR_OP_HAND_CHKPT))
--	exit (1);
--      fprintf (f, "%ld\n", i);
--    }
--  else
--    {
--      unsigned long i = ulongval ();
--      if (i != (CR_OP_HAND_CHKPT))
--	exit (1);
--      fprintf (f, "%lu\n", i);
--    }
--  exit (ferror (f) || fclose (f) != 0);
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
+     if test "${LINUX_SRC_ARG+set}${cr_cv_var_LINUX_SRC_ARG+set}" = setset; then
+     if test "$LINUX_SRC_ARG" != "$cr_cv_var_LINUX_SRC_ARG"; then
+-      { { echo "$as_me:$LINENO: error: Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG).  Remove '$cache_file' before re-running configure." >&5
+-echo "$as_me: error: Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG).  Remove '$cache_file' before re-running configure." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG).  Remove '$cache_file' before re-running configure." "$LINENO" 5
+     fi
+   elif test "${cr_cv_var_LINUX_SRC_ARG+set}" = set; then
+     LINUX_SRC_ARG="$cr_cv_var_LINUX_SRC_ARG"
+@@ -26187,9 +19516,7 @@
+   if expr X"$LINUX_SRC_ARG" : X/ >/dev/null; then
+     cr_list="$LINUX_SRC_ARG"
+   elif test -n "$LINUX_SRC_ARG"; then
+-    { { echo "$as_me:$LINENO: error: --with-linux-src argument '$LINUX_SRC_ARG' is not a full path" >&5
+-echo "$as_me: error: --with-linux-src argument '$LINUX_SRC_ARG' is not a full path" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "--with-linux-src argument '$LINUX_SRC_ARG' is not a full path" "$LINENO" 5
+   else
+     # Search standard locations
+     cr_list="${LINUX_OBJ} \
+@@ -26199,11 +19526,11 @@
+   fi
+   for cr_linux_dir in $cr_list; do
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./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
--  cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=`cat conftest.val`
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
+-  echo "$as_me:$LINENO: checking for Linux kernel source in $cr_linux_dir" >&5
+-echo $ECHO_N "checking for Linux kernel source in $cr_linux_dir... $ECHO_C" >&6
+-  cr_cvname=cr_cv_kernel_src_`echo "$cr_linux_dir" | $as_tr_sh`
+-  if eval "test \"\${${cr_cvname}+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel source in $cr_linux_dir" >&5
++$as_echo_n "checking for Linux kernel source in $cr_linux_dir... " >&6; }
++  cr_cvname=cr_cv_kernel_src_`$as_echo "$cr_linux_dir" | $as_tr_sh`
++  if eval \${${cr_cvname}+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--rm -f conftest.val
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
+     cr_tmp=''
+@@ -26278,15 +19605,15 @@
+   eval "cr_result=\$$cr_cvname"
+   unset cr_cvname
+   if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
+-    echo "$as_me:$LINENO: result: found version $cr_result" >&5
+-echo "${ECHO_T}found version $cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $cr_result" >&5
++$as_echo "found version $cr_result" >&6; }
+   else
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+   fi
+   # Check that version is acceptible (exact match, or a prefix with the next char non-numeric)
+   case "$cr_linux_obj_ver" in
+-    ${cr_result}|${cr_result}[^0-9]*)      # the outer [] is m4 quoting
++    ${cr_result}|${cr_result}[!0-9]*)      # the outer [] is m4 quoting
+         cr_linux_src_ver="$cr_result";;
+     *)  cr_linux_src_ver='';;
+   esac
+@@ -26298,9 +19625,7 @@
+   done
  
--fi
--echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&5
--echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&6
--  if test -n "$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"; then
--    CR_ASM_OP_HAND_CHKPT="$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
+   if test -z "$cr_linux_src_ver"; then
+-    { { echo "$as_me:$LINENO: error: Could not locate source directory corresponding to build directory '${LINUX_OBJ}'.  Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" >&5
+-echo "$as_me: error: Could not locate source directory corresponding to build directory '${LINUX_OBJ}'.  Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "Could not locate source directory corresponding to build directory '${LINUX_OBJ}'.  Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" "$LINENO" 5
+   else
+     :
+   fi
+@@ -26328,8 +19653,8 @@
+    : # OK - either not caching or cached version still matches
+  else
+    if test -f .cached_kconfig; then
+-     { echo "$as_me:$LINENO: WARNING: kernel configuration has changed... discarding cached results." >&5
+-echo "$as_me: WARNING: kernel configuration has changed... discarding cached results." >&2;}
++     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: kernel configuration has changed... discarding cached results." >&5
++$as_echo "$as_me: WARNING: kernel configuration has changed... discarding cached results." >&2;}
+      rm -f .cached_kconfig
+    fi
+    for cr_var in cr_cv_kconfig__NON_EMPTY_HACK `(set) | grep "^cr_cv_kconfig_" | cut -d= -f1`; do
+@@ -26344,7 +19669,7 @@
    fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
  
--  if test -n "$CR_ASM_OP_HAND_CHKPT"; then
--    cat >>confdefs.h <<_ACEOF
--#define CR_ASM_OP_HAND_CHKPT $CR_ASM_OP_HAND_CHKPT
--_ACEOF
--
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
  
-+*nto* | *qnx*)
-+  version_type=qnx
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='ldqnx.so'
-+  ;;
+-if test -z "${HAVE_LINUX_2_6}"; then
++if test -z "${HAVE_LINUX_2_6}"; then :
+   cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -26363,52 +19688,80 @@
  
-+openbsd*)
-+  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[89] | openbsd2.[89].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 +      esac
-+  else
-+    shlibpath_overrides_runpath=yes
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
-+  ;;
+ fi
+ rm -f confcache
+-   { { echo "$as_me:$LINENO: error: required Linux 2.6.x kernel headers and/or build not found." >&5
+-echo "$as_me: error: required Linux 2.6.x kernel headers and/or build not found." >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "required Linux 2.6.x kernel headers and/or build not found." "$LINENO" 5
+ fi
+ 
+-
+ # Module install dir
+ 
+-echo "$as_me:$LINENO: checking directory to install kernel modules" >&5
+-echo $ECHO_N "checking directory to install kernel modules... $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking directory to install kernel modules" >&5
++$as_echo_n "checking directory to install kernel modules... " >&6; }
+ if test -n "${CR_MODULE_DIR}"; then
+   cr_why='passed via --with-kmod-dir'
+ elif test ${sysconfdir} = /etc; then
+@@ -26418,23 +19771,21 @@
+   CR_MODULE_DIR="${libdir}/${PACKAGE}/${LINUX_VER}"
+   cr_why='default'
+ fi
+-echo "$as_me:$LINENO: result: ${CR_MODULE_DIR} ($cr_why)" >&5
+-echo "${ECHO_T}${CR_MODULE_DIR} ($cr_why)" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CR_MODULE_DIR} ($cr_why)" >&5
++$as_echo "${CR_MODULE_DIR} ($cr_why)" >&6; }
  
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
+ # Checks for matching (we hope) symbol table
  
--    CR_ASM_CHECKPOINT_STUB=""
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
  
--    echo "$as_me:$LINENO: checking for value of CR_ASM_CHECKPOINT_STUB" >&5
--echo $ECHO_N "checking for value of CR_ASM_CHECKPOINT_STUB... $ECHO_C" >&6
--if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+rdos*)
-+  dynamic_linker=no
-+  ;;
+-  echo "$as_me:$LINENO: checking for Linux kernel symbol table" >&5
+-echo $ECHO_N "checking for Linux kernel symbol table... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel symbol table" >&5
++$as_echo_n "checking for Linux kernel symbol table... " >&6; }
  
--    cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=""
--    if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--int
--main ()
--{
--static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) >= 0)];
--test_array [0] = 0
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_lo=0 ac_mid=0
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--int
--main ()
--{
--static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) <= $ac_mid)];
--test_array [0] = 0
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=$ac_mid; break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+sysv4 | sysv4.3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
  
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
+     if test "${LINUX_SYSTEM_MAP+set}${cr_cv_var_LINUX_SYSTEM_MAP+set}" = setset; then
+     if test "$LINUX_SYSTEM_MAP" != "$cr_cv_var_LINUX_SYSTEM_MAP"; then
+-      { { echo "$as_me:$LINENO: error: Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP).  Remove '$cache_file' before re-running configure." >&5
+-echo "$as_me: error: Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP).  Remove '$cache_file' before re-running configure." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP).  Remove '$cache_file' before re-running configure." "$LINENO" 5
+     fi
+   elif test "${cr_cv_var_LINUX_SYSTEM_MAP+set}" = set; then
+     LINUX_SYSTEM_MAP="$cr_cv_var_LINUX_SYSTEM_MAP"
+@@ -26443,9 +19794,7 @@
  
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--int
--main ()
--{
--static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) < 0)];
--test_array [0] = 0
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
+     if test "${LINUX_VMLINUX+set}${cr_cv_var_LINUX_VMLINUX+set}" = setset; then
+     if test "$LINUX_VMLINUX" != "$cr_cv_var_LINUX_VMLINUX"; then
+-      { { echo "$as_me:$LINENO: error: Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX).  Remove '$cache_file' before re-running configure." >&5
+-echo "$as_me: error: Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX).  Remove '$cache_file' before re-running configure." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX).  Remove '$cache_file' before re-running configure." "$LINENO" 5
+     fi
+   elif test "${cr_cv_var_LINUX_VMLINUX+set}" = set; then
+     LINUX_VMLINUX="$cr_cv_var_LINUX_VMLINUX"
+@@ -26469,11 +19818,9 @@
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=-1 ac_mid=-1
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--int
--main ()
+     if test -z "$LINUX_SYMTAB_CMD"; then
+       # The user specified a file, but we can't use it.  Abort.
+-      echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
+-      { { echo "$as_me:$LINENO: error: Failed to validate \"$LINUX_SYSTEM_MAP\"" >&5
+-echo "$as_me: error: Failed to validate \"$LINUX_SYSTEM_MAP\"" >&2;}
+-   { (exit 1); exit 1; }; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
++$as_echo "failed" >&6; }
++      as_fn_error $? "Failed to validate \"$LINUX_SYSTEM_MAP\"" "$LINENO" 5
+     fi
+   fi
+   if test -z "$LINUX_SYMTAB_CMD" -a -n "$LINUX_VMLINUX" ; then
+@@ -26487,11 +19834,9 @@
+ 
+     if test -z "$LINUX_SYMTAB_CMD"; then
+       # The user specified a file, but we can't use it.  Abort.
+-      echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
+-      { { echo "$as_me:$LINENO: error: Failed to validate \"$LINUX_VMLINUX\"" >&5
+-echo "$as_me: error: Failed to validate \"$LINUX_VMLINUX\"" >&2;}
+-   { (exit 1); exit 1; }; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
++$as_echo "failed" >&6; }
++      as_fn_error $? "Failed to validate \"$LINUX_VMLINUX\"" "$LINENO" 5
+     fi
+   fi
+   # Next try searching for System.map or vmlinux in standard locations
+@@ -26540,8 +19885,8 @@
+   # Announce our result
+   if test -z "$LINUX_SYMTAB_CMD"; then
+     LINUX_SYMTAB_CMD="true"
+-    echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
++$as_echo "failed" >&6; }
+     cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -26560,56 +19905,83 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
 -{
--static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) >= $ac_mid)];
--test_array [0] = 0
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+     if test -n "$cr_stripped_maps"; then
+-      { echo "$as_me:$LINENO: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&5
+-echo "$as_me: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&2;}
+-      { { echo "$as_me:$LINENO: error: Failed to locate kernel symbol table.  Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." >&5
+-echo "$as_me: error: Failed to locate kernel symbol table.  Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." >&2;}
+-   { (exit 1); exit 1; }; }
+-    else
+-      { { echo "$as_me:$LINENO: error: Failed to locate kernel symbol table.  Try using --with-system-map or --with-vmlinux." >&5
+-echo "$as_me: error: Failed to locate kernel symbol table.  Try using --with-system-map or --with-vmlinux." >&2;}
+-   { (exit 1); exit 1; }; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&5
++$as_echo "$as_me: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&2;}
++      as_fn_error $? "Failed to locate kernel symbol table.  Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." "$LINENO" 5
++    else
++      as_fn_error $? "Failed to locate kernel symbol table.  Try using --with-system-map or --with-vmlinux." "$LINENO" 5
+     fi
+   else
+-    echo "$as_me:$LINENO: result: $LINUX_SYMTAB_FILE" >&5
+-echo "${ECHO_T}$LINUX_SYMTAB_FILE" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_SYMTAB_FILE" >&5
++$as_echo "$LINUX_SYMTAB_FILE" >&6; }
+     test -n "$LINUX_SYSTEM_MAP" && cr_cv_var_LINUX_SYSTEM_MAP="$LINUX_SYSTEM_MAP"
+     test -n "$LINUX_VMLINUX" && cr_cv_var_LINUX_VMLINUX="$LINUX_VMLINUX"
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_lo=$ac_mid; break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+@@ -26619,8 +19991,8 @@
+    : # OK - either not caching or cached version still matches
+  else
+    if test -f .cached_ksymtab; then
+-     { echo "$as_me:$LINENO: WARNING: kernel symbol table has changed... discarding cached results." >&5
+-echo "$as_me: WARNING: kernel symbol table has changed... discarding cached results." >&2;}
++     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: kernel symbol table has changed... discarding cached results." >&5
++$as_echo "$as_me: WARNING: kernel symbol table has changed... discarding cached results." >&2;}
+      rm -f .cached_ksymtab
+    fi
+    for cr_var in cr_cv_ksymtab__NON_EMPTY_HACK `(set) | grep "^cr_cv_ksymtab_" | cut -d= -f1`; do
+@@ -26637,34 +20009,86 @@
+ if test $cr_wordsize = 4; then
+   # Count pointer hex digits in the System.map to id a 64-bit kernel
+   # Based on logic provided by Alan Woodland
+-  echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
++$as_echo_n "checking for egrep... " >&6; }
++if ${ac_cv_path_EGREP+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
++  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++   then ac_cv_path_EGREP="$GREP -E"
++   else
++     if test -z "$EGREP"; then
++  ac_path_EGREP_found=false
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_prog in egrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++# Check for GNU ac_path_EGREP and select it if it is found.
++  # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 +*)
-+  dynamic_linker=no
-+  ;;
++  ac_count=0
++  $as_echo_n 0123456789 >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    $as_echo 'EGREP' >> "conftest.nl"
++    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
++    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_EGREP="$ac_path_EGREP"
++      ac_path_EGREP_max=$ac_count
+     fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
++      $ac_path_EGREP_found && break 3
++    done
++  done
++  done
++IFS=$as_save_IFS
++  if test -z "$ac_cv_path_EGREP"; then
++    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++  fi
++else
++  ac_cv_path_EGREP=$EGREP
++fi
++
++   fi
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
--  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--int
--main ()
--{
--static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) <= $ac_mid)];
--test_array [0] = 0
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=$ac_mid
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
++$as_echo "$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
  
--ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=$ac_lo;;
--'')  ;;
--esac
--else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--long longval () { return _CR_CHECKPOINT_STUB; }
--unsigned long ulongval () { return _CR_CHECKPOINT_STUB; }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
  
--  FILE *f = fopen ("conftest.val", "w");
--  if (! f)
--    exit (1);
--  if ((_CR_CHECKPOINT_STUB) < 0)
--    {
--      long i = longval ();
--      if (i != (_CR_CHECKPOINT_STUB))
--	exit (1);
--      fprintf (f, "%ld\n", i);
--    }
--  else
--    {
--      unsigned long i = ulongval ();
--      if (i != (_CR_CHECKPOINT_STUB))
--	exit (1);
--      fprintf (f, "%lu\n", i);
--    }
--  exit (ferror (f) || fclose (f) != 0);
+-  echo "$as_me:$LINENO: checking if kernel and user-space wordsize match" >&5
+-echo $ECHO_N "checking if kernel and user-space wordsize match... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if kernel and user-space wordsize match" >&5
++$as_echo_n "checking if kernel and user-space wordsize match... " >&6; }
+   if eval $LINUX_SYMTAB_CMD | head | $EGREP '^[a-f0-9]{16}' >/dev/null 2>&1;then
+-    echo "$as_me:$LINENO: result: no (32-bit user-space with 64-bit kernel)" >&5
+-echo "${ECHO_T}no (32-bit user-space with 64-bit kernel)" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (32-bit user-space with 64-bit kernel)" >&5
++$as_echo "no (32-bit user-space with 64-bit kernel)" >&6; }
+     case $CR_KARCH in
+       i386)  CR_KARCH=x86_64;;
+       ppc)   CR_KARCH=ppc64;;
+       sparc) CR_KARCH=sparc64;;
+     esac
+   else
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+   fi
+ fi
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./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
--  cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=`cat conftest.val`
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+@@ -26672,10 +20096,10 @@
+ # Configure automake/kbuild glue
  
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--rm -f conftest.val
  
--fi
--echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&5
--echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&6
--  if test -n "$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"; then
--    CR_ASM_CHECKPOINT_STUB="$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"
--  fi
+-  echo "$as_me:$LINENO: checking for parameters to interface GNU automake with Linux kbuild" >&5
+-echo $ECHO_N "checking for parameters to interface GNU automake with Linux kbuild... $ECHO_C" >&6
+-if test "${cr_cv_KBUILD_MAKE_ARGS+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for parameters to interface GNU automake with Linux kbuild" >&5
++$as_echo_n "checking for parameters to interface GNU automake with Linux kbuild... " >&6; }
++if ${cr_cv_KBUILD_MAKE_ARGS+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
--  if test -n "$CR_ASM_CHECKPOINT_STUB"; then
--    cat >>confdefs.h <<_ACEOF
--#define CR_ASM_CHECKPOINT_STUB $CR_ASM_CHECKPOINT_STUB
--_ACEOF
+     if grep KBUILD_EXTMOD ${LINUX_SRC}/Makefile >/dev/null 2>/dev/null; then
+@@ -26694,8 +20118,8 @@
+     fi
  
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_KBUILD_MAKE_ARGS" >&5
+-echo "${ECHO_T}$cr_cv_KBUILD_MAKE_ARGS" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_KBUILD_MAKE_ARGS" >&5
++$as_echo "$cr_cv_KBUILD_MAKE_ARGS" >&6; }
+   KBUILD_MAKE_ARGS="$cr_cv_KBUILD_MAKE_ARGS"
+     # Note: we'll actually try the result in CR_SET_KCFLAGS
  
+@@ -26727,10 +20151,10 @@
  
--  fi
--    # ICK!
  
--    CR_ASM_OP_HAND_ABORT=""
  
--    echo "$as_me:$LINENO: checking for value of CR_ASM_OP_HAND_ABORT" >&5
--echo $ECHO_N "checking for value of CR_ASM_OP_HAND_ABORT... $ECHO_C" >&6
--if test "${cr_cv_compute_int_CR_ASM_OP_HAND_ABORT+set}" = set; then
+-  echo "$as_me:$LINENO: checking for flags to compile Linux kernel probes" >&5
+-echo $ECHO_N "checking for flags to compile Linux kernel probes... $ECHO_C" >&6
+-if test "${cr_cv_kconfig_kcflags+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
- 
--    cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=""
--    if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) >= 0)];
--test_array [0] = 0
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_lo=0 ac_mid=0
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) <= $ac_mid)];
--test_array [0] = 0
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=$ac_mid; break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flags to compile Linux kernel probes" >&5
++$as_echo_n "checking for flags to compile Linux kernel probes... " >&6; }
++if ${cr_cv_kconfig_kcflags+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
+   rm -rf conftestdir
+@@ -26744,31 +20168,29 @@
+   if test $? = 0; then cr_tmp=`grep -m1 conftest\\.c conftestdir/output | sed -e "s:^[ 	]*${KCC}::"`; fi
+   cat conftestdir/output >&5
+   if test "${cr_tmp:+OK}" != OK; then
+-      echo "$as_me:$LINENO: result: FAILED" >&5
+-echo "${ECHO_T}FAILED" >&6
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED" >&5
++$as_echo "FAILED" >&6; }
+       cat conftestdir/output
+       if $EGREP 'include/(asm|linux)/[a-zA-Z0-9_-]+\.h:' conftestdir/output >/dev/null 2>&1; then
+-        { echo "$as_me:$LINENO: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&5
+-echo "$as_me: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&2;}
++        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&5
++$as_echo "$as_me: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&2;}
+ 	ver=`$KCC --version | head -1`
+-        { echo "$as_me:$LINENO: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&5
+-echo "$as_me: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&2;}
++        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&5
++$as_echo "$as_me: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&2;}
+ 	if test $cr_wordsize -gt $ac_cv_sizeof_void_p; then
+ 	  echo "$KCC" | grep -e '-m64' >/dev/null 2>/dev/null
+ 	  if test $? != 0; then
+-            { echo "$as_me:$LINENO: WARNING: You might try setting KCC='$KCC -m64'" >&5
+-echo "$as_me: WARNING: You might try setting KCC='$KCC -m64'" >&2;}
++            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You might try setting KCC='$KCC -m64'" >&5
++$as_echo "$as_me: WARNING: You might try setting KCC='$KCC -m64'" >&2;}
+           fi
+         fi
+       fi
+       if grep -i 'permission denied' conftestdir/output >/dev/null 2>&1; then
+-        { echo "$as_me:$LINENO: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&5
+-echo "$as_me: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&2;}
++        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&5
++$as_echo "$as_me: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&2;}
+       fi
+       rm -rf conftestdir
+-      { { echo "$as_me:$LINENO: error: Failed test run of kernel make/kbuild failed (see above)" >&5
+-echo "$as_me: error: Failed test run of kernel make/kbuild failed (see above)" >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Failed test run of kernel make/kbuild failed (see above)" "$LINENO" 5
+   fi
+   rm -rf conftestdir
+   cr_cv_kconfig_kcflags=''
+@@ -26804,21 +20226,18 @@
+     cr_cv_kconfig_kcflags="$cr_cv_kconfig_kcflags $arg"
+   done
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_kconfig_kcflags" >&5
+-echo "${ECHO_T}$cr_cv_kconfig_kcflags" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_kconfig_kcflags" >&5
++$as_echo "$cr_cv_kconfig_kcflags" >&6; }
+   KCFLAGS="$cr_cv_kconfig_kcflags"
+-    echo "$as_me:$LINENO: checking if autoconf.h is included implicitly" >&5
+-echo $ECHO_N "checking if autoconf.h is included implicitly... $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if autoconf.h is included implicitly" >&5
++$as_echo_n "checking if autoconf.h is included implicitly... " >&6; }
+   if echo "$KCFLAGS" | grep 'include [^ ]*/autoconf\.h' >/dev/null 2>&1; then
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6;
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; };
+   else
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6;
+-    cat >>confdefs.h <<\_ACEOF
+-#define CR_NEED_AUTOCONF_H 1
 -_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) < 0)];
--test_array [0] = 0
+-
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; };
++    $as_echo "#define CR_NEED_AUTOCONF_H 1" >>confdefs.h
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=-1 ac_mid=-1
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) >= $ac_mid)];
--test_array [0] = 0
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_lo=$ac_mid; break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+   fi
+@@ -26829,11 +20248,11 @@
  
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+ # Now we can check if SYMTAB matches the kernel
  
--ac_lo= ac_hi=
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
--  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) <= $ac_mid)];
--test_array [0] = 0
+-  echo "$as_me:$LINENO: checking for SMP kernel source" >&5
+-echo $ECHO_N "checking for SMP kernel source... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMP kernel source" >&5
++$as_echo_n "checking for SMP kernel source... " >&6; }
  
--  ;
--  return 0;
--}
+-    if test "${cr_cv_kconfig_smp_source+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_smp_source+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -26844,11 +20263,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 -_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -26872,42 +20287,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -67613,181 +73534,101 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_smp_source=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_smp_source=no
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=$ac_lo;;
--'')  ;;
--esac
--else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--long longval () { return CR_OP_HAND_ABORT; }
--unsigned long ulongval () { return CR_OP_HAND_ABORT; }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--  FILE *f = fopen ("conftest.val", "w");
--  if (! f)
--    exit (1);
--  if ((CR_OP_HAND_ABORT) < 0)
--    {
--      long i = longval ();
--      if (i != (CR_OP_HAND_ABORT))
--	exit (1);
--      fprintf (f, "%ld\n", i);
--    }
--  else
--    {
--      unsigned long i = ulongval ();
--      if (i != (CR_OP_HAND_ABORT))
--	exit (1);
--      fprintf (f, "%lu\n", i);
--    }
--  exit (ferror (f) || fclose (f) != 0);
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./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
--  cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=`cat conftest.val`
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+@@ -26921,17 +20312,17 @@
+   fi
  
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--rm -f conftest.val
  
--fi
--echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&5
--echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&6
--  if test -n "$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"; then
--    CR_ASM_OP_HAND_ABORT="$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"
--  fi
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6;
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; };
+   cr_kernel_smp=$cr_result
+-  echo "$as_me:$LINENO: checking for SMP kernel symbol table" >&5
+-echo $ECHO_N "checking for SMP kernel symbol table... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMP kernel symbol table" >&5
++$as_echo_n "checking for SMP kernel symbol table... " >&6; }
+   cr_symtab_smp=no
+   if test -n "`eval $LINUX_SYMTAB_CMD | grep del_timer_sync 2>/dev/null | grep -v try_to_del_`"; then
+     cr_symtab_smp=yes
+   fi
+-  echo "$as_me:$LINENO: result: $cr_symtab_smp" >&5
+-echo "${ECHO_T}$cr_symtab_smp" >&6;
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_symtab_smp" >&5
++$as_echo "$cr_symtab_smp" >&6; };
+   if test "$cr_kernel_smp" != "$cr_symtab_smp"; then
  
--  if test -n "$CR_ASM_OP_HAND_ABORT"; then
--    cat >>confdefs.h <<_ACEOF
--#define CR_ASM_OP_HAND_ABORT $CR_ASM_OP_HAND_ABORT
--_ACEOF
+   echo "======================================================================"
+@@ -26944,13 +20335,9 @@
+   echo "======================================================================"
  
+     if test "$cr_kernel_smp" = yes; then
+-      { { echo "$as_me:$LINENO: error: Kernel source is configured SMP but the kernel symbol table is not.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." >&5
+-echo "$as_me: error: Kernel source is configured SMP but the kernel symbol table is not.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." >&2;}
+-   { (exit 1); exit 1; }; }
+-    else
+-      { { echo "$as_me:$LINENO: error: Kernel source is configured uni-processor but the kernel symbol table is SMP.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." >&5
+-echo "$as_me: error: Kernel source is configured uni-processor but the kernel symbol table is SMP.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Kernel source is configured SMP but the kernel symbol table is not.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." "$LINENO" 5
++    else
++      as_fn_error $? "Kernel source is configured uni-processor but the kernel symbol table is SMP.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." "$LINENO" 5
+     fi
+   fi
  
+@@ -26959,12 +20346,11 @@
  
--  fi
  
  
--    CR_ASM_CHECKPOINT_OMIT=""
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/syscalls.h" >&5
++$as_echo_n "checking kernel for linux/syscalls.h... " >&6; }
  
--    echo "$as_me:$LINENO: checking for value of CR_ASM_CHECKPOINT_OMIT" >&5
--echo $ECHO_N "checking for value of CR_ASM_CHECKPOINT_OMIT... $ECHO_C" >&6
--if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for linux/syscalls.h" >&5
+-echo $ECHO_N "checking kernel for linux/syscalls.h... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++    if ${cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
--    cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=""
--    if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) >= 0)];
--test_array [0] = 0
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_lo=0 ac_mid=0
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
+@@ -26975,11 +20361,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) <= $ac_mid)];
--test_array [0] = 0
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+hardcode_action_CXX=
-+if test -n "$hardcode_libdir_flag_spec_CXX" ||
-+   test -n "$runpath_var_CXX" ||
-+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
--_ACEOF
+ 		 #include <linux/kernel.h>
+@@ -26999,42 +20381,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -67810,174 +73651,85 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid; break
-+  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct_CXX" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-+     test "$hardcode_minus_L_CXX" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action_CXX=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action_CXX=immediate
-+  fi
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action_CXX=unsupported
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-+$as_echo "$hardcode_action_CXX" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) < 0)];
--test_array [0] = 0
-+if test "$hardcode_action_CXX" = relink ||
-+   test "$inherit_rpath_CXX" = yes; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=-1 ac_mid=-1
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
+ fi
+@@ -27042,33 +20400,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_SYSCALLS_H 1
 -_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) >= $ac_mid)];
--test_array [0] = 0
++    $as_echo "#define HAVE_LINUX_SYSCALLS_H 1" >>confdefs.h
  
--  ;
--  return 0;
--}
+      HAVE_LINUX_SYSCALLS_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_SYSCALLS_H 0
 -_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_lo=$ac_mid; break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++    $as_echo "#define HAVE_LINUX_SYSCALLS_H 0" >>confdefs.h
  
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+      HAVE_LINUX_SYSCALLS_H=''
+   fi
  
--ac_lo= ac_hi=
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
--  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/pspace.h" >&5
++$as_echo_n "checking kernel for linux/pspace.h... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for linux/pspace.h" >&5
+-echo $ECHO_N "checking kernel for linux/pspace.h... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_LINUX_PSPACE_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_LINUX_PSPACE_H+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -27079,11 +20432,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--int
--main ()
--{
--static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) <= $ac_mid)];
--test_array [0] = 0
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
--_ACEOF
+ 		 #include <linux/kernel.h>
+@@ -27103,42 +20452,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -67987,173 +73739,98 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=$ac_lo;;
--'')  ;;
--esac
--else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "blcr_common.h.in"
--long longval () { return CR_CHECKPOINT_OMIT; }
--unsigned long ulongval () { return CR_CHECKPOINT_OMIT; }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
- 
--  FILE *f = fopen ("conftest.val", "w");
--  if (! f)
--    exit (1);
--  if ((CR_CHECKPOINT_OMIT) < 0)
--    {
--      long i = longval ();
--      if (i != (CR_CHECKPOINT_OMIT))
--	exit (1);
--      fprintf (f, "%ld\n", i);
--    }
--  else
--    {
--      unsigned long i = ulongval ();
--      if (i != (CR_CHECKPOINT_OMIT))
--	exit (1);
--      fprintf (f, "%lu\n", i);
--    }
--  exit (ferror (f) || fclose (f) != 0);
-+  fi # test -n "$compiler"
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  (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
--  cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=`cat conftest.val`
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_PSPACE_H=yes
+ else
+-  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  CC=$lt_save_CC
-+  LDCXX=$LD
-+  LD=$lt_save_LD
-+  GCC=$lt_save_GCC
-+  with_gnu_ld=$lt_save_with_gnu_ld
-+  lt_cv_path_LDCXX=$lt_cv_path_LD
-+  lt_cv_path_LD=$lt_save_path_LD
-+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+fi # test "$_lt_caught_CXX_error" != yes
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_PSPACE_H=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--rm -f conftest.val
-+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: $cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&5
--echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&6
--  if test -n "$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"; then
--    CR_ASM_CHECKPOINT_OMIT="$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"
--  fi
+ fi
+@@ -27146,33 +20471,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_LINUX_PSPACE_H
  
--  if test -n "$CR_ASM_CHECKPOINT_OMIT"; then
--    cat >>confdefs.h <<_ACEOF
--#define CR_ASM_CHECKPOINT_OMIT $CR_ASM_CHECKPOINT_OMIT
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_PSPACE_H 1
 -_ACEOF
++    $as_echo "#define HAVE_LINUX_PSPACE_H 1" >>confdefs.h
  
-+  # Totally gross way to perform a non-fatal probe for CXX
+      HAVE_LINUX_PSPACE_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_PSPACE_H 0
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_PSPACE_H 0" >>confdefs.h
  
+      HAVE_LINUX_PSPACE_H=''
+   fi
  
--  fi
--    # ICK!
  
--    CR_ASM_SI_PID_OFFSET=""
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
--    echo "$as_me:$LINENO: checking for value of CR_ASM_SI_PID_OFFSET" >&5
--echo $ECHO_N "checking for value of CR_ASM_SI_PID_OFFSET... $ECHO_C" >&6
--if test "${cr_cv_compute_int_CR_ASM_SI_PID_OFFSET+set}" = set; then
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for linux/pid_namespace.h" >&5
+-echo $ECHO_N "checking kernel for linux/pid_namespace.h... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/pid_namespace.h" >&5
++$as_echo_n "checking kernel for linux/pid_namespace.h... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+  # Now validate the choice
-+  if test "x$CXX" != xno; then
++    if ${cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
--    cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=""
--    if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
+ 
+@@ -27183,11 +20503,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <signal.h>
--	 #ifndef offsetof
--  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
--	 #endif
--int
--main ()
--{
--static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) >= 0)];
--test_array [0] = 0
-+    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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
--_ACEOF
+ 		 #include <linux/kernel.h>
+@@ -27207,42 +20523,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -68176,38 +73853,85 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_lo=0 ac_mid=0
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -27250,33 +20542,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_PID_NAMESPACE_H 1
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_PID_NAMESPACE_H 1" >>confdefs.h
+ 
+      HAVE_LINUX_PID_NAMESPACE_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_PID_NAMESPACE_H 0
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_PID_NAMESPACE_H 0" >>confdefs.h
+ 
+      HAVE_LINUX_PID_NAMESPACE_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/lockdep.h" >&5
++$as_echo_n "checking kernel for linux/lockdep.h... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for linux/lockdep.h" >&5
+-echo $ECHO_N "checking kernel for linux/lockdep.h... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -27287,11 +20574,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <signal.h>
--	 #ifndef offsetof
--  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
--	 #endif
--int
--main ()
--{
--static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) <= $ac_mid)];
--test_array [0] = 0
-+    # The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
-+$as_echo_n "checking size of void *... " >&6; }
-+if test "${ac_cv_sizeof_void_p+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
--_ACEOF
+ 		 #include <linux/kernel.h>
+@@ -27311,42 +20594,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -68230,55 +73954,85 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid; break
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  if test "$ac_cv_type_void_p" = yes; then
-+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error 77 "cannot compute sizeof (void *)
-+See \`config.log' for more details" "$LINENO" 5 ; }
-+   else
-+     ac_cv_sizeof_void_p=0
-+   fi
-+fi
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
-+$as_echo "$ac_cv_sizeof_void_p" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--cat >conftest.$ac_ext <<_ACEOF
+ 
+ fi
+@@ -27354,33 +20613,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_LOCKDEP_H 1
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_LOCKDEP_H 1" >>confdefs.h
+ 
+      HAVE_LINUX_LOCKDEP_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_LOCKDEP_H 0
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_LOCKDEP_H 0" >>confdefs.h
+ 
+      HAVE_LINUX_LOCKDEP_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for linux/compile.h" >&5
+-echo $ECHO_N "checking kernel for linux/compile.h... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/compile.h" >&5
++$as_echo_n "checking kernel for linux/compile.h... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_LINUX_COMPILE_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_LINUX_COMPILE_H+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -27391,11 +20645,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <signal.h>
--	 #ifndef offsetof
--  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
--	 #endif
--int
--main ()
--{
--static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) < 0)];
--test_array [0] = 0
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
--_ACEOF
+ 		 #include <linux/kernel.h>
+@@ -27415,42 +20665,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -68301,50 +74055,82 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=-1 ac_mid=-1
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_COMPILE_H=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_COMPILE_H=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -27458,33 +20684,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_LINUX_COMPILE_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_COMPILE_H 1
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_COMPILE_H 1" >>confdefs.h
+ 
+      HAVE_LINUX_COMPILE_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_COMPILE_H 0
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_COMPILE_H 0" >>confdefs.h
+ 
+      HAVE_LINUX_COMPILE_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/fdtable.h" >&5
++$as_echo_n "checking kernel for linux/fdtable.h... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for linux/fdtable.h" >&5
+-echo $ECHO_N "checking kernel for linux/fdtable.h... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_LINUX_FDTABLE_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_LINUX_FDTABLE_H+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -27495,11 +20716,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CXX='$CXX' acts like a C++ compiler" >&5
-+$as_echo_n "checking whether CXX='$CXX' acts like a C++ compiler... " >&6; }
-+if test "${cr_cv_cxx_is_cxx+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+      cr_cv_cxx_is_cxx=no
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--#include <signal.h>
--	 #ifndef offsetof
--  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
--	 #endif
-+
-+	#ifndef __cplusplus
-+	    #error __cplusplus must be defined in a C++ compilation!
-+	#endif
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) >= $ac_mid)];
--test_array [0] = 0
--
-+ int x = 1;
-   ;
+ 
+ 		 #include <linux/kernel.h>
+@@ -27519,42 +20736,18 @@
    return 0;
  }
  _ACEOF
@@ -68370,68 +74156,82 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_lo=$ac_mid; break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_FDTABLE_H=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  cr_cv_cxx_is_cxx=yes
-+fi
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_FDTABLE_H=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
+ 
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_cxx_is_cxx" >&5
-+$as_echo "$cr_cv_cxx_is_cxx" >&6; }
-+    if test x"$cr_cv_cxx_is_cxx" = xyes; then
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CXX='$CXX' matches wordsize of CC" >&5
-+$as_echo_n "checking whether CXX='$CXX' matches wordsize of CC... " >&6; }
-+if test "${cr_cv_cxx_voidp+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27562,33 +20755,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_LINUX_FDTABLE_H
  
--ac_lo= ac_hi=
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
--  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_FDTABLE_H 1
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_FDTABLE_H 1" >>confdefs.h
+ 
+      HAVE_LINUX_FDTABLE_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_FDTABLE_H 0
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_FDTABLE_H 0" >>confdefs.h
+ 
+      HAVE_LINUX_FDTABLE_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for linux/utrace.h" >&5
+-echo $ECHO_N "checking kernel for linux/utrace.h... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/utrace.h" >&5
++$as_echo_n "checking kernel for linux/utrace.h... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_LINUX_UTRACE_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_LINUX_UTRACE_H+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -27599,11 +20787,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+        cr_cv_cxx_voidp=no
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--#include <signal.h>
--	 #ifndef offsetof
--  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
--	 #endif
-+
-+	  #ifndef __cplusplus
-+	      #error __cplusplus must be defined in a C++ compilation!
-+	  #endif
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) <= $ac_mid)];
--test_array [0] = 0
--
-+ int a[(($ac_cv_sizeof_void_p == sizeof(void *))? 1 : -1)];
-   ;
+ 
+ 		 #include <linux/kernel.h>
+@@ -27623,42 +20807,18 @@
    return 0;
  }
  _ACEOF
@@ -68457,279 +74257,183 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_UTRACE_H=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  cr_cv_cxx_voidp=yes
-+fi
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_UTRACE_H=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--ac_lo=`expr '(' $ac_mid ')' + 1`
+ 
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=$ac_lo;;
--'')  ;;
--esac
--else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_cxx_voidp" >&5
-+$as_echo "$cr_cv_cxx_voidp" >&6; }
-+    fi
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+    if test x"$cr_cv_cxx_is_cxx$cr_cv_cxx_voidp" != xyesyes; then
-+      CXX=no
-+    fi
-+  fi
-+
-+
-+################################################################################
-+# Check libraries
-+################################################################################
-+
-+if test x"$cr_build_libcr" = xyes; then
-+# Check for a sufficiently new glibc
-+# XXX: What is our true lower bound?
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc version >= 2.2" >&5
-+$as_echo_n "checking for GNU libc version >= 2.2... " >&6; }
-+if test "${cr_cv_check_glibc_2_2_or_higher+set}" = set; then :
+@@ -27666,33 +20826,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_LINUX_UTRACE_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_UTRACE_H 1
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_UTRACE_H 1" >>confdefs.h
+ 
+      HAVE_LINUX_UTRACE_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_UTRACE_H 0
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_UTRACE_H 0" >>confdefs.h
+ 
+      HAVE_LINUX_UTRACE_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/perf_event.h" >&5
++$as_echo_n "checking kernel for linux/perf_event.h... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for linux/perf_event.h" >&5
+-echo $ECHO_N "checking kernel for linux/perf_event.h... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
+ 
+ 
+@@ -27703,11 +20858,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--#include <signal.h>
--	 #ifndef offsetof
--  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
--	 #endif
--long longval () { return offsetof(struct siginfo, si_pid); }
--unsigned long ulongval () { return offsetof(struct siginfo, si_pid); }
--#include <stdio.h>
--#include <stdlib.h>
-+
-+	#include <features.h>
-+	#ifndef __GLIBC_PREREQ
-+	    #define __GLIBC_PREREQ(maj, min) \
-+		((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
-+	#endif
-+	#if !__GLIBC_PREREQ(2, 2)
-+	    #error "Bad glibc version"
-+	#endif
-+	extern int gnu_get_libc_version(void); /* Ensures this *is* glibc */
-+
- int
- main ()
- {
- 
--  FILE *f = fopen ("conftest.val", "w");
--  if (! f)
--    exit (1);
--  if ((offsetof(struct siginfo, si_pid)) < 0)
--    {
--      long i = longval ();
--      if (i != (offsetof(struct siginfo, si_pid)))
--	exit (1);
--      fprintf (f, "%ld\n", i);
--    }
--  else
--    {
--      unsigned long i = ulongval ();
--      if (i != (offsetof(struct siginfo, si_pid)))
--	exit (1);
--      fprintf (f, "%lu\n", i);
--    }
--  exit (ferror (f) || fclose (f) != 0);
-+	return !gnu_get_libc_version();
  
-   ;
+ 		 #include <linux/kernel.h>
+@@ -27727,42 +20878,18 @@
    return 0;
  }
  _ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-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='./conftest$ac_exeext'
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (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
--  cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=`cat conftest.val`
-+if ac_fn_c_try_link "$LINENO"; then :
-+  cr_cv_check_glibc_2_2_or_higher=yes
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H=yes
  else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
+-  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
-+  cr_cv_check_glibc_2_2_or_higher=no
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H=no
  fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--rm -f conftest.val
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  
  fi
--echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&5
--echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&6
--  if test -n "$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"; then
--    CR_ASM_SI_PID_OFFSET="$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"
--  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_check_glibc_2_2_or_higher" >&5
-+$as_echo "$cr_cv_check_glibc_2_2_or_higher" >&6; }
+@@ -27770,33 +20897,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H
  
--  if test -n "$CR_ASM_SI_PID_OFFSET"; then
--    cat >>confdefs.h <<_ACEOF
--#define CR_ASM_SI_PID_OFFSET $CR_ASM_SI_PID_OFFSET
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_PERF_EVENT_H 1
 -_ACEOF
-+  if eval test $cr_cv_check_glibc_2_2_or_higher = yes; then
-+    :
-+  else
-+    cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
- 
-+_ACEOF
++    $as_echo "#define HAVE_LINUX_PERF_EVENT_H 1" >>confdefs.h
  
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
+      HAVE_LINUX_PERF_EVENT_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_PERF_EVENT_H 0
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_PERF_EVENT_H 0" >>confdefs.h
  
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
-+fi
-+rm -f confcache
-+   as_fn_error $? "the C library does not appear to be glibc 2.2 or higher." "$LINENO" 5
+      HAVE_LINUX_PERF_EVENT_H=''
    fi
  
  
--    CR_ASM_NR_ioctl=""
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
--    echo "$as_me:$LINENO: checking for value of CR_ASM_NR_ioctl" >&5
--echo $ECHO_N "checking for value of CR_ASM_NR_ioctl... $ECHO_C" >&6
--if test "${cr_cv_compute_int_CR_ASM_NR_ioctl+set}" = set; then
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for linux/audit.h" >&5
+-echo $ECHO_N "checking kernel for linux/audit.h... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/audit.h" >&5
++$as_echo_n "checking kernel for linux/audit.h... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_LINUX_AUDIT_H+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+# Checks for required libraries and fail if they are not found
-+# Note that we are NOT adding them to LIBS, just verifying their presence.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
-+$as_echo_n "checking for dlsym in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlsym+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_LINUX_AUDIT_H+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
--
--    cr_cv_compute_int_CR_ASM_NR_ioctl=""
--    if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
+ 
+ 
+@@ -27807,11 +20929,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlsym ();
- int
- main ()
- {
--static int test_array [1 - 2 * !((__NR_ioctl) >= 0)];
--test_array [0] = 0
--
-+return dlsym ();
-   ;
+ 
+ 		 #include <linux/kernel.h>
+@@ -27831,42 +20949,18 @@
    return 0;
  }
  _ACEOF
@@ -68755,130 +74459,82 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_lo=0 ac_mid=0
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dl_dlsym=yes
-+else
-+  ac_cv_lib_dl_dlsym=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
-+$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
-+if test "x$ac_cv_lib_dl_dlsym" = x""yes; then :
-+  :
-+else
-+  cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
-+fi
-+rm -f confcache
-+   as_fn_error $? "required library libdl not found." "$LINENO" 5
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpthread  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pthread_create ();
- int
- main ()
- {
--static int test_array [1 - 2 * !((__NR_ioctl) <= $ac_mid)];
--test_array [0] = 0
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_AUDIT_H=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_AUDIT_H=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -27874,33 +20968,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_LINUX_AUDIT_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_AUDIT_H 1
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_AUDIT_H 1" >>confdefs.h
+ 
+      HAVE_LINUX_AUDIT_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_AUDIT_H 0
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_AUDIT_H 0" >>confdefs.h
+ 
+      HAVE_LINUX_AUDIT_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/elf.h" >&5
++$as_echo_n "checking kernel for asm/elf.h... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for asm/elf.h" >&5
+-echo $ECHO_N "checking kernel for asm/elf.h... $ECHO_C" >&6
 -
-+return pthread_create ();
-   ;
+-    if test "${cr_cv_kconfig_HAVE_ASM_ELF_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_ASM_ELF_H+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -27911,11 +21000,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -27935,42 +21020,18 @@
    return 0;
  }
  _ACEOF
@@ -68904,300 +74560,84 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid; break
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_pthread_pthread_create=yes
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_ASM_ELF_H=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+  ac_cv_lib_pthread_pthread_create=no
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_ASM_ELF_H=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
-+  :
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
-+fi
-+rm -f confcache
-+   as_fn_error $? "required library libpthread not found." "$LINENO" 5
-+fi
-+
-+
-+# Prep a variable for possible use in messages below
-+if test x"$enable_multilib" = xyes; then
-+  ldsuggest='-L/usr/lib/nptl -L/usr/lib64/nptl'
-+elif test x"$ac_cv_sizeof_void_p" = x8; then
-+  ldsuggest='-L/usr/lib64/nptl'
-+else
-+  ldsuggest='-L/usr/lib/nptl'
-+fi
-+
-+# Helper for LinuxThreads probes
-+# CR_LT_PROBE(cv_varname, cross_varname)
-+
-+
-+# Look for LinuxThreads in the default (probably dynamic) library
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether default pthreads library is LinuxThreads" >&5
-+$as_echo_n "checking whether default pthreads library is LinuxThreads... " >&6; }
-+if test "${cr_cv_pt_default_lt+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+  SAVE_LIBS="$LIBS"
-+  LIBS="-lpthread $LIBS"
-+
-+  if test "$cross_compiling" = yes; then :
-+
-+
-+  if test "${cross_linuxthreads-unset}" = unset; then
-+    as_fn_error $? "When cross-compiling, variable cross_linuxthreads must be set." "$LINENO" 5
-+  fi
-+
-+    if test x"$cross_linuxthreads" != x0; then :
-+  cr_cv_pt_default_lt=yes
-+else
-+  cr_cv_pt_default_lt=no
-+fi
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
--int
--main ()
--{
--static int test_array [1 - 2 * !((__NR_ioctl) < 0)];
--test_array [0] = 0
  
--  ;
--  return 0;
--}
+ fi
+@@ -27978,33 +21039,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_ASM_ELF_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ASM_ELF_H 1
 -_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=-1 ac_mid=-1
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
++    $as_echo "#define HAVE_ASM_ELF_H 1" >>confdefs.h
+ 
+      HAVE_ASM_ELF_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ASM_ELF_H 0
+-_ACEOF
++    $as_echo "#define HAVE_ASM_ELF_H 0" >>confdefs.h
+ 
+      HAVE_ASM_ELF_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for asm/desc.h" >&5
+-echo $ECHO_N "checking kernel for asm/desc.h... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/desc.h" >&5
++$as_echo_n "checking kernel for asm/desc.h... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_ASM_DESC_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_ASM_DESC_H+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -28015,11 +21071,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+	#include <sys/types.h>
-+	#include <unistd.h>
-+	#include <stdio.h>
-+	#include <pthread.h>
-+
-+	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
-+
-+	int main(void) {
-+	    pthread_t th;
-+	    void *join_val;
-+
-+	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
-+		fputs("Error calling pthread_create()\n", stderr);
-+		return -1;
-+	    }
-+	    if (0 != pthread_join(th, &join_val)) {
-+		fputs("Error calling pthread_join()\n", stderr);
-+		return -1;
-+	    }
-+
-+	    /* zero = NOT equal pids = LinuxThreads */
-+	    return ((long)join_val == (long)getpid());
-+	}
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  cr_cv_pt_default_lt=yes
-+else
-+  cr_cv_pt_default_lt=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+
-+  LIBS="$SAVE_LIBS"
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_pt_default_lt" >&5
-+$as_echo "$cr_cv_pt_default_lt" >&6; }
-+if test x"$cr_cv_pt_default_lt" = xyes; then
-+  as_fn_error $? "linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." "$LINENO" 5
-+fi
-+
-+# Now look for LinuxThreads in the static libs if we are building static ones ourself
-+if test x"$enable_static" = xyes; then
-+  # Look for LinuxThreads in the static library
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether static pthreads library is LinuxThreads" >&5
-+$as_echo_n "checking whether static pthreads library is LinuxThreads... " >&6; }
-+if test "${cr_cv_pt_static_lt+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    SAVE_LIBS="$LIBS"
-+    SAVE_LDFLAGS="$LDFLAGS"
-+    LDFLAGS="$LDFLAGS -static"
-+    LIBS="-lpthread $LIBS"
-+
-+  if test "$cross_compiling" = yes; then :
-+
-+
-+  if test "${cross_linuxthreads_static-unset}" = unset; then
-+    as_fn_error $? "When cross-compiling, variable cross_linuxthreads_static must be set." "$LINENO" 5
-+  fi
-+
-+    if test x"$cross_linuxthreads_static" != x0; then :
-+  cr_cv_pt_static_lt=yes
-+else
-+  cr_cv_pt_static_lt=no
-+fi
-+else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
--int
--main ()
--{
--static int test_array [1 - 2 * !((__NR_ioctl) >= $ac_mid)];
--test_array [0] = 0
  
--  ;
--  return 0;
--}
-+	#include <sys/types.h>
-+	#include <unistd.h>
-+	#include <stdio.h>
-+	#include <pthread.h>
-+
-+	static void *thread_pid(void *arg) { return (void *)(long)getpid(); }
-+
-+	int main(void) {
-+	    pthread_t th;
-+	    void *join_val;
-+
-+	    if (0 != pthread_create(&th, NULL, &thread_pid, NULL)) {
-+		fputs("Error calling pthread_create()\n", stderr);
-+		return -1;
-+	    }
-+	    if (0 != pthread_join(th, &join_val)) {
-+		fputs("Error calling pthread_join()\n", stderr);
-+		return -1;
-+	    }
-+
-+	    /* zero = NOT equal pids = LinuxThreads */
-+	    return ((long)join_val == (long)getpid());
-+	}
+ 		 #include <linux/kernel.h>
+@@ -28039,42 +21091,18 @@
+   return 0;
+ }
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -69221,163 +74661,84 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_lo=$ac_mid; break
-+if ac_fn_c_try_run "$LINENO"; then :
-+  cr_cv_pt_static_lt=yes
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_ASM_DESC_H=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  cr_cv_pt_static_lt=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+
-+    LIBS="$SAVE_LIBS"
-+    LDFLAGS="$SAVE_LDFLAGS"
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_ASM_DESC_H=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_pt_static_lt" >&5
-+$as_echo "$cr_cv_pt_static_lt" >&6; }
-+  if test x"$cr_cv_pt_static_lt" = xyes; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&5
-+$as_echo "$as_me: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&2;}
-+    cr_static_link_warning="yes"
-+    if test x"$enable_all_static" = xyes; then
-+      cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-   done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  
--ac_lo= ac_hi=
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f confcache
-+      as_fn_error $? "static linking of BLCR to LinuxThreads is NOT supported.  Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." "$LINENO" 5
-+    fi
-+  fi
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
--  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -28082,33 +21110,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_ASM_DESC_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ASM_DESC_H 1
+-_ACEOF
++    $as_echo "#define HAVE_ASM_DESC_H 1" >>confdefs.h
+ 
+      HAVE_ASM_DESC_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ASM_DESC_H 0
+-_ACEOF
++    $as_echo "#define HAVE_ASM_DESC_H 0" >>confdefs.h
+ 
+      HAVE_ASM_DESC_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/vsyscall32.h" >&5
++$as_echo_n "checking kernel for asm/vsyscall32.h... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for asm/vsyscall32.h" >&5
+-echo $ECHO_N "checking kernel for asm/vsyscall32.h... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -28119,11 +21142,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
--int
--main ()
--{
--static int test_array [1 - 2 * !((__NR_ioctl) <= $ac_mid)];
--test_array [0] = 0
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
-+# Check for atfork handling
-+for ac_func in __register_atfork
-+do :
-+  ac_fn_c_check_func "$LINENO" "__register_atfork" "ac_cv_func___register_atfork"
-+if test "x$ac_cv_func___register_atfork" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE___REGISTER_ATFORK 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+# Check for pthread_attr_setstacksize
-+SAVE_LIBS="$LIBS"
-+LIBS="-lpthread $LIBS"
-+for ac_func in pthread_attr_setstacksize
-+do :
-+  ac_fn_c_check_func "$LINENO" "pthread_attr_setstacksize" "ac_cv_func_pthread_attr_setstacksize"
-+if test "x$ac_cv_func_pthread_attr_setstacksize" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
+ 		 #include <linux/kernel.h>
+@@ -28143,42 +21162,18 @@
+   return 0;
+ }
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -69401,198 +74762,288 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
--case $ac_lo in
--?*) cr_cv_compute_int_CR_ASM_NR_ioctl=$ac_lo;;
--'')  ;;
--esac
-+
-+LIBS="$SAVE_LIBS"
-+
-+# Look for prctl(PR_SET_PDEATHSIG, ...)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pctrl()" >&5
-+$as_echo_n "checking for pctrl()... " >&6; }
-+if test "${cr_cv_prctl+set}" = set; then :
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -28186,33 +21181,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ASM_VSYSCALL32_H 1
+-_ACEOF
++    $as_echo "#define HAVE_ASM_VSYSCALL32_H 1" >>confdefs.h
+ 
+      HAVE_ASM_VSYSCALL32_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ASM_VSYSCALL32_H 0
+-_ACEOF
++    $as_echo "#define HAVE_ASM_VSYSCALL32_H 0" >>confdefs.h
+ 
+      HAVE_ASM_VSYSCALL32_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for asm/i387.h" >&5
+-echo $ECHO_N "checking kernel for asm/i387.h... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/i387.h" >&5
++$as_echo_n "checking kernel for asm/i387.h... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_ASM_I387_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_ASM_I387_H+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
+ 
+ 
+@@ -28223,11 +21213,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
--long longval () { return __NR_ioctl; }
--unsigned long ulongval () { return __NR_ioctl; }
--#include <stdio.h>
--#include <stdlib.h>
-+
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+    #include <sys/prctl.h>
-+
- int
- main ()
- {
- 
--  FILE *f = fopen ("conftest.val", "w");
--  if (! f)
--    exit (1);
--  if ((__NR_ioctl) < 0)
--    {
--      long i = longval ();
--      if (i != (__NR_ioctl))
--	exit (1);
--      fprintf (f, "%ld\n", i);
--    }
--  else
--    {
--      unsigned long i = ulongval ();
--      if (i != (__NR_ioctl))
--	exit (1);
--      fprintf (f, "%lu\n", i);
--    }
--  exit (ferror (f) || fclose (f) != 0);
-+    int rc = prctl(PR_SET_PDEATHSIG, 0);
+ /* end confdefs.h.  */
  
-   ;
+ 		 #include <linux/kernel.h>
+@@ -28247,42 +21233,18 @@
    return 0;
  }
  _ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-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='./conftest$ac_exeext'
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (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
--  cr_cv_compute_int_CR_ASM_NR_ioctl=`cat conftest.val`
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  cr_cv_prctl=yes
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_ASM_I387_H=yes
  else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
+-  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
-+  cr_cv_prctl=no
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_ASM_I387_H=no
  fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+ 
+ 
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_prctl" >&5
-+$as_echo "$cr_cv_prctl" >&6; }
-+
-+  if test x$cr_cv_prctl = xyes; then
-+    $as_echo "#define HAVE_PRCTL 1" >>confdefs.h
-+
-+  else
-+    $as_echo "#define HAVE_PRCTL 0" >>confdefs.h
-+
-+  fi
-+
-+
-+
-+# Check various constants needed for asm
-+SAVE_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -I${TOP_SRCDIR}/include"
-+
-+    CR_ASM_OP_HAND_CHKPT=""
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_OP_HAND_CHKPT" >&5
-+$as_echo_n "checking for value of CR_ASM_OP_HAND_CHKPT... " >&6; }
-+if test "${cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT+set}" = set; then :
+@@ -28290,34 +21252,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_ASM_I387_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ASM_I387_H 1
+-_ACEOF
++    $as_echo "#define HAVE_ASM_I387_H 1" >>confdefs.h
+ 
+      HAVE_ASM_I387_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ASM_I387_H 0
+-_ACEOF
++    $as_echo "#define HAVE_ASM_I387_H 0" >>confdefs.h
+ 
+      HAVE_ASM_I387_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/utsrelease.h" >&5
++$as_echo_n "checking kernel for linux/utsrelease.h... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for linux/utsrelease.h" >&5
+-echo $ECHO_N "checking kernel for linux/utsrelease.h... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H+:} false; then :
 +  $as_echo_n "(cached) " >&6
-+else
-+
-+    cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=""
-+    if ac_fn_c_compute_int "$LINENO" "CR_OP_HAND_CHKPT" "cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"        "#include <sys/ioctl.h>
-+	 #include \"blcr_ioctl.h\""; then :
-+
+ else
+ 
+ 
+@@ -28328,11 +21285,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -28352,42 +21305,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H=no
  fi
--rm -f conftest.val
-+
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  
  fi
--echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_NR_ioctl" >&5
--echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_NR_ioctl" >&6
--  if test -n "$cr_cv_compute_int_CR_ASM_NR_ioctl"; then
--    CR_ASM_NR_ioctl="$cr_cv_compute_int_CR_ASM_NR_ioctl"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&5
-+$as_echo "$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&6; }
-+  if test -n "$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"; then
-+    CR_ASM_OP_HAND_CHKPT="$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"
-   fi
+@@ -28395,33 +21324,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H
  
--  if test -n "$CR_ASM_NR_ioctl"; then
-+  if test -n "$CR_ASM_OP_HAND_CHKPT"; then
-     cat >>confdefs.h <<_ACEOF
--#define CR_ASM_NR_ioctl $CR_ASM_NR_ioctl
-+#define CR_ASM_OP_HAND_CHKPT $CR_ASM_OP_HAND_CHKPT
- _ACEOF
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_UTSRELEASE_H 1
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_UTSRELEASE_H 1" >>confdefs.h
+ 
+      HAVE_LINUX_UTSRELEASE_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_UTSRELEASE_H 0
+-_ACEOF
++    $as_echo "#define HAVE_LINUX_UTSRELEASE_H 0" >>confdefs.h
+ 
+      HAVE_LINUX_UTSRELEASE_H=''
+   fi
  
  
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 -
-   fi
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
  
--    CR_ASM_NR_rt_sigreturn=""
-+    CR_ASM_CHECKPOINT_STUB=""
  
--    echo "$as_me:$LINENO: checking for value of CR_ASM_NR_rt_sigreturn" >&5
--echo $ECHO_N "checking for value of CR_ASM_NR_rt_sigreturn... $ECHO_C" >&6
--if test "${cr_cv_compute_int_CR_ASM_NR_rt_sigreturn+set}" = set; then
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for generated/utsrelease.h" >&5
+-echo $ECHO_N "checking kernel for generated/utsrelease.h... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for generated/utsrelease.h" >&5
++$as_echo_n "checking kernel for generated/utsrelease.h... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_CHECKPOINT_STUB" >&5
-+$as_echo_n "checking for value of CR_ASM_CHECKPOINT_STUB... " >&6; }
-+if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=""
--    if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
+ 
+@@ -28432,11 +21356,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
--int
--main ()
--{
--static int test_array [1 - 2 * !((__NR_rt_sigreturn) >= 0)];
--test_array [0] = 0
-+    cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=""
-+    if ac_fn_c_compute_int "$LINENO" "_CR_CHECKPOINT_STUB" "cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"        "#include \"blcr_common.h.in\""; then :
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
--_ACEOF
+ 		 #include <linux/kernel.h>
+@@ -28456,42 +21376,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -69615,27 +75066,87 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_lo=0 ac_mid=0
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -28499,22 +21395,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GENERATED_UTSRELEASE_H 1
+-_ACEOF
++    $as_echo "#define HAVE_GENERATED_UTSRELEASE_H 1" >>confdefs.h
+ 
+      HAVE_GENERATED_UTSRELEASE_H=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GENERATED_UTSRELEASE_H 0
+-_ACEOF
++    $as_echo "#define HAVE_GENERATED_UTSRELEASE_H 0" >>confdefs.h
+ 
+      HAVE_GENERATED_UTSRELEASE_H=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+@@ -28522,12 +21414,12 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for timeval_to_jiffies" >&5
+-echo $ECHO_N "checking kernel symbol table for timeval_to_jiffies... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for timeval_to_jiffies" >&5
++$as_echo_n "checking kernel symbol table for timeval_to_jiffies... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_timeval_to_jiffies+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_timeval_to_jiffies+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+     cr_cv_ksymtab_timeval_to_jiffies=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}timeval_to_jiffies$/ {s/ .*//p;q;}"`
+@@ -28543,11 +21435,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
--int
--main ()
--{
--static int test_array [1 - 2 * !((__NR_rt_sigreturn) <= $ac_mid)];
--test_array [0] = 0
-+fi
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
--_ACEOF
+ 		 #include <linux/kernel.h>
+@@ -28567,42 +21455,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -69658,50 +75169,78 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid; break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_timeval_to_jiffies="Y$cr_cv_ksymtab_timeval_to_jiffies"
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_timeval_to_jiffies="N$cr_cv_ksymtab_timeval_to_jiffies"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&5
-+$as_echo "$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&6; }
-+  if test -n "$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"; then
-+    CR_ASM_CHECKPOINT_STUB="$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"
-+  fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--cat >conftest.$ac_ext <<_ACEOF
+     fi
+ 
+@@ -28613,9 +21477,7 @@
+     cr_result='not found'
+   else
+     if expr "$cr_cv_ksymtab_timeval_to_jiffies" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol timeval_to_jiffies but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol timeval_to_jiffies but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol timeval_to_jiffies but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_timeval_to_jiffies | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -28631,17 +21493,17 @@
+ _ACEOF
+ 
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for jiffies_to_timeval" >&5
+-echo $ECHO_N "checking kernel symbol table for jiffies_to_timeval... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for jiffies_to_timeval" >&5
++$as_echo_n "checking kernel symbol table for jiffies_to_timeval... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_jiffies_to_timeval+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_jiffies_to_timeval+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+     cr_cv_ksymtab_jiffies_to_timeval=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}jiffies_to_timeval$/ {s/ .*//p;q;}"`
+@@ -28657,11 +21519,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+  if test -n "$CR_ASM_CHECKPOINT_STUB"; then
-+    cat >>confdefs.h <<_ACEOF
-+#define CR_ASM_CHECKPOINT_STUB $CR_ASM_CHECKPOINT_STUB
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
--int
--main ()
--{
--static int test_array [1 - 2 * !((__NR_rt_sigreturn) < 0)];
--test_array [0] = 0
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
--_ACEOF
+ 		 #include <linux/kernel.h>
+@@ -28681,42 +21539,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -69724,26 +75263,80 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=-1 ac_mid=-1
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_jiffies_to_timeval="Y$cr_cv_ksymtab_jiffies_to_timeval"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_jiffies_to_timeval="N$cr_cv_ksymtab_jiffies_to_timeval"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+     fi
+ 
+@@ -28727,9 +21561,7 @@
+     cr_result='not found'
+   else
+     if expr "$cr_cv_ksymtab_jiffies_to_timeval" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol jiffies_to_timeval but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol jiffies_to_timeval but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol jiffies_to_timeval but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_jiffies_to_timeval | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -28745,19 +21577,18 @@
+ _ACEOF
+ 
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct fdtable" >&5
++$as_echo_n "checking kernel for struct fdtable... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for struct fdtable" >&5
+-echo $ECHO_N "checking kernel for struct fdtable... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_STRUCT_FDTABLE+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_STRUCT_FDTABLE+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -28768,11 +21599,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
--int
--main ()
--{
--static int test_array [1 - 2 * !((__NR_rt_sigreturn) >= $ac_mid)];
--test_array [0] = 0
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
--_ACEOF
+ 		 #include <linux/kernel.h>
+@@ -28798,42 +21625,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -69766,99 +75359,86 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_lo=$ac_mid; break
-+  fi
-+    # ICK!
-+
-+    CR_ASM_OP_HAND_ABORT=""
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_OP_HAND_ABORT" >&5
-+$as_echo_n "checking for value of CR_ASM_OP_HAND_ABORT... " >&6; }
-+if test "${cr_cv_compute_int_CR_ASM_OP_HAND_ABORT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_STRUCT_FDTABLE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+    cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=""
-+    if ac_fn_c_compute_int "$LINENO" "CR_OP_HAND_ABORT" "cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"        "#include <sys/ioctl.h>
-+	 #include \"blcr_ioctl.h\""; then :
-+
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_STRUCT_FDTABLE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
-+
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&5
-+$as_echo "$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&6; }
-+  if test -n "$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"; then
-+    CR_ASM_OP_HAND_ABORT="$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"
-+  fi
-+
-+  if test -n "$CR_ASM_OP_HAND_ABORT"; then
-+    cat >>confdefs.h <<_ACEOF
-+#define CR_ASM_OP_HAND_ABORT $CR_ASM_OP_HAND_ABORT
-+_ACEOF
-+
-+
-+  fi
-+
-+
-+    CR_ASM_CHECKPOINT_OMIT=""
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_CHECKPOINT_OMIT" >&5
-+$as_echo_n "checking for value of CR_ASM_CHECKPOINT_OMIT... " >&6; }
-+if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT+set}" = set; then :
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -28841,22 +21644,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_STRUCT_FDTABLE
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_FDTABLE 1
+-_ACEOF
++    $as_echo "#define HAVE_STRUCT_FDTABLE 1" >>confdefs.h
+ 
+      HAVE_STRUCT_FDTABLE=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_FDTABLE 0
+-_ACEOF
++    $as_echo "#define HAVE_STRUCT_FDTABLE 0" >>confdefs.h
+ 
+      HAVE_STRUCT_FDTABLE=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ # OK if missing
+@@ -28864,12 +21663,11 @@
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for files_struct.next_fd" >&5
++$as_echo_n "checking kernel for files_struct.next_fd... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for files_struct.next_fd" >&5
+-echo $ECHO_N "checking kernel for files_struct.next_fd... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_lo= ac_hi=
-+    cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=""
-+    if ac_fn_c_compute_int "$LINENO" "CR_CHECKPOINT_OMIT" "cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"        "#include \"blcr_common.h.in\""; then :
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
--  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ 
+@@ -28880,11 +21678,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
--int
--main ()
--{
--static int test_array [1 - 2 * !((__NR_rt_sigreturn) <= $ac_mid)];
--test_array [0] = 0
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&5
-+$as_echo "$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&6; }
-+  if test -n "$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"; then
-+    CR_ASM_CHECKPOINT_OMIT="$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"
-+  fi
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
-+  if test -n "$CR_ASM_CHECKPOINT_OMIT"; then
-+    cat >>confdefs.h <<_ACEOF
-+#define CR_ASM_CHECKPOINT_OMIT $CR_ASM_CHECKPOINT_OMIT
+ 		 #include <linux/kernel.h>
+@@ -28908,42 +21702,18 @@
+   return 0;
+ }
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -69882,205 +75462,275 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid
-+
-+
-+  fi
-+    # ICK!
-+
-+    CR_ASM_SI_PID_OFFSET=""
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_SI_PID_OFFSET" >&5
-+$as_echo_n "checking for value of CR_ASM_SI_PID_OFFSET... " >&6; }
-+if test "${cr_cv_compute_int_CR_ASM_SI_PID_OFFSET+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+    cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=""
-+    if ac_fn_c_compute_int "$LINENO" "offsetof(struct siginfo, si_pid)" "cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"        "#include <signal.h>
-+	 #ifndef offsetof
-+  	    #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-+	 #endif"; then :
-+
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=$ac_lo;;
--'')  ;;
--esac
--else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -28951,33 +21721,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FILES_STRUCT_NEXT_FD 1
+-_ACEOF
++    $as_echo "#define HAVE_FILES_STRUCT_NEXT_FD 1" >>confdefs.h
+ 
+      HAVE_FILES_STRUCT_NEXT_FD=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FILES_STRUCT_NEXT_FD 0
+-_ACEOF
++    $as_echo "#define HAVE_FILES_STRUCT_NEXT_FD 0" >>confdefs.h
+ 
+      HAVE_FILES_STRUCT_NEXT_FD=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for fdtable.next_fd" >&5
++$as_echo_n "checking kernel for fdtable.next_fd... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for fdtable.next_fd" >&5
+-echo $ECHO_N "checking kernel for fdtable.next_fd... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -28988,11 +21753,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <asm/unistd.h>
--	 #include <linux/unistd.h>
--long longval () { return __NR_rt_sigreturn; }
--unsigned long ulongval () { return __NR_rt_sigreturn; }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
- 
--  FILE *f = fopen ("conftest.val", "w");
--  if (! f)
--    exit (1);
--  if ((__NR_rt_sigreturn) < 0)
--    {
--      long i = longval ();
--      if (i != (__NR_rt_sigreturn))
--	exit (1);
--      fprintf (f, "%ld\n", i);
--    }
--  else
--    {
--      unsigned long i = ulongval ();
--      if (i != (__NR_rt_sigreturn))
--	exit (1);
--      fprintf (f, "%lu\n", i);
--    }
--  exit (ferror (f) || fclose (f) != 0);
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  ;
--  return 0;
--}
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&5
-+$as_echo "$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&6; }
-+  if test -n "$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"; then
-+    CR_ASM_SI_PID_OFFSET="$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"
-+  fi
-+
-+  if test -n "$CR_ASM_SI_PID_OFFSET"; then
-+    cat >>confdefs.h <<_ACEOF
-+#define CR_ASM_SI_PID_OFFSET $CR_ASM_SI_PID_OFFSET
+ 		 #include <linux/kernel.h>
+@@ -29016,42 +21777,18 @@
+   return 0;
+ }
  _ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-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='./conftest$ac_exeext'
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (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
--  cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=`cat conftest.val`
-+
-+
-+  fi
-+
-+
-+    CR_ASM_NR_ioctl=""
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_NR_ioctl" >&5
-+$as_echo_n "checking for value of CR_ASM_NR_ioctl... " >&6; }
-+if test "${cr_cv_compute_int_CR_ASM_NR_ioctl+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD=yes
  else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
+-  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+
-+    cr_cv_compute_int_CR_ASM_NR_ioctl=""
-+    if ac_fn_c_compute_int "$LINENO" "__NR_ioctl" "cr_cv_compute_int_CR_ASM_NR_ioctl"        "#include <asm/unistd.h>
-+	 #include <linux/unistd.h>"; then :
- 
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD=no
  fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+
-+
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_NR_ioctl" >&5
-+$as_echo "$cr_cv_compute_int_CR_ASM_NR_ioctl" >&6; }
-+  if test -n "$cr_cv_compute_int_CR_ASM_NR_ioctl"; then
-+    CR_ASM_NR_ioctl="$cr_cv_compute_int_CR_ASM_NR_ioctl"
-+  fi
-+
-+  if test -n "$CR_ASM_NR_ioctl"; then
-+    cat >>confdefs.h <<_ACEOF
-+#define CR_ASM_NR_ioctl $CR_ASM_NR_ioctl
-+_ACEOF
-+
-+
-+  fi
-+
-+
-+    CR_ASM_NR_rt_sigreturn=""
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_NR_rt_sigreturn" >&5
-+$as_echo_n "checking for value of CR_ASM_NR_rt_sigreturn... " >&6; }
-+if test "${cr_cv_compute_int_CR_ASM_NR_rt_sigreturn+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=""
-+    if ac_fn_c_compute_int "$LINENO" "__NR_rt_sigreturn" "cr_cv_compute_int_CR_ASM_NR_rt_sigreturn"        "#include <asm/unistd.h>
-+	 #include <linux/unistd.h>"; then :
+@@ -29059,22 +21796,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FDTABLE_NEXT_FD 1
+-_ACEOF
++    $as_echo "#define HAVE_FDTABLE_NEXT_FD 1" >>confdefs.h
+ 
+      HAVE_FDTABLE_NEXT_FD=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FDTABLE_NEXT_FD 0
+-_ACEOF
++    $as_echo "#define HAVE_FDTABLE_NEXT_FD 0" >>confdefs.h
+ 
+      HAVE_FDTABLE_NEXT_FD=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ # Allow only exactly one match
+@@ -29098,39 +21831,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
 +
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
  fi
--rm -f conftest.val
-+
+ rm -f confcache
+@@ -29144,21 +21908,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" "$LINENO" 5
  
  fi
--echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&5
--echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&5
-+$as_echo "$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&6; }
-   if test -n "$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn"; then
-     CR_ASM_NR_rt_sigreturn="$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn"
-   fi
-@@ -25251,25 +17923,22 @@
- _ACEOF
  
  
--
-   fi
  
- CFLAGS="$SAVE_CFLAGS"
  
- # Probe for direction of stack growth
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for files_struct.max_fdset" >&5
++$as_echo_n "checking kernel for files_struct.max_fdset... " >&6; }
  
--    echo "$as_me:$LINENO: checking for direction of stack growth" >&5
--echo $ECHO_N "checking for direction of stack growth... $ECHO_C" >&6
--if test "${cr_cv_check_stack_direction+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for files_struct.max_fdset" >&5
+-echo $ECHO_N "checking kernel for files_struct.max_fdset... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for direction of stack growth" >&5
-+$as_echo_n "checking for direction of stack growth... " >&6; }
-+if test "${cr_cv_check_stack_direction+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--   if test "$cross_compiling" = yes; then
-+   if test "$cross_compiling" = yes; then :
- 
-   if test "${cross_stack_direction-unset}" = unset; then
--    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_stack_direction must be set." >&5
--echo "$as_me: error: When cross-compiling, variable cross_stack_direction must be set." >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "When cross-compiling, variable cross_stack_direction must be set." "$LINENO" 5
-   fi
  
- 	 if test $cross_stack_direction = 1; then
-@@ -25278,11 +17947,7 @@
- 	   cr_cv_check_stack_direction=down
- 	 fi
- else
+@@ -29169,11 +21930,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -70089,82 +75739,110 @@
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-     int find_stack_direction (void) {
-@@ -25299,32 +17964,19 @@
-       return find_stack_direction();
-     }
+ 		 #include <linux/kernel.h>
+@@ -29197,42 +21954,18 @@
+   return 0;
+ }
  _ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-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='./conftest$ac_exeext'
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (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
-+if ac_fn_c_try_run "$LINENO"; then :
-   cr_cv_check_stack_direction=up
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET=yes
  else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
+-  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--( exit $ac_status )
--cr_cv_check_stack_direction=down
-+  cr_cv_check_stack_direction=down
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET=no
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  
-+
  fi
--echo "$as_me:$LINENO: result: $cr_cv_check_stack_direction" >&5
--echo "${ECHO_T}$cr_cv_check_stack_direction" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_check_stack_direction" >&5
-+$as_echo "$cr_cv_check_stack_direction" >&6; }
-   if test $cr_cv_check_stack_direction = up; then
-     cr_stack_direction=1
+@@ -29240,34 +21973,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FILES_STRUCT_MAX_FDSET 1
+-_ACEOF
++    $as_echo "#define HAVE_FILES_STRUCT_MAX_FDSET 1" >>confdefs.h
+ 
+      HAVE_FILES_STRUCT_MAX_FDSET=1
    else
-@@ -25337,7 +17989,6 @@
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FILES_STRUCT_MAX_FDSET 0
+-_ACEOF
++    $as_echo "#define HAVE_FILES_STRUCT_MAX_FDSET 0" >>confdefs.h
+ 
+      HAVE_FILES_STRUCT_MAX_FDSET=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
  
  
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct path" >&5
++$as_echo_n "checking kernel for struct path... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for struct path" >&5
+-echo $ECHO_N "checking kernel for struct path... $ECHO_C" >&6
 -
- # Look for FTB header and libs
-  cr_have_ftb=no
-  if test x"$FTB_HOME" != xno; then
-@@ -25347,20 +17998,16 @@
-   SAVE_LIBS="$LIBS"
-   CR_FTB_INCLUDES=""
-   CR_FTB_LDFLAGS=""
--  echo "$as_me:$LINENO: checking for FTB headers" >&5
--echo $ECHO_N "checking for FTB headers... $ECHO_C" >&6
--if test "${cr_cv_ftb_incdir+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_STRUCT_PATH+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FTB headers" >&5
-+$as_echo_n "checking for FTB headers... " >&6; }
-+if test "${cr_cv_ftb_incdir+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_STRUCT_PATH+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_result=no
-     for cr_tmp in "" "${FTB_HOME}/include"; do
-       CPPFLAGS="$SAVE_CPPFLAGS${cr_tmp:+ -I$cr_tmp}"
--      cat >conftest.$ac_ext <<_ACEOF
+ 
+@@ -29278,11 +22006,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-         #include <libftb.h>
-@@ -25375,35 +18022,10 @@
+ 		 #include <linux/kernel.h>
+@@ -29302,42 +22026,18 @@
    return 0;
  }
  _ACEOF
@@ -70191,63 +75869,86 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +if ac_fn_c_try_compile "$LINENO"; then :
-   cr_result="$cr_tmp"; break
--else
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_STRUCT_PATH=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_STRUCT_PATH=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     done
-     if test -z "$cr_result"; then
-       cr_cv_ftb_incdir="default"
-@@ -25412,611 +18034,173 @@
-     fi
+ 
  
  fi
--echo "$as_me:$LINENO: result: $cr_cv_ftb_incdir" >&5
--echo "${ECHO_T}$cr_cv_ftb_incdir" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_ftb_incdir" >&5
-+$as_echo "$cr_cv_ftb_incdir" >&6; }
-   if test x"$cr_cv_ftb_incdir" = xno; then
-     cr_have_ftb=no
-   elif test x"$cr_cv_ftb_incdir" != "xdefault"; then
-     CR_FTB_INCLUDES="-I$cr_cv_ftb_incdir"
--  fi
--  echo "$as_me:$LINENO: checking for FTB libs" >&5
--echo $ECHO_N "checking for FTB libs... $ECHO_C" >&6
--if test "${cr_cv_ftb_libdir+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+@@ -29345,32 +22045,27 @@
+   cr_result=$cr_cv_kconfig_HAVE_STRUCT_PATH
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_PATH 1
+-_ACEOF
++    $as_echo "#define HAVE_STRUCT_PATH 1" >>confdefs.h
+ 
+      HAVE_STRUCT_PATH=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_PATH 0
+-_ACEOF
++    $as_echo "#define HAVE_STRUCT_PATH 0" >>confdefs.h
+ 
+      HAVE_STRUCT_PATH=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 -
--    CPPFLAGS="$SAVE_CPPFLAGS $CR_FTB_INCLUDES"
--    LIBS="-lftb -lpthread $SAVE_LIBS"
--    cr_result=no
--    for cr_tmp in "" "${FTB_HOME}/lib64" "${FTB_HOME}/lib32" "${FTB_HOME}/lib"; do
--      LDFLAGS="$SAVE_LDFLAGS${cr_tmp:+-L$cr_tmp}"
--      cat >conftest.$ac_ext <<_ACEOF
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for nameidata.path" >&5
+-echo $ECHO_N "checking kernel for nameidata.path... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for nameidata.path" >&5
++$as_echo_n "checking kernel for nameidata.path... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_NAMEIDATA_PATH+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_NAMEIDATA_PATH+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -29381,11 +22076,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--        #include <libftb.h>
--
--int
--main ()
--{
--
--        return FTB_Connect(NULL, NULL);
--
--  ;
--  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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -29420,42 +22111,18 @@
+   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
@@ -70261,172 +75962,292 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  cr_result="$cr_tmp"; break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_NAMEIDATA_PATH=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
--    done
--    if test -z "$cr_result"; then
--      cr_cv_ftb_libdir="default"
--    else
--      cr_cv_ftb_libdir="$cr_result"
--    fi
--
--fi
--echo "$as_me:$LINENO: result: $cr_cv_ftb_libdir" >&5
--echo "${ECHO_T}$cr_cv_ftb_libdir" >&6
--  if test x"$cr_cv_ftb_libdir" = xno; then
--    cr_have_ftb=no
--  elif test x"$cr_cv_ftb_libdir" != "xdefault"; then
--    CR_FTB_LDFLAGS="-L$cr_cv_ftb_libdir"
--    CR_FTB_LDADD="-lftb"
--  fi
--  LIBS="$SAVE_LIBS"
--  LDFLAGS="$SAVE_LDFLAGS"
--  CPPFLAGS="$SAVE_CPPFLAGS"
--  if test x"$cr_have_ftb$cr_force_ftb" = xnoyes; then
--    { { echo "$as_me:$LINENO: error: Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" >&5
--echo "$as_me: error: Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" >&2;}
--   { (exit 1); exit 1; }; }
--  fi
--
--
--
-- fi
--
--  if test x$cr_have_ftb = xyes; then
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_NAMEIDATA_PATH=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -29463,31 +22130,26 @@
+   cr_result=$cr_cv_kconfig_HAVE_NAMEIDATA_PATH
+ 
+   if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FTB 1
+-#define HAVE_NAMEIDATA_PATH 1
 -_ACEOF
--
--  else
++    $as_echo "#define HAVE_NAMEIDATA_PATH 1" >>confdefs.h
+ 
+      HAVE_NAMEIDATA_PATH=1
+   else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FTB 0
+-#define HAVE_NAMEIDATA_PATH 0
 -_ACEOF
++    $as_echo "#define HAVE_NAMEIDATA_PATH 0" >>confdefs.h
+ 
+      HAVE_NAMEIDATA_PATH=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for nameidata.dentry" >&5
++$as_echo_n "checking kernel for nameidata.dentry... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for nameidata.dentry" >&5
+-echo $ECHO_N "checking kernel for nameidata.dentry... $ECHO_C" >&6
 -
--  fi
--
--
--
--
--fi # cr_build_libcr
--
--# Probe libc for the RT signal number to use
--
--    echo "$as_me:$LINENO: checking for value of CR_SIGNUM" >&5
--echo $ECHO_N "checking for value of CR_SIGNUM... $ECHO_C" >&6
--if test "${cr_cv_check_cr_signum+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--    cr_cv_check_cr_signum="failed"
--    SAVE_LIBS="$LIBS"
--    LIBS="-ldl -lpthread $LIBS"
--    if test "$cross_compiling" = yes; then
--
--  if test "${cross_signum-unset}" = unset; then
--    { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_signum must be set." >&5
--echo "$as_me: error: When cross-compiling, variable cross_signum must be set." >&2;}
--   { (exit 1); exit 1; }; }
--  fi
--
--	 cr_cv_check_cr_signum=$cross_signum
--else
++    if ${cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -29498,11 +22160,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <stdio.h>
--	#include <dlfcn.h>
--
--	extern int __libc_allocate_rtsig(int);
--	int main()
--	{
--	  int s = -1;
--	  FILE *f=fopen("conftestval", "w");
--	  void *dlhandle = dlopen(NULL, RTLD_LAZY);
--	  if (dlhandle) {
--	    int *tmp = (int *)dlsym(dlhandle, "cri_signum");
--	    dlclose(dlhandle);
--	    if (tmp) s = *tmp;
--	  }
--	  if (s <= 0) {
--	    s=__libc_allocate_rtsig(0);
--	  }
--	  if (!f || s<=0) return(1);
--	  fprintf(f, "%d\n", s);
--	  return(0);
--	}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -29537,42 +22195,18 @@
+   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='./conftest$ac_exeext'
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (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
--  cr_cv_check_cr_signum=`cat conftestval`
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY=yes
+ else
+-  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: Failed to probe CR_SIGNUM" >&5
--echo "$as_me: error: Failed to probe CR_SIGNUM" >&2;}
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -29580,22 +22214,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_NAMEIDATA_DENTRY 1
+-_ACEOF
++    $as_echo "#define HAVE_NAMEIDATA_DENTRY 1" >>confdefs.h
+ 
+      HAVE_NAMEIDATA_DENTRY=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_NAMEIDATA_DENTRY 0
+-_ACEOF
++    $as_echo "#define HAVE_NAMEIDATA_DENTRY 0" >>confdefs.h
+ 
+      HAVE_NAMEIDATA_DENTRY=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ if test "${HAVE_NAMEIDATA_PATH}${HAVE_NAMEIDATA_DENTRY}" != "1"; then
+ 
+@@ -29617,39 +22247,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -29663,21 +22324,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--    LIBS="$SAVE_LIBS"
--
--fi
--echo "$as_me:$LINENO: result: $cr_cv_check_cr_signum" >&5
--echo "${ECHO_T}$cr_cv_check_cr_signum" >&6
--  CR_SIGNUM=$cr_cv_check_cr_signum
--
--
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" "$LINENO" 5
+ 
+ fi
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for __putname" >&5
++$as_echo_n "checking kernel for __putname... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for __putname" >&5
+-echo $ECHO_N "checking kernel for __putname... $ECHO_C" >&6
 -
--# Check for 32- or 64-bit architecture
--echo "$as_me:$LINENO: checking for void *" >&5
--echo $ECHO_N "checking for void *... $ECHO_C" >&6
--if test "${ac_cv_type_void_p+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE___PUTNAME+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++    if ${cr_cv_kconfig_HAVE___PUTNAME+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -29688,11 +22346,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--if ((void * *) 0)
--  return 0;
--if (sizeof (void *))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -29716,42 +22370,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -70449,47 +76270,86 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_type_void_p=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE___PUTNAME=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_cv_type_void_p=no
--fi
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE___PUTNAME=no
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
--echo "${ECHO_T}$ac_cv_type_void_p" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -29759,34 +22389,29 @@
+   cr_result=$cr_cv_kconfig_HAVE___PUTNAME
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE___PUTNAME 1
+-_ACEOF
++    $as_echo "#define HAVE___PUTNAME 1" >>confdefs.h
+ 
+      HAVE___PUTNAME=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE___PUTNAME 0
+-_ACEOF
++    $as_echo "#define HAVE___PUTNAME 0" >>confdefs.h
+ 
+      HAVE___PUTNAME=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct delayed_work" >&5
++$as_echo_n "checking kernel for struct delayed_work... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for struct delayed_work" >&5
+-echo $ECHO_N "checking kernel for struct delayed_work... $ECHO_C" >&6
 -
--echo "$as_me:$LINENO: checking size of void *" >&5
--echo $ECHO_N "checking size of void *... $ECHO_C" >&6
--if test "${ac_cv_sizeof_void_p+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test "$ac_cv_type_void_p" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
--  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--  # This bug is HP SR number 8606223364.
--  if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
++    if ${cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -29797,11 +22422,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -29821,42 +22442,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -70512,25 +76372,87 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_lo=0 ac_mid=0
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -29864,22 +22461,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_DELAYED_WORK 1
+-_ACEOF
++    $as_echo "#define HAVE_STRUCT_DELAYED_WORK 1" >>confdefs.h
+ 
+      HAVE_STRUCT_DELAYED_WORK=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_DELAYED_WORK 0
+-_ACEOF
++    $as_echo "#define HAVE_STRUCT_DELAYED_WORK 0" >>confdefs.h
+ 
+      HAVE_STRUCT_DELAYED_WORK=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+@@ -29887,12 +22480,11 @@
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for do_each_pid_task" >&5
++$as_echo_n "checking kernel for do_each_pid_task... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for do_each_pid_task" >&5
+-echo $ECHO_N "checking kernel for do_each_pid_task... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_DO_EACH_PID_TASK+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_DO_EACH_PID_TASK+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -29903,11 +22495,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -29928,42 +22516,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -70553,82 +76475,85 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid; break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_DO_EACH_PID_TASK=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_DO_EACH_PID_TASK=no
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -29971,33 +22535,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_DO_EACH_PID_TASK
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DO_EACH_PID_TASK 1
 -_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
++    $as_echo "#define HAVE_DO_EACH_PID_TASK 1" >>confdefs.h
+ 
+      HAVE_DO_EACH_PID_TASK=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DO_EACH_PID_TASK 0
 -_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  ac_hi=-1 ac_mid=-1
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
++    $as_echo "#define HAVE_DO_EACH_PID_TASK 0" >>confdefs.h
+ 
+      HAVE_DO_EACH_PID_TASK=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for do_each_task_pid" >&5
++$as_echo_n "checking kernel for do_each_task_pid... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for do_each_task_pid" >&5
+-echo $ECHO_N "checking kernel for do_each_task_pid... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_DO_EACH_TASK_PID+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_DO_EACH_TASK_PID+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -30008,11 +22567,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -30033,42 +22588,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -70651,62 +76576,83 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_lo=$ac_mid; break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_DO_EACH_TASK_PID=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
--fi
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_DO_EACH_TASK_PID=no
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FTB libs" >&5
-+$as_echo_n "checking for FTB libs... " >&6; }
-+if test "${cr_cv_ftb_libdir+set}" = set; then :
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -30076,34 +22607,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_DO_EACH_TASK_PID
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DO_EACH_TASK_PID 1
+-_ACEOF
++    $as_echo "#define HAVE_DO_EACH_TASK_PID 1" >>confdefs.h
+ 
+      HAVE_DO_EACH_TASK_PID=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DO_EACH_TASK_PID 0
+-_ACEOF
++    $as_echo "#define HAVE_DO_EACH_TASK_PID 0" >>confdefs.h
+ 
+      HAVE_DO_EACH_TASK_PID=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ if test -z "${HAVE_DO_EACH_TASK_PID}"; then
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for for_each_task_pid" >&5
++$as_echo_n "checking kernel for for_each_task_pid... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for for_each_task_pid" >&5
+-echo $ECHO_N "checking kernel for for_each_task_pid... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_lo= ac_hi=
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
--  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ 
+@@ -30114,11 +22640,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+    CPPFLAGS="$SAVE_CPPFLAGS $CR_FTB_INCLUDES"
-+    LIBS="-lftb -lpthread $SAVE_LIBS"
-+    cr_result=no
-+    for cr_tmp in "" "${FTB_HOME}/lib64" "${FTB_HOME}/lib32" "${FTB_HOME}/lib"; do
-+      LDFLAGS="$SAVE_LDFLAGS${cr_tmp:+-L$cr_tmp}"
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--$ac_includes_default
-+
-+        #include <libftb.h>
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
--test_array [0] = 0
-+
-+        return FTB_Connect(NULL, NULL);
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
-   ;
+ 		 #include <linux/kernel.h>
+@@ -30139,42 +22661,18 @@
    return 0;
  }
  _ACEOF
@@ -70732,829 +76678,560 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID=yes
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_link "$LINENO"; then :
-+  cr_result="$cr_tmp"; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+    done
-+    if test -z "$cr_result"; then
-+      cr_cv_ftb_libdir="default"
-+    else
-+      cr_cv_ftb_libdir="$cr_result"
-+    fi
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_void_p=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (void *), 77
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
--esac
--else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--long longval () { return (long) (sizeof (void *)); }
--unsigned long ulongval () { return (long) (sizeof (void *)); }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_ftb_libdir" >&5
-+$as_echo "$cr_cv_ftb_libdir" >&6; }
-+  if test x"$cr_cv_ftb_libdir" = xno; then
-+    cr_have_ftb=no
-+  elif test x"$cr_cv_ftb_libdir" != "xdefault"; then
-+    CR_FTB_LDFLAGS="-L$cr_cv_ftb_libdir"
-+    CR_FTB_LDADD="-lftb"
-+  fi
-+  LIBS="$SAVE_LIBS"
-+  LDFLAGS="$SAVE_LDFLAGS"
-+  CPPFLAGS="$SAVE_CPPFLAGS"
-+  if test x"$cr_have_ftb$cr_force_ftb" = xnoyes; then
-+    as_fn_error $? "Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" "$LINENO" 5
-+  fi
-+
-+
-+
-+ fi
-+
-+  if test x$cr_have_ftb = xyes; then
-+    $as_echo "#define HAVE_FTB 1" >>confdefs.h
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--  FILE *f = fopen ("conftest.val", "w");
--  if (! f)
--    exit (1);
--  if (((long) (sizeof (void *))) < 0)
--    {
--      long i = longval ();
--      if (i != ((long) (sizeof (void *))))
--	exit (1);
--      fprintf (f, "%ld\n", i);
--    }
-   else
--    {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (void *))))
--	exit (1);
--      fprintf (f, "%lu\n", i);
--    }
--  exit (ferror (f) || fclose (f) != 0);
-+    $as_echo "#define HAVE_FTB 0" >>confdefs.h
  
--  ;
--  return 0;
--}
+ fi
+@@ -30182,22 +22680,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FOR_EACH_TASK_PID 1
 -_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_sizeof_void_p=`cat conftest.val`
-+  fi
-+
-+
-+
-+fi # cr_build_libcr
-+
-+# Probe libc for the RT signal number to use
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_SIGNUM" >&5
-+$as_echo_n "checking for value of CR_SIGNUM... " >&6; }
-+if test "${cr_cv_check_cr_signum+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++    $as_echo "#define HAVE_FOR_EACH_TASK_PID 1" >>confdefs.h
  
--( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (void *), 77
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    cr_cv_check_cr_signum="failed"
-+    SAVE_LIBS="$LIBS"
-+    LIBS="-ldl -lpthread $LIBS"
-+    if test "$cross_compiling" = yes; then :
-+
-+  if test "${cross_signum-unset}" = unset; then
-+    as_fn_error $? "When cross-compiling, variable cross_signum must be set." "$LINENO" 5
-+  fi
-+
-+	 cr_cv_check_cr_signum=$cross_signum
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdio.h>
-+	#include <dlfcn.h>
-+
-+	extern int __libc_allocate_rtsig(int);
-+	int main()
-+	{
-+	  int s = -1;
-+	  FILE *f=fopen("conftestval", "w");
-+	  void *dlhandle = dlopen(NULL, RTLD_LAZY);
-+	  if (dlhandle) {
-+	    int *tmp = (int *)dlsym(dlhandle, "cri_signum");
-+	    dlclose(dlhandle);
-+	    if (tmp) s = *tmp;
-+	  }
-+	  if (s <= 0) {
-+	    s=__libc_allocate_rtsig(0);
-+	  }
-+	  if (!f || s<=0) return(1);
-+	  fprintf(f, "%d\n", s);
-+	  return(0);
-+	}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  cr_cv_check_cr_signum=`cat conftestval`
-+else
-+  as_fn_error $? "Failed to probe CR_SIGNUM" "$LINENO" 5
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-+
-+    LIBS="$SAVE_LIBS"
-+
- fi
--rm -f conftest.val
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_check_cr_signum" >&5
-+$as_echo "$cr_cv_check_cr_signum" >&6; }
-+  CR_SIGNUM=$cr_cv_check_cr_signum
-+
-+
-+
-+# Check for 32- or 64-bit architecture
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
-+$as_echo_n "checking size of void *... " >&6; }
-+if test "${ac_cv_sizeof_void_p+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  ac_cv_sizeof_void_p=0
-+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
-+
-+else
-+  if test "$ac_cv_type_void_p" = yes; then
-+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error 77 "cannot compute sizeof (void *)
-+See \`config.log' for more details" "$LINENO" 5 ; }
-+   else
-+     ac_cv_sizeof_void_p=0
-+   fi
- fi
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
--echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
-+$as_echo "$ac_cv_sizeof_void_p" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
- _ACEOF
-@@ -26025,11 +18209,9 @@
- CR_LIBARCH=$CR_ARCH
- if test $ac_cv_sizeof_void_p != $cr_wordsize; then
-   if test $cr_wordsize = 8; then
--    CR_LIBARCH=$CR_ARCH32
-+    CR_LIBARCH=${CR_LIBARCH32:-$CR_ARCH32}
+      HAVE_FOR_EACH_TASK_PID=1
    else
--    { { echo "$as_me:$LINENO: error: CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" >&5
--echo "$as_me: error: CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" "$LINENO" 5
-   fi
- fi
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FOR_EACH_TASK_PID 0
+-_ACEOF
++    $as_echo "#define HAVE_FOR_EACH_TASK_PID 0" >>confdefs.h
  
-@@ -26041,25 +18223,15 @@
- cr_build_libcr32=no
- if test x"$enable_multilib" = xyes; then
-   if test x"$cr_build_libcr" != xyes; then
--    { { echo "$as_me:$LINENO: error: --enable-multilib requested but not building libcr" >&5
--echo "$as_me: error: --enable-multilib requested but not building libcr" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "--enable-multilib requested but not building libcr" "$LINENO" 5
-   elif test -f "${TOP_BUILDDIR}/configure.ac"; then # More robust than TOP_BUILDDIR == TOP_SRCDIR
--    { { echo "$as_me:$LINENO: error: When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" >&5
--echo "$as_me: error: When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" "$LINENO" 5
-   elif test -z "$CR_ARCH32"; then
--    { { echo "$as_me:$LINENO: error: --enable-multilib not supported on architecture $CR_ARCH" >&5
--echo "$as_me: error: --enable-multilib not supported on architecture $CR_ARCH" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "--enable-multilib not supported on architecture $CR_ARCH" "$LINENO" 5
-   elif test $ac_cv_sizeof_void_p = 4; then
--    { { echo "$as_me:$LINENO: error: --enable-multilib requested but CC='$CC' generates 32-bit objects.  Perhaps try configuring with CC='$CC -m64' or similar." >&5
--echo "$as_me: error: --enable-multilib requested but CC='$CC' generates 32-bit objects.  Perhaps try configuring with CC='$CC -m64' or similar." >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "--enable-multilib requested but CC='$CC' generates 32-bit objects.  Perhaps try configuring with CC='$CC -m64' or similar." "$LINENO" 5
-   elif test \! -d /lib64; then
--    { { echo "$as_me:$LINENO: error: --enable-multilib requested but /lib64 does not exist" >&5
--echo "$as_me: error: --enable-multilib requested but /lib64 does not exist" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "--enable-multilib requested but /lib64 does not exist" "$LINENO" 5
-   fi
-   if test -z "$libdir32"; then
-     if expr "$libdir" : '.*/lib64$' >/dev/null; then
-@@ -26068,9 +18240,7 @@
-       libdir32='${exec_prefix}/lib'
-       libdir='${exec_prefix}/lib64'
-     else
--      { { echo "$as_me:$LINENO: error: --enable-multilib requested but libdir='$libdir' does not end in 'lib64'" >&5
--echo "$as_me: error: --enable-multilib requested but libdir='$libdir' does not end in 'lib64'" >&2;}
--   { (exit 1); exit 1; }; };
-+      as_fn_error $? "--enable-multilib requested but libdir='$libdir' does not end in 'lib64'" "$LINENO" 5 ;
-     fi
-   fi
-   SUBCMD="${TOP_SRCDIR}/configure '--srcdir=${TOP_SRCDIR}' '--build=${CR_ARCH32}-linux' '--libdir=${libdir32}' --with-components=libcr,tests,examples"
-@@ -26133,25 +18303,21 @@
-     SUBCMD="$SUBCMD 'RANLIB=$RANLIB32'"
-   fi
-   # Others?
--  { echo "$as_me:$LINENO: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&5
--echo "$as_me: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&6;}
--  { echo "$as_me:$LINENO: ${SUBCMD}" >&5
--echo "$as_me: ${SUBCMD}" >&6;}
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&5
-+$as_echo "$as_me: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&6;}
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: ${SUBCMD}" >&5
-+$as_echo "$as_me: ${SUBCMD}" >&6;}
-   ( mkdir -p libcr32 && cd libcr32 && ln -sf ../util util && eval "${SUBCMD}" )
-   if test "$?" = 0; then
--    { echo "$as_me:$LINENO: <<<< END sub-configure for 32-bit libs <<<<" >&5
--echo "$as_me: <<<< END sub-configure for 32-bit libs <<<<" >&6;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: <<<< END sub-configure for 32-bit libs <<<<" >&5
-+$as_echo "$as_me: <<<< END sub-configure for 32-bit libs <<<<" >&6;}
-     cr_build_libcr32=yes
-   else
-     rm -rf libcr32
--    { { echo "$as_me:$LINENO: error: --enable-multilib requested but FAILED sub-configure for 32-bit libs" >&5
--echo "$as_me: error: --enable-multilib requested but FAILED sub-configure for 32-bit libs" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "--enable-multilib requested but FAILED sub-configure for 32-bit libs" "$LINENO" 5
+      HAVE_FOR_EACH_TASK_PID=''
    fi
- fi
--
--
--if test x$cr_build_libcr32 = xyes; then
-+ if test x$cr_build_libcr32 = xyes; then
-   CR_BUILD_LIBCR32_TRUE=
-   CR_BUILD_LIBCR32_FALSE='#'
- else
-@@ -26167,64 +18333,205 @@
- if test x"$cr_build_modules" = xyes; then
  
- # Compiler to build kernel modules
--echo "$as_me:$LINENO: checking compiler to build kernel modules" >&5
--echo $ECHO_N "checking compiler to build kernel modules... $ECHO_C" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler to build kernel modules" >&5
-+$as_echo_n "checking compiler to build kernel modules... " >&6; }
- if test -n "${KCC}"; then
--  echo "$as_me:$LINENO: result: $KCC (user setting)" >&5
--echo "${ECHO_T}$KCC (user setting)" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KCC (user setting)" >&5
-+$as_echo "$KCC (user setting)" >&6; }
- else
-   KCC=$CC
--  echo "$as_me:$LINENO: result: $KCC (default)" >&5
--echo "${ECHO_T}$KCC (default)" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KCC (default)" >&5
-+$as_echo "$KCC (default)" >&6; }
- fi
  
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
- # Find BSD-compatible NM command
--echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
--echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
--if test "${lt_cv_path_NM+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-+if test "${lt_cv_path_NM+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$NM"; then
-   # Let the user override the test.
-   lt_cv_path_NM="$NM"
- else
--  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
--    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
--      # Check to see if the nm accepts a BSD-compat flag.
--      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
--      #   nm: unknown option "B" ignored
--      # Tru64's nm complains that /dev/null is an invalid object file
--      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
--      */dev/null* | *'Invalid file or object type'*)
--	lt_cv_path_NM="$tmp_nm -B"
--	break
--        ;;
--      *)
--	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
--	*/dev/null*)
--	  lt_cv_path_NM="$tmp_nm -p"
-+  lt_nm_to_check="${ac_tool_prefix}nm"
-+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+    lt_nm_to_check="$lt_nm_to_check nm"
-+  fi
-+  for lt_tmp_nm in $lt_nm_to_check; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+      IFS="$lt_save_ifs"
-+      test -z "$ac_dir" && ac_dir=.
-+      tmp_nm="$ac_dir/$lt_tmp_nm"
-+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+	#   nm: unknown option "B" ignored
-+	# Tru64's nm complains that /dev/null is an invalid object file
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
-+	  lt_cv_path_NM="$tmp_nm -B"
- 	  break
- 	  ;;
- 	*)
--	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
--	  continue # so that we can try to find one that supports BSD flags
-+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+	  */dev/null*)
-+	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
-+	    ;;
-+	  *)
-+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	    continue # so that we can try to find one that supports BSD flags
-+	    ;;
-+	  esac
- 	  ;;
- 	esac
--      esac
--    fi
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
-   done
--  IFS="$lt_save_ifs"
--  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+  : ${lt_cv_path_NM=no}
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-+$as_echo "$lt_cv_path_NM" >&6; }
-+if test "$lt_cv_path_NM" != "no"; then
-+  NM="$lt_cv_path_NM"
-+else
-+  # Didn't find any BSD compatible name lister, look for dumpbin.
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$DUMPBIN"; then
-+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DUMPBIN=$ac_cv_prog_DUMPBIN
-+if test -n "$DUMPBIN"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-+$as_echo "$DUMPBIN" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$DUMPBIN" && break
-+  done
-+fi
-+if test -z "$DUMPBIN"; then
-+  ac_ct_DUMPBIN=$DUMPBIN
-+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_DUMPBIN"; then
-+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+ 
+ fi
+@@ -30222,39 +22716,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-+if test -n "$ac_ct_DUMPBIN"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-+$as_echo "$ac_ct_DUMPBIN" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
 +
-+  test -n "$ac_ct_DUMPBIN" && break
-+done
-+
-+  if test "x$ac_ct_DUMPBIN" = x; then
-+    DUMPBIN=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    DUMPBIN=$ac_ct_DUMPBIN
-+  fi
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
  fi
-+
-+
-+  if test "$DUMPBIN" != ":"; then
-+    NM="$DUMPBIN"
-+  fi
-+fi
-+test -z "$NM" && NM=nm
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-+if test "${lt_cv_nm_interface+set}" = set; then :
+ rm -f confcache
+@@ -30268,21 +22793,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to find a task iterator" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to find a task iterator" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to find a task iterator" "$LINENO" 5
+ 
+ fi
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.0 task ids" >&5
++$as_echo_n "checking kernel for 2.6.0 task ids... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2.6.0 task ids" >&5
+-echo $ECHO_N "checking kernel for 2.6.0 task ids... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_2_6_0_TASK_IDS+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_2_6_0_TASK_IDS+:} false; then :
 +  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_nm_interface="BSD nm"
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  (eval echo "\"\$as_me:18520: $ac_compile\"" >&5)
-+  (eval "$ac_compile" 2>conftest.err)
-+  cat conftest.err >&5
-+  (eval echo "\"\$as_me:18523: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+  cat conftest.err >&5
-+  (eval echo "\"\$as_me:18526: output\"" >&5)
-+  cat conftest.out >&5
-+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+    lt_cv_nm_interface="MS dumpbin"
-+  fi
-+  rm -f conftest*
+ else
+ 
+ 
+@@ -30293,11 +22815,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -30315,42 +22833,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_2_6_0_TASK_IDS=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_2_6_0_TASK_IDS=no
  fi
--echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6
--NM="$lt_cv_path_NM"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-+$as_echo "$lt_cv_nm_interface" >&6; }
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
- NM=$NM
  
-@@ -26235,26 +18542,22 @@
-   *)
-   cr_kernel_type=`echo "$with_kernel_type" | tr 'a-z' 'A-Z'`
-   cr_header="/boot/kernel.h"
--  echo "$as_me:$LINENO: checking for $cr_header" >&5
--echo $ECHO_N "checking for $cr_header... $ECHO_C" >&6;
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $cr_header" >&5
-+$as_echo_n "checking for $cr_header... " >&6; };
-   cr_result=ok
-   if test \! -e "$cr_header"; then
-     cr_result='missing'
-   elif test \! -r "$cr_header"; then
-     cr_result='not readable'
+ fi
+@@ -30358,33 +22852,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_0_TASK_IDS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_0_TASK_IDS 1
+-_ACEOF
++    $as_echo "#define HAVE_2_6_0_TASK_IDS 1" >>confdefs.h
+ 
+      HAVE_2_6_0_TASK_IDS=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_0_TASK_IDS 0
+-_ACEOF
++    $as_echo "#define HAVE_2_6_0_TASK_IDS 0" >>confdefs.h
+ 
+      HAVE_2_6_0_TASK_IDS=''
    fi
+ 
+ 
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-   if test "$cr_result" != "ok"; then
--    { { echo "$as_me:$LINENO: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." >&5
--echo "$as_me: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." "$LINENO" 5
-   fi
-   cr_kernel_var="__BOOT_KERNEL_$cr_kernel_type"
-   if test -z "`grep \"$cr_kernel_var\" $cr_header 2>/dev/null`"; then
--    { { echo "$as_me:$LINENO: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." >&5
--echo "$as_me: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." "$LINENO" 5
-   fi
-   # The following sed command transforms all the #ifndef lines from kernel.h into
-   # corresponding preprocessor flags (on one line) which select the desired kernel type.
-@@ -26276,9 +18579,7 @@
  
-     if test "${LINUX_OBJ_ARG+set}${cr_cv_var_LINUX_OBJ_ARG+set}" = setset; then
-     if test "$LINUX_OBJ_ARG" != "$cr_cv_var_LINUX_OBJ_ARG"; then
--      { { echo "$as_me:$LINENO: error: Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG).  Remove '$cache_file' before re-running configure." >&5
--echo "$as_me: error: Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG).  Remove '$cache_file' before re-running configure." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG).  Remove '$cache_file' before re-running configure." "$LINENO" 5
-     fi
-   elif test "${cr_cv_var_LINUX_OBJ_ARG+set}" = set; then
-     LINUX_OBJ_ARG="$cr_cv_var_LINUX_OBJ_ARG"
-@@ -26287,11 +18588,11 @@
-   if expr X"$LINUX_OBJ_ARG" : X/ >/dev/null; then
-     # User provided a path
  
--  echo "$as_me:$LINENO: checking for Linux kernel build in ${LINUX_OBJ_ARG}" >&5
--echo $ECHO_N "checking for Linux kernel build in ${LINUX_OBJ_ARG}... $ECHO_C" >&6
--  cr_cvname=cr_cv_kernel_obj_`echo "${LINUX_OBJ_ARG}" | $as_tr_sh`
--  if eval "test \"\${${cr_cvname}+set}\" = set"; then
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2.6.6 task ids" >&5
+-echo $ECHO_N "checking kernel for 2.6.6 task ids... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.6 task ids" >&5
++$as_echo_n "checking kernel for 2.6.6 task ids... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_2_6_6_TASK_IDS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel build in ${LINUX_OBJ_ARG}" >&5
-+$as_echo_n "checking for Linux kernel build in ${LINUX_OBJ_ARG}... " >&6; }
-+  cr_cvname=cr_cv_kernel_obj_`$as_echo "${LINUX_OBJ_ARG}" | $as_tr_sh`
-+  if eval "test \"\${${cr_cvname}+set}\"" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_6_6_TASK_IDS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     if test -d "${LINUX_OBJ_ARG}"; then
-@@ -26303,8 +18604,8 @@
-     my ($srcdir, $cpp_cmd) = @ARGV;
-     my $stamp = time;
-     $cpp_cmd =~ s/([#()])/\\${LINUX_OBJ_ARG}/g; # quote problematic shell metachars
--    FILE: foreach my $file qw/version.h utsrelease.h/ {
--      my $path = "$srcdir/include/linux/$file";
-+    FILE: foreach my $file qw(linux/version.h linux/utsrelease.h generated/utsrelease.h) {
-+      my $path = "$srcdir/include/$file";
-       next FILE unless (-f $path);
-       open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
-       LINE: while (<F>) {
-@@ -26340,11 +18641,11 @@
-   eval "cr_result=\$$cr_cvname"
-   unset cr_cvname
-   if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
--    echo "$as_me:$LINENO: result: found version $cr_result" >&5
--echo "${ECHO_T}found version $cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $cr_result" >&5
-+$as_echo "found version $cr_result" >&6; }
+ 
+@@ -30395,11 +22884,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -30417,42 +22902,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_2_6_6_TASK_IDS=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_2_6_6_TASK_IDS=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -30460,33 +22921,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_6_TASK_IDS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_6_TASK_IDS 1
+-_ACEOF
++    $as_echo "#define HAVE_2_6_6_TASK_IDS 1" >>confdefs.h
+ 
+      HAVE_2_6_6_TASK_IDS=1
    else
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_6_TASK_IDS 0
+-_ACEOF
++    $as_echo "#define HAVE_2_6_6_TASK_IDS 0" >>confdefs.h
+ 
+      HAVE_2_6_6_TASK_IDS=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-   fi
-   # Check that version appears acceptible
  
-@@ -26357,9 +18658,7 @@
  
  
-   if test -z "$cr_linux_obj_ver"; then
--    { { echo "$as_me:$LINENO: error: Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" >&5
--echo "$as_me: error: Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" "$LINENO" 5
-   else
-     :
-   fi
-@@ -26371,9 +18670,7 @@
-     elif expr "$LINUX_OBJ_ARG" : '2\.[46]\.' >/dev/null; then
-       cr_tmp_ver="$LINUX_OBJ_ARG"
-     else
--      { { echo "$as_me:$LINENO: error: --with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" >&5
--echo "$as_me: error: --with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "--with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" "$LINENO" 5
-     fi
-     cr_ver_patt="`echo $cr_tmp_ver | sed -e 's/\./\\\\./g;'`\$"
-     # Search standard locations
-@@ -26384,11 +18681,11 @@
- 	     		/usr/src/kernels/${cr_tmp_ver} \
- 			; do
  
--  echo "$as_me:$LINENO: checking for Linux kernel build in ${cr_linux_dir}" >&5
--echo $ECHO_N "checking for Linux kernel build in ${cr_linux_dir}... $ECHO_C" >&6
--  cr_cvname=cr_cv_kernel_obj_`echo "${cr_linux_dir}" | $as_tr_sh`
--  if eval "test \"\${${cr_cvname}+set}\" = set"; then
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.20 task ids" >&5
++$as_echo_n "checking kernel for 2.6.20 task ids... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2.6.20 task ids" >&5
+-echo $ECHO_N "checking kernel for 2.6.20 task ids... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_2_6_20_TASK_IDS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel build in ${cr_linux_dir}" >&5
-+$as_echo_n "checking for Linux kernel build in ${cr_linux_dir}... " >&6; }
-+  cr_cvname=cr_cv_kernel_obj_`$as_echo "${cr_linux_dir}" | $as_tr_sh`
-+  if eval "test \"\${${cr_cvname}+set}\"" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_6_20_TASK_IDS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     if test -d "${cr_linux_dir}"; then
-@@ -26400,8 +18697,8 @@
-     my ($srcdir, $cpp_cmd) = @ARGV;
-     my $stamp = time;
-     $cpp_cmd =~ s/([#()])/\\${cr_linux_dir}/g; # quote problematic shell metachars
--    FILE: foreach my $file qw/version.h utsrelease.h/ {
--      my $path = "$srcdir/include/linux/$file";
-+    FILE: foreach my $file qw(linux/version.h linux/utsrelease.h generated/utsrelease.h) {
-+      my $path = "$srcdir/include/$file";
-       next FILE unless (-f $path);
-       open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
-       LINE: while (<F>) {
-@@ -26437,11 +18734,11 @@
-   eval "cr_result=\$$cr_cvname"
-   unset cr_cvname
-   if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
--    echo "$as_me:$LINENO: result: found version $cr_result" >&5
--echo "${ECHO_T}found version $cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $cr_result" >&5
-+$as_echo "found version $cr_result" >&6; }
+ 
+@@ -30497,11 +22953,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -30522,42 +22974,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_2_6_20_TASK_IDS=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_2_6_20_TASK_IDS=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -30565,33 +22993,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_20_TASK_IDS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_20_TASK_IDS 1
+-_ACEOF
++    $as_echo "#define HAVE_2_6_20_TASK_IDS 1" >>confdefs.h
+ 
+      HAVE_2_6_20_TASK_IDS=1
    else
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_20_TASK_IDS 0
+-_ACEOF
++    $as_echo "#define HAVE_2_6_20_TASK_IDS 0" >>confdefs.h
+ 
+      HAVE_2_6_20_TASK_IDS=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-   fi
-   # Check that version appears acceptible
  
-@@ -26459,9 +18756,7 @@
-     done
  
-   if test -z "$cr_linux_obj_ver"; then
--    { { echo "$as_me:$LINENO: error: Could not find a directory containing a Linux kernel ${cr_tmp_ver} build.  Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" >&5
--echo "$as_me: error: Could not find a directory containing a Linux kernel ${cr_tmp_ver} build.  Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "Could not find a directory containing a Linux kernel ${cr_tmp_ver} build.  Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" "$LINENO" 5
-   else
-     :
-   fi
-@@ -26476,9 +18771,7 @@
  
-     if test "${LINUX_SRC_ARG+set}${cr_cv_var_LINUX_SRC_ARG+set}" = setset; then
-     if test "$LINUX_SRC_ARG" != "$cr_cv_var_LINUX_SRC_ARG"; then
--      { { echo "$as_me:$LINENO: error: Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG).  Remove '$cache_file' before re-running configure." >&5
--echo "$as_me: error: Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG).  Remove '$cache_file' before re-running configure." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG).  Remove '$cache_file' before re-running configure." "$LINENO" 5
-     fi
-   elif test "${cr_cv_var_LINUX_SRC_ARG+set}" = set; then
-     LINUX_SRC_ARG="$cr_cv_var_LINUX_SRC_ARG"
-@@ -26487,9 +18780,7 @@
-   if expr X"$LINUX_SRC_ARG" : X/ >/dev/null; then
-     cr_list="$LINUX_SRC_ARG"
-   elif test -n "$LINUX_SRC_ARG"; then
--    { { echo "$as_me:$LINENO: error: --with-linux-src argument '$LINUX_SRC_ARG' is not a full path" >&5
--echo "$as_me: error: --with-linux-src argument '$LINUX_SRC_ARG' is not a full path" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "--with-linux-src argument '$LINUX_SRC_ARG' is not a full path" "$LINENO" 5
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2.6.24 task ids" >&5
+-echo $ECHO_N "checking kernel for 2.6.24 task ids... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.24 task ids" >&5
++$as_echo_n "checking kernel for 2.6.24 task ids... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_2_6_24_TASK_IDS+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_2_6_24_TASK_IDS+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -30602,11 +23025,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -30627,42 +23046,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_2_6_24_TASK_IDS=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_2_6_24_TASK_IDS=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -30670,22 +23065,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_24_TASK_IDS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_24_TASK_IDS 1
+-_ACEOF
++    $as_echo "#define HAVE_2_6_24_TASK_IDS 1" >>confdefs.h
+ 
+      HAVE_2_6_24_TASK_IDS=1
    else
-     # Search standard locations
-     cr_list="${LINUX_OBJ} \
-@@ -26499,11 +18790,11 @@
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_24_TASK_IDS 0
+-_ACEOF
++    $as_echo "#define HAVE_2_6_24_TASK_IDS 0" >>confdefs.h
+ 
+      HAVE_2_6_24_TASK_IDS=''
    fi
-   for cr_linux_dir in $cr_list; do
  
--  echo "$as_me:$LINENO: checking for Linux kernel source in $cr_linux_dir" >&5
--echo $ECHO_N "checking for Linux kernel source in $cr_linux_dir... $ECHO_C" >&6
--  cr_cvname=cr_cv_kernel_src_`echo "$cr_linux_dir" | $as_tr_sh`
--  if eval "test \"\${${cr_cvname}+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel source in $cr_linux_dir" >&5
-+$as_echo_n "checking for Linux kernel source in $cr_linux_dir... " >&6; }
-+  cr_cvname=cr_cv_kernel_src_`$as_echo "$cr_linux_dir" | $as_tr_sh`
-+  if eval "test \"\${${cr_cvname}+set}\"" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
  
-     cr_tmp=''
-@@ -26538,8 +18829,8 @@
-     my ($srcdir, $cpp_cmd) = @ARGV;
-     my $stamp = time;
-     $cpp_cmd =~ s/([#()])/\\$cr_linux_dir/g; # quote problematic shell metachars
--    FILE: foreach my $file qw/version.h utsrelease.h/ {
--      my $path = "$srcdir/include/linux/$file";
-+    FILE: foreach my $file qw(linux/version.h linux/utsrelease.h generated/utsrelease.h) {
-+      my $path = "$srcdir/include/$file";
-       next FILE unless (-f $path);
-       open(F, "echo '=${stamp}->UTS_RELEASE<-' | ${cpp_cmd} -include ${path} - |") || exit 1;
-       LINE: while (<F>) {
-@@ -26578,15 +18869,15 @@
-   eval "cr_result=\$$cr_cvname"
-   unset cr_cvname
-   if expr "$cr_result" : '2\.[46]\.' >/dev/null; then
--    echo "$as_me:$LINENO: result: found version $cr_result" >&5
--echo "${ECHO_T}found version $cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $cr_result" >&5
-+$as_echo "found version $cr_result" >&6; }
-   else
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-   fi
-   # Check that version is acceptible (exact match, or a prefix with the next char non-numeric)
-   case "$cr_linux_obj_ver" in
--    ${cr_result}|${cr_result}[^0-9]*)      # the outer [] is m4 quoting
-+    ${cr_result}|${cr_result}[!0-9]*)      # the outer [] is m4 quoting
-         cr_linux_src_ver="$cr_result";;
-     *)  cr_linux_src_ver='';;
-   esac
-@@ -26598,9 +18889,7 @@
-   done
- 
-   if test -z "$cr_linux_src_ver"; then
--    { { echo "$as_me:$LINENO: error: Could not locate source directory corresponding to build directory '${LINUX_OBJ}'.  Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" >&5
--echo "$as_me: error: Could not locate source directory corresponding to build directory '${LINUX_OBJ}'.  Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "Could not locate source directory corresponding to build directory '${LINUX_OBJ}'.  Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" "$LINENO" 5
-   else
-     :
-   fi
-@@ -26628,8 +18917,8 @@
-    : # OK - either not caching or cached version still matches
-  else
-    if test -f .cached_kconfig; then
--     { echo "$as_me:$LINENO: WARNING: kernel configuration has changed... discarding cached results." >&5
--echo "$as_me: WARNING: kernel configuration has changed... discarding cached results." >&2;}
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: kernel configuration has changed... discarding cached results." >&5
-+$as_echo "$as_me: WARNING: kernel configuration has changed... discarding cached results." >&2;}
-      rm -f .cached_kconfig
-    fi
-    for cr_var in cr_cv_kconfig__NON_EMPTY_HACK `(set) | grep "^cr_cv_kconfig_" | cut -d= -f1`; do
-@@ -26644,7 +18933,7 @@
-   fi
  
  
--if test -z "${HAVE_LINUX_2_6}"; then
-+if test -z "${HAVE_LINUX_2_6}"; then :
-   cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -26663,52 +18952,69 @@
+ # Should allow only exactly one match, except that 2.6.6 and 2.6.20/24 overlap during transitional period
+@@ -30711,39 +23102,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -71617,14 +77294,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -71632,390 +77321,237 @@
    fi
  fi
  rm -f confcache
--   { { echo "$as_me:$LINENO: error: required Linux 2.6.x kernel headers and/or build not found." >&5
--echo "$as_me: error: required Linux 2.6.x kernel headers and/or build not found." >&2;}
+@@ -30757,21 +23179,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "required Linux 2.6.x kernel headers and/or build not found." "$LINENO" 5
- fi
++   as_fn_error $? "Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" "$LINENO" 5
  
--
- # Module install dir
+ 	;;
+ esac
  
--echo "$as_me:$LINENO: checking directory to install kernel modules" >&5
--echo $ECHO_N "checking directory to install kernel modules... $ECHO_C" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking directory to install kernel modules" >&5
-+$as_echo_n "checking directory to install kernel modules... " >&6; }
- if test -n "${CR_MODULE_DIR}"; then
-   cr_why='passed via --with-kmod-dir'
- elif test ${sysconfdir} = /etc; then
-@@ -26718,16 +19024,16 @@
-   CR_MODULE_DIR="${libdir}/${PACKAGE}/${LINUX_VER}"
-   cr_why='default'
- fi
--echo "$as_me:$LINENO: result: ${CR_MODULE_DIR} ($cr_why)" >&5
--echo "${ECHO_T}${CR_MODULE_DIR} ($cr_why)" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CR_MODULE_DIR} ($cr_why)" >&5
-+$as_echo "${CR_MODULE_DIR} ($cr_why)" >&6; }
  
- # Configure automake/kbuild glue
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for set_task_pgrp" >&5
++$as_echo_n "checking kernel for set_task_pgrp... " >&6; }
  
--  echo "$as_me:$LINENO: checking for parameters to interface GNU automake with Linux kbuild" >&5
--echo $ECHO_N "checking for parameters to interface GNU automake with Linux kbuild... $ECHO_C" >&6
--if test "${cr_cv_KBUILD_MAKE_ARGS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for set_task_pgrp" >&5
+-echo $ECHO_N "checking kernel for set_task_pgrp... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_SET_TASK_PGRP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for parameters to interface GNU automake with Linux kbuild" >&5
-+$as_echo_n "checking for parameters to interface GNU automake with Linux kbuild... " >&6; }
-+if test "${cr_cv_KBUILD_MAKE_ARGS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_SET_TASK_PGRP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     if grep KBUILD_EXTMOD ${LINUX_SRC}/Makefile >/dev/null 2>/dev/null; then
-@@ -26746,8 +19052,8 @@
-     fi
  
- fi
--echo "$as_me:$LINENO: result: $cr_cv_KBUILD_MAKE_ARGS" >&5
--echo "${ECHO_T}$cr_cv_KBUILD_MAKE_ARGS" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_KBUILD_MAKE_ARGS" >&5
-+$as_echo "$cr_cv_KBUILD_MAKE_ARGS" >&6; }
-   KBUILD_MAKE_ARGS="$cr_cv_KBUILD_MAKE_ARGS"
-     # Note: we'll actually try the result in CR_SET_KCFLAGS
+@@ -30782,11 +23201,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
-@@ -26756,10 +19062,10 @@
+ 		 #include <linux/kernel.h>
+@@ -30810,42 +23225,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_SET_TASK_PGRP=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_SET_TASK_PGRP=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-   case "$CR_ARCH" in
-     ppc64)
--      CR_KSYM_PATTERN_DATA='[bBdDrRtT] '
-+      CR_KSYM_PATTERN_DATA='[bBdDgGrRsStTvV] '
-       CR_KSYM_PATTERN_CODE='[dD] '         ;;
-     *)
--      CR_KSYM_PATTERN_DATA='[bBdDrRtT] '
-+      CR_KSYM_PATTERN_DATA='[bBdDgGrRsStTvV] '
-       CR_KSYM_PATTERN_CODE='[tT] '
-       ;;
-   esac
-@@ -26779,10 +19085,10 @@
  
+ fi
+@@ -30853,33 +23244,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_SET_TASK_PGRP
  
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_TASK_PGRP 1
+-_ACEOF
++    $as_echo "#define HAVE_SET_TASK_PGRP 1" >>confdefs.h
  
--  echo "$as_me:$LINENO: checking for flags to compile Linux kernel probes" >&5
--echo $ECHO_N "checking for flags to compile Linux kernel probes... $ECHO_C" >&6
--if test "${cr_cv_kconfig_kcflags+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flags to compile Linux kernel probes" >&5
-+$as_echo_n "checking for flags to compile Linux kernel probes... " >&6; }
-+if test "${cr_cv_kconfig_kcflags+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+      HAVE_SET_TASK_PGRP=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_TASK_PGRP 0
+-_ACEOF
++    $as_echo "#define HAVE_SET_TASK_PGRP 0" >>confdefs.h
  
-   rm -rf conftestdir
-@@ -26796,31 +19102,29 @@
-   if test $? = 0; then cr_tmp=`grep -m1 conftest\\.c conftestdir/output | sed -e "s:^[ 	]*${KCC}::"`; fi
-   cat conftestdir/output >&5
-   if test "${cr_tmp:+OK}" != OK; then
--      echo "$as_me:$LINENO: result: FAILED" >&5
--echo "${ECHO_T}FAILED" >&6
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED" >&5
-+$as_echo "FAILED" >&6; }
-       cat conftestdir/output
-       if $EGREP 'include/(asm|linux)/[a-zA-Z0-9_-]+\.h:' conftestdir/output >/dev/null 2>&1; then
--        { echo "$as_me:$LINENO: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&5
--echo "$as_me: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&2;}
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&5
-+$as_echo "$as_me: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&2;}
- 	ver=`$KCC --version | head -1`
--        { echo "$as_me:$LINENO: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&5
--echo "$as_me: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&2;}
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&5
-+$as_echo "$as_me: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&2;}
- 	if test $cr_wordsize -gt $ac_cv_sizeof_void_p; then
- 	  echo "$KCC" | grep -e '-m64' >/dev/null 2>/dev/null
- 	  if test $? != 0; then
--            { echo "$as_me:$LINENO: WARNING: You might try setting KCC='$KCC -m64'" >&5
--echo "$as_me: WARNING: You might try setting KCC='$KCC -m64'" >&2;}
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You might try setting KCC='$KCC -m64'" >&5
-+$as_echo "$as_me: WARNING: You might try setting KCC='$KCC -m64'" >&2;}
-           fi
-         fi
-       fi
-       if grep -i 'permission denied' conftestdir/output >/dev/null 2>&1; then
--        { echo "$as_me:$LINENO: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&5
--echo "$as_me: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&2;}
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&5
-+$as_echo "$as_me: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&2;}
-       fi
-       rm -rf conftestdir
--      { { echo "$as_me:$LINENO: error: Failed test run of kernel make/kbuild failed (see above)" >&5
--echo "$as_me: error: Failed test run of kernel make/kbuild failed (see above)" >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Failed test run of kernel make/kbuild failed (see above)" "$LINENO" 5
+      HAVE_SET_TASK_PGRP=''
    fi
-   rm -rf conftestdir
-   cr_cv_kconfig_kcflags=''
-@@ -26856,10 +19160,22 @@
-     cr_cv_kconfig_kcflags="$cr_cv_kconfig_kcflags $arg"
-   done
- fi
--echo "$as_me:$LINENO: result: $cr_cv_kconfig_kcflags" >&5
--echo "${ECHO_T}$cr_cv_kconfig_kcflags" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_kconfig_kcflags" >&5
-+$as_echo "$cr_cv_kconfig_kcflags" >&6; }
-   KCFLAGS="$cr_cv_kconfig_kcflags"
--    # Do these init steps early, in case first CR_FIND_KSYM is a conditional call
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if autoconf.h is included implicitly" >&5
-+$as_echo_n "checking if autoconf.h is included implicitly... " >&6; }
-+  if echo "$KCFLAGS" | grep 'include [^ ]*/autoconf\.h' >/dev/null 2>&1; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; };
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; };
-+    $as_echo "#define CR_NEED_AUTOCONF_H 1" >>confdefs.h
-+
-+
-+  fi
-+  # Do these init steps early, in case first CR_FIND_KSYM is a conditional call
  
  
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
-@@ -26867,17 +19183,15 @@
- # Checks for matching (we hope) symbol table
  
  
--  echo "$as_me:$LINENO: checking for Linux kernel symbol table" >&5
--echo $ECHO_N "checking for Linux kernel symbol table... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel symbol table" >&5
-+$as_echo_n "checking for Linux kernel symbol table... " >&6; }
  
  
+-  echo "$as_me:$LINENO: checking kernel for set_task_session" >&5
+-echo $ECHO_N "checking kernel for set_task_session... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for set_task_session" >&5
++$as_echo_n "checking kernel for set_task_session... " >&6; }
  
+-    if test "${cr_cv_kconfig_HAVE_SET_TASK_SESSION+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_SET_TASK_SESSION+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
-     if test "${LINUX_SYSTEM_MAP+set}${cr_cv_var_LINUX_SYSTEM_MAP+set}" = setset; then
-     if test "$LINUX_SYSTEM_MAP" != "$cr_cv_var_LINUX_SYSTEM_MAP"; then
--      { { echo "$as_me:$LINENO: error: Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP).  Remove '$cache_file' before re-running configure." >&5
--echo "$as_me: error: Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP).  Remove '$cache_file' before re-running configure." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP).  Remove '$cache_file' before re-running configure." "$LINENO" 5
-     fi
-   elif test "${cr_cv_var_LINUX_SYSTEM_MAP+set}" = set; then
-     LINUX_SYSTEM_MAP="$cr_cv_var_LINUX_SYSTEM_MAP"
-@@ -26886,9 +19200,7 @@
  
-     if test "${LINUX_VMLINUX+set}${cr_cv_var_LINUX_VMLINUX+set}" = setset; then
-     if test "$LINUX_VMLINUX" != "$cr_cv_var_LINUX_VMLINUX"; then
--      { { echo "$as_me:$LINENO: error: Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX).  Remove '$cache_file' before re-running configure." >&5
--echo "$as_me: error: Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX).  Remove '$cache_file' before re-running configure." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX).  Remove '$cache_file' before re-running configure." "$LINENO" 5
-     fi
-   elif test "${cr_cv_var_LINUX_VMLINUX+set}" = set; then
-     LINUX_VMLINUX="$cr_cv_var_LINUX_VMLINUX"
-@@ -26898,7 +19210,7 @@
-   # First try validating the user's (or cached) selection
-   if test -n "$LINUX_SYSTEM_MAP" ; then
- 
--  if test -n ""$LINUX_SYSTEM_MAP"" -a -r ""$LINUX_SYSTEM_MAP"" && grep ' [AB] _end' <""$LINUX_SYSTEM_MAP"" >/dev/null 2>/dev/null; then
-+  if test -n ""$LINUX_SYSTEM_MAP"" -a -r ""$LINUX_SYSTEM_MAP"" && grep -e '[TD] sys_open' -e '[AB] _end' <""$LINUX_SYSTEM_MAP"" >/dev/null 2>/dev/null; then
-     if grep -B1 '[AB] _end' <""$LINUX_SYSTEM_MAP"" | grep _stext >/dev/null 2>/dev/null; then
-       # Reject "stripped" files (such as in FC2)
-       # Recognized (poorly) by _stext and _end as last two entries.
-@@ -26912,17 +19224,15 @@
+@@ -30890,11 +23276,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
-     if test -z "$LINUX_SYMTAB_CMD"; then
-       # The user specified a file, but we can't use it.  Abort.
--      echo "$as_me:$LINENO: result: failed" >&5
--echo "${ECHO_T}failed" >&6
--      { { echo "$as_me:$LINENO: error: Failed to validate \"$LINUX_SYSTEM_MAP\"" >&5
--echo "$as_me: error: Failed to validate \"$LINUX_SYSTEM_MAP\"" >&2;}
--   { (exit 1); exit 1; }; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-+$as_echo "failed" >&6; }
-+      as_fn_error $? "Failed to validate \"$LINUX_SYSTEM_MAP\"" "$LINENO" 5
-     fi
-   fi
-   if test -z "$LINUX_SYMTAB_CMD" -a -n "$LINUX_VMLINUX" ; then
+ 		 #include <linux/kernel.h>
+@@ -30918,42 +23300,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_SET_TASK_SESSION=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_SET_TASK_SESSION=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
--  if test -n ""$LINUX_VMLINUX"" -a -r ""$LINUX_VMLINUX"" && ($NM ""$LINUX_VMLINUX"" | grep ' [AB] _end') >/dev/null 2>/dev/null; then
-+  if test -n ""$LINUX_VMLINUX"" -a -r ""$LINUX_VMLINUX"" && ($NM ""$LINUX_VMLINUX"" | grep -e '[TD] sys_open' -e '[AB] _end') >/dev/null 2>/dev/null; then
-     LINUX_VMLINUX=""$LINUX_VMLINUX""
-     LINUX_SYMTAB_FILE=""$LINUX_VMLINUX""
-     LINUX_SYMTAB_CMD="$NM "$LINUX_VMLINUX" 2>/dev/null"
-@@ -26930,11 +19240,9 @@
+ fi
+@@ -30961,34 +23319,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_SET_TASK_SESSION
  
-     if test -z "$LINUX_SYMTAB_CMD"; then
-       # The user specified a file, but we can't use it.  Abort.
--      echo "$as_me:$LINENO: result: failed" >&5
--echo "${ECHO_T}failed" >&6
--      { { echo "$as_me:$LINENO: error: Failed to validate \"$LINUX_VMLINUX\"" >&5
--echo "$as_me: error: Failed to validate \"$LINUX_VMLINUX\"" >&2;}
--   { (exit 1); exit 1; }; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-+$as_echo "failed" >&6; }
-+      as_fn_error $? "Failed to validate \"$LINUX_VMLINUX\"" "$LINENO" 5
-     fi
-   fi
-   # Next try searching for System.map or vmlinux in standard locations
-@@ -26950,7 +19258,7 @@
-       # Try System.map in the given location
-       cr_file=`echo $cr_file_pattern | sed -e 's|@|System.map|'`
- 
--  if test -n "$cr_file" -a -r "$cr_file" && grep ' [AB] _end' <"$cr_file" >/dev/null 2>/dev/null; then
-+  if test -n "$cr_file" -a -r "$cr_file" && grep -e '[TD] sys_open' -e '[AB] _end' <"$cr_file" >/dev/null 2>/dev/null; then
-     if grep -B1 '[AB] _end' <"$cr_file" | grep _stext >/dev/null 2>/dev/null; then
-       # Reject "stripped" files (such as in FC2)
-       # Recognized (poorly) by _stext and _end as last two entries.
-@@ -26969,7 +19277,7 @@
-       cr_file=`echo $cr_file_pattern | sed -e 's|@|vmlinux|'`
- 
- 
--  if test -n "$cr_file" -a -r "$cr_file" && ($NM "$cr_file" | grep ' [AB] _end') >/dev/null 2>/dev/null; then
-+  if test -n "$cr_file" -a -r "$cr_file" && ($NM "$cr_file" | grep -e '[TD] sys_open' -e '[AB] _end') >/dev/null 2>/dev/null; then
-     LINUX_VMLINUX="$cr_file"
-     LINUX_SYMTAB_FILE="$cr_file"
-     LINUX_SYMTAB_CMD="$NM $cr_file 2>/dev/null"
-@@ -26983,8 +19291,8 @@
-   # Announce our result
-   if test -z "$LINUX_SYMTAB_CMD"; then
-     LINUX_SYMTAB_CMD="true"
--    echo "$as_me:$LINENO: result: failed" >&5
--echo "${ECHO_T}failed" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-+$as_echo "failed" >&6; }
-     cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -27003,56 +19311,72 @@
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_TASK_SESSION 1
+-_ACEOF
++    $as_echo "#define HAVE_SET_TASK_SESSION 1" >>confdefs.h
  
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-     if test -n "$cr_stripped_maps"; then
--      { echo "$as_me:$LINENO: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&5
--echo "$as_me: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&2;}
--      { { echo "$as_me:$LINENO: error: Failed to locate kernel symbol table.  Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." >&5
--echo "$as_me: error: Failed to locate kernel symbol table.  Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." >&2;}
--   { (exit 1); exit 1; }; }
--    else
--      { { echo "$as_me:$LINENO: error: Failed to locate kernel symbol table.  Try using --with-system-map or --with-vmlinux." >&5
--echo "$as_me: error: Failed to locate kernel symbol table.  Try using --with-system-map or --with-vmlinux." >&2;}
--   { (exit 1); exit 1; }; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&5
-+$as_echo "$as_me: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&2;}
-+      as_fn_error $? "Failed to locate kernel symbol table.  Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." "$LINENO" 5
-+    else
-+      as_fn_error $? "Failed to locate kernel symbol table.  Try using --with-system-map or --with-vmlinux." "$LINENO" 5
-     fi
+      HAVE_SET_TASK_SESSION=1
    else
--    echo "$as_me:$LINENO: result: $LINUX_SYMTAB_FILE" >&5
--echo "${ECHO_T}$LINUX_SYMTAB_FILE" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_SYMTAB_FILE" >&5
-+$as_echo "$LINUX_SYMTAB_FILE" >&6; }
-     test -n "$LINUX_SYSTEM_MAP" && cr_cv_var_LINUX_SYSTEM_MAP="$LINUX_SYSTEM_MAP"
-     test -n "$LINUX_VMLINUX" && cr_cv_var_LINUX_VMLINUX="$LINUX_VMLINUX"
- 
-@@ -27062,8 +19386,8 @@
-    : # OK - either not caching or cached version still matches
-  else
-    if test -f .cached_ksymtab; then
--     { echo "$as_me:$LINENO: WARNING: kernel symbol table has changed... discarding cached results." >&5
--echo "$as_me: WARNING: kernel symbol table has changed... discarding cached results." >&2;}
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: kernel symbol table has changed... discarding cached results." >&5
-+$as_echo "$as_me: WARNING: kernel symbol table has changed... discarding cached results." >&2;}
-      rm -f .cached_ksymtab
-    fi
-    for cr_var in cr_cv_ksymtab__NON_EMPTY_HACK `(set) | grep "^cr_cv_ksymtab_" | cut -d= -f1`; do
-@@ -27075,11 +19399,11 @@
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_TASK_SESSION 0
+-_ACEOF
++    $as_echo "#define HAVE_SET_TASK_SESSION 0" >>confdefs.h
+ 
+      HAVE_SET_TASK_SESSION=''
    fi
-   # Now check for consistency w/ the kernel source
-   # XXX: Currently just check SMPness. Can this be more aggressive?
--  echo "$as_me:$LINENO: checking for SMP kernel source" >&5
--echo $ECHO_N "checking for SMP kernel source... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMP kernel source" >&5
-+$as_echo_n "checking for SMP kernel source... " >&6; }
  
--    if test "${cr_cv_kconfig_smp_source+set}" = set; then
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for valid_signal" >&5
++$as_echo_n "checking kernel for valid_signal... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for valid_signal" >&5
+-echo $ECHO_N "checking kernel for valid_signal... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_VALID_SIGNAL+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_smp_source+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_VALID_SIGNAL+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -27090,11 +19414,7 @@
+@@ -30999,11 +23352,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -72028,18 +77564,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -27103,7 +19423,9 @@
- 		 #endif
- 		 #include <linux/types.h>
- 
--	#include <linux/autoconf.h>
-+	#ifdef CR_NEED_AUTOCONF_H
-+	  #include <linux/autoconf.h>
-+	#endif
- 	#ifndef CONFIG_SMP
- 	    choke me
- 	#endif
-@@ -27116,42 +19438,18 @@
+@@ -31027,42 +23376,18 @@
    return 0;
  }
  _ACEOF
@@ -72069,7 +77594,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_smp_source=yes
+ 	 cr_cv_kconfig_HAVE_VALID_SIGNAL=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -72078,93 +77603,57 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_smp_source=no
+ 	 cr_cv_kconfig_HAVE_VALID_SIGNAL=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -27165,17 +19463,17 @@
-   fi
+@@ -31070,34 +23395,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_VALID_SIGNAL
  
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_VALID_SIGNAL 1
+-_ACEOF
++    $as_echo "#define HAVE_VALID_SIGNAL 1" >>confdefs.h
  
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6;
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; };
-   cr_kernel_smp=$cr_result
--  echo "$as_me:$LINENO: checking for SMP kernel symbol table" >&5
--echo $ECHO_N "checking for SMP kernel symbol table... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMP kernel symbol table" >&5
-+$as_echo_n "checking for SMP kernel symbol table... " >&6; }
-   cr_symtab_smp=no
-   if test -n "`eval $LINUX_SYMTAB_CMD | grep del_timer_sync 2>/dev/null`"; then
-     cr_symtab_smp=yes
+      HAVE_VALID_SIGNAL=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_VALID_SIGNAL 0
+-_ACEOF
++    $as_echo "#define HAVE_VALID_SIGNAL 0" >>confdefs.h
+ 
+      HAVE_VALID_SIGNAL=''
    fi
--  echo "$as_me:$LINENO: result: $cr_symtab_smp" >&5
--echo "${ECHO_T}$cr_symtab_smp" >&6;
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_symtab_smp" >&5
-+$as_echo "$cr_symtab_smp" >&6; };
-   if test "$cr_kernel_smp" != "$cr_symtab_smp"; then
  
-   echo "======================================================================"
-@@ -27188,27 +19486,42 @@
-   echo "======================================================================"
  
-     if test "$cr_kernel_smp" = yes; then
--      { { echo "$as_me:$LINENO: error: Kernel source is configured SMP but the kernel symbol table is not.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." >&5
--echo "$as_me: error: Kernel source is configured SMP but the kernel symbol table is not.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." >&2;}
--   { (exit 1); exit 1; }; }
--    else
--      { { echo "$as_me:$LINENO: error: Kernel source is configured uni-processor but the kernel symbol table is SMP.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." >&5
--echo "$as_me: error: Kernel source is configured uni-processor but the kernel symbol table is SMP.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Kernel source is configured SMP but the kernel symbol table is not.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." "$LINENO" 5
-+    else
-+      as_fn_error $? "Kernel source is configured uni-processor but the kernel symbol table is SMP.  Consider specifying a symbol table with --with-system-map or --with-vmlinux.  Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." "$LINENO" 5
-     fi
-   fi
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
  
--## Check for optional kernel headers...
-+# Set and substitute CR_KARCH to enable i386 userland on x86_64 kernels
-+CR_KARCH=$CR_ARCH
-+if test $CR_ARCH = i386; then
-+       # probe the System.map to find out if we need to change CR_KARCH at all.
-+       # All this does is count the number of *digits* in a hex formatted address
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: Testing if KARCH is the same as ARCH" >&5
-+$as_echo "$as_me: Testing if KARCH is the same as ARCH" >&6;}
-+       symlen=`$LINUX_SYMTAB_CMD | head -n1 | sed 's/ .*$//;s/\(.\)/\1\n/g;s/\n$//'|wc -l`
-+       if test $symlen -eq 16; then
-+               { $as_echo "$as_me:${as_lineno-$LINENO}: Changing KARCH to x86_64" >&5
-+$as_echo "$as_me: Changing KARCH to x86_64" >&6;}
-+               CR_KARCH=x86_64
-+       else
-+               { $as_echo "$as_me:${as_lineno-$LINENO}: Not touching KARCH" >&5
-+$as_echo "$as_me: Not touching KARCH" >&6;}
-+       fi
-+fi
-+CR_KARCH=$CR_KARCH
-+
  
-+## Check for optional kernel headers...
  
  
  
--  echo "$as_me:$LINENO: checking kernel for linux/syscalls.h" >&5
--echo $ECHO_N "checking kernel for linux/syscalls.h... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/syscalls.h" >&5
-+$as_echo_n "checking kernel for linux/syscalls.h... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for REMOVE_LINKS" >&5
+-echo $ECHO_N "checking kernel for REMOVE_LINKS... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for REMOVE_LINKS" >&5
++$as_echo_n "checking kernel for REMOVE_LINKS... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_REMOVE_LINKS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_REMOVE_LINKS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -27219,11 +19532,7 @@
+@@ -31108,11 +23428,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -72177,7 +77666,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -27243,42 +19552,18 @@
+@@ -31133,42 +23449,18 @@
    return 0;
  }
  _ACEOF
@@ -72207,7 +77696,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H=yes
+ 	 cr_cv_kconfig_HAVE_REMOVE_LINKS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -72216,36 +77705,35 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H=no
+ 	 cr_cv_kconfig_HAVE_REMOVE_LINKS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -27286,33 +19571,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H
+@@ -31176,34 +23468,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_REMOVE_LINKS
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_SYSCALLS_H 1
+-#define HAVE_REMOVE_LINKS 1
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_SYSCALLS_H 1" >>confdefs.h
++    $as_echo "#define HAVE_REMOVE_LINKS 1" >>confdefs.h
  
-      HAVE_LINUX_SYSCALLS_H=1
+      HAVE_REMOVE_LINKS=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_SYSCALLS_H 0
+-#define HAVE_REMOVE_LINKS 0
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_SYSCALLS_H 0" >>confdefs.h
++    $as_echo "#define HAVE_REMOVE_LINKS 0" >>confdefs.h
  
-      HAVE_LINUX_SYSCALLS_H=''
+      HAVE_REMOVE_LINKS=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -72253,19 +77741,21 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel for linux/pspace.h" >&5
--echo $ECHO_N "checking kernel for linux/pspace.h... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/pspace.h" >&5
-+$as_echo_n "checking kernel for linux/pspace.h... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_LINUX_PSPACE_H+set}" = set; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.pids pid_link" >&5
++$as_echo_n "checking kernel for task.pids pid_link... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for task.pids pid_link" >&5
+-echo $ECHO_N "checking kernel for task.pids pid_link... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_LINUX_PSPACE_H+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -27323,11 +19603,7 @@
+@@ -31214,11 +23501,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -72278,7 +77768,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -27347,42 +19623,18 @@
+@@ -31236,42 +23519,18 @@
    return 0;
  }
  _ACEOF
@@ -72308,7 +77798,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_PSPACE_H=yes
+ 	 cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -72317,35 +77807,36 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_PSPACE_H=no
+ 	 cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -27390,33 +19642,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_LINUX_PSPACE_H
+@@ -31279,33 +23538,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_PSPACE_H 1
+-#define HAVE_TASK_PIDS_PID_LINK 1
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_PSPACE_H 1" >>confdefs.h
++    $as_echo "#define HAVE_TASK_PIDS_PID_LINK 1" >>confdefs.h
  
-      HAVE_LINUX_PSPACE_H=1
+      HAVE_TASK_PIDS_PID_LINK=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_PSPACE_H 0
+-#define HAVE_TASK_PIDS_PID_LINK 0
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_PSPACE_H 0" >>confdefs.h
++    $as_echo "#define HAVE_TASK_PIDS_PID_LINK 0" >>confdefs.h
  
-      HAVE_LINUX_PSPACE_H=''
+      HAVE_TASK_PIDS_PID_LINK=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -72353,20 +77844,19 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/pid_namespace.h" >&5
-+$as_echo_n "checking kernel for linux/pid_namespace.h... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for task.pids pid" >&5
+-echo $ECHO_N "checking kernel for task.pids pid... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.pids pid" >&5
++$as_echo_n "checking kernel for task.pids pid... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for linux/pid_namespace.h" >&5
--echo $ECHO_N "checking kernel for linux/pid_namespace.h... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_PIDS_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -27427,11 +19674,7 @@
+@@ -31316,11 +23570,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -72379,7 +77869,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -27451,42 +19694,18 @@
+@@ -31338,42 +23588,18 @@
    return 0;
  }
  _ACEOF
@@ -72409,7 +77899,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H=yes
+ 	 cr_cv_kconfig_HAVE_TASK_PIDS_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -72418,56 +77908,158 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H=no
+ 	 cr_cv_kconfig_HAVE_TASK_PIDS_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -27494,33 +19713,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H
+@@ -31381,22 +23607,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_PIDS_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_PID_NAMESPACE_H 1
+-#define HAVE_TASK_PIDS_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_PID_NAMESPACE_H 1" >>confdefs.h
++    $as_echo "#define HAVE_TASK_PIDS_PID 1" >>confdefs.h
  
-      HAVE_LINUX_PID_NAMESPACE_H=1
+      HAVE_TASK_PIDS_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_PID_NAMESPACE_H 0
+-#define HAVE_TASK_PIDS_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_PID_NAMESPACE_H 0" >>confdefs.h
++    $as_echo "#define HAVE_TASK_PIDS_PID 0" >>confdefs.h
  
-      HAVE_LINUX_PID_NAMESPACE_H=''
+      HAVE_TASK_PIDS_PID=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ # Allow zero or one match
+@@ -31420,39 +23642,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -31466,21 +23719,19 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" "$LINENO" 5
  
+ fi
  
+ # put_task_struct() requires one of these:
  
--  echo "$as_me:$LINENO: checking kernel for linux/lockdep.h" >&5
--echo $ECHO_N "checking kernel for linux/lockdep.h... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/lockdep.h" >&5
-+$as_echo_n "checking kernel for linux/lockdep.h... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for __put_task_struct" >&5
+-echo $ECHO_N "checking kernel symbol table for __put_task_struct... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __put_task_struct" >&5
++$as_echo_n "checking kernel symbol table for __put_task_struct... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab___put_task_struct+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H+set}" = set; then :
++    if ${cr_cv_ksymtab___put_task_struct+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -27531,11 +19745,7 @@
+     cr_cv_ksymtab___put_task_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__put_task_struct$/ {s/ .*//p;q;}"`
+@@ -31496,11 +23747,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -72480,7 +78072,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -27555,42 +19765,18 @@
+@@ -31520,42 +23767,18 @@
    return 0;
  }
  _ACEOF
@@ -72510,7 +78102,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H=yes
+ 	 cr_cv_ksymtab___put_task_struct="Y$cr_cv_ksymtab___put_task_struct"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -72519,56 +78111,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H=no
+ 	 cr_cv_ksymtab___put_task_struct="N$cr_cv_ksymtab___put_task_struct"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -27598,33 +19784,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_LOCKDEP_H 1
--_ACEOF
-+    $as_echo "#define HAVE_LINUX_LOCKDEP_H 1" >>confdefs.h
- 
-      HAVE_LINUX_LOCKDEP_H=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_LOCKDEP_H 0
--_ACEOF
-+    $as_echo "#define HAVE_LINUX_LOCKDEP_H 0" >>confdefs.h
+@@ -31585,17 +23808,17 @@
+ _ACEOF
  
-      HAVE_LINUX_LOCKDEP_H=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/compile.h" >&5
-+$as_echo_n "checking kernel for linux/compile.h... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for linux/compile.h" >&5
--echo $ECHO_N "checking kernel for linux/compile.h... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_LINUX_COMPILE_H+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for __put_task_struct_cb" >&5
+-echo $ECHO_N "checking kernel symbol table for __put_task_struct_cb... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __put_task_struct_cb" >&5
++$as_echo_n "checking kernel symbol table for __put_task_struct_cb... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab___put_task_struct_cb+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_LINUX_COMPILE_H+set}" = set; then :
++    if ${cr_cv_ksymtab___put_task_struct_cb+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -27635,11 +19816,7 @@
+     cr_cv_ksymtab___put_task_struct_cb=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__put_task_struct_cb$/ {s/ .*//p;q;}"`
+@@ -31611,11 +23834,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -72581,7 +78155,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -27659,42 +19836,18 @@
+@@ -31635,42 +23854,18 @@
    return 0;
  }
  _ACEOF
@@ -72611,7 +78185,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_COMPILE_H=yes
+ 	 cr_cv_ksymtab___put_task_struct_cb="Y$cr_cv_ksymtab___put_task_struct_cb"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -72620,56 +78194,51 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_COMPILE_H=no
+ 	 cr_cv_ksymtab___put_task_struct_cb="N$cr_cv_ksymtab___put_task_struct_cb"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -27702,33 +19855,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_LINUX_COMPILE_H
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_COMPILE_H 1
--_ACEOF
-+    $as_echo "#define HAVE_LINUX_COMPILE_H 1" >>confdefs.h
- 
-      HAVE_LINUX_COMPILE_H=1
+@@ -31681,9 +23876,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_COMPILE_H 0
--_ACEOF
-+    $as_echo "#define HAVE_LINUX_COMPILE_H 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab___put_task_struct_cb" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol __put_task_struct_cb but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol __put_task_struct_cb but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol __put_task_struct_cb but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab___put_task_struct_cb | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -31699,19 +23892,18 @@
+ _ACEOF
  
-      HAVE_LINUX_COMPILE_H=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
  
  
--  echo "$as_me:$LINENO: checking kernel for linux/fdtable.h" >&5
--echo $ECHO_N "checking kernel for linux/fdtable.h... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/fdtable.h" >&5
-+$as_echo_n "checking kernel for linux/fdtable.h... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.task_size" >&5
++$as_echo_n "checking kernel for mm.task_size... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_LINUX_FDTABLE_H+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for mm.task_size" >&5
+-echo $ECHO_N "checking kernel for mm.task_size... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_MM_TASK_SIZE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_LINUX_FDTABLE_H+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_MM_TASK_SIZE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -27739,11 +19887,7 @@
+@@ -31722,11 +23914,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -72682,7 +78251,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -27763,42 +19907,18 @@
+@@ -31744,42 +23932,18 @@
    return 0;
  }
  _ACEOF
@@ -72712,7 +78281,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_FDTABLE_H=yes
+ 	 cr_cv_kconfig_HAVE_MM_TASK_SIZE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -72721,35 +78290,36 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_FDTABLE_H=no
+ 	 cr_cv_kconfig_HAVE_MM_TASK_SIZE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -27806,33 +19926,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_LINUX_FDTABLE_H
+@@ -31787,34 +23951,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_MM_TASK_SIZE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_FDTABLE_H 1
+-#define HAVE_MM_TASK_SIZE 1
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_FDTABLE_H 1" >>confdefs.h
++    $as_echo "#define HAVE_MM_TASK_SIZE 1" >>confdefs.h
  
-      HAVE_LINUX_FDTABLE_H=1
+      HAVE_MM_TASK_SIZE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_FDTABLE_H 0
+-#define HAVE_MM_TASK_SIZE 0
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_FDTABLE_H 0" >>confdefs.h
++    $as_echo "#define HAVE_MM_TASK_SIZE 0" >>confdefs.h
  
-      HAVE_LINUX_FDTABLE_H=''
+      HAVE_MM_TASK_SIZE=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -72757,20 +78327,20 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/utrace.h" >&5
-+$as_echo_n "checking kernel for linux/utrace.h... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for linux/utrace.h" >&5
--echo $ECHO_N "checking kernel for linux/utrace.h... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_LINUX_UTRACE_H+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for PageAnon" >&5
+-echo $ECHO_N "checking kernel for PageAnon... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for PageAnon" >&5
++$as_echo_n "checking kernel for PageAnon... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_PAGEANON+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_LINUX_UTRACE_H+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PAGEANON+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -27843,11 +19958,7 @@
+@@ -31825,11 +23984,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -72783,7 +78353,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -27867,42 +19978,18 @@
+@@ -31853,42 +24008,18 @@
    return 0;
  }
  _ACEOF
@@ -72813,7 +78383,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_UTRACE_H=yes
+ 	 cr_cv_kconfig_HAVE_PAGEANON=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -72822,139 +78392,71 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_LINUX_UTRACE_H=no
+ 	 cr_cv_kconfig_HAVE_PAGEANON=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -27910,33 +19997,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_LINUX_UTRACE_H
+@@ -31896,22 +24027,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_PAGEANON
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_UTRACE_H 1
+-#define HAVE_PAGEANON 1
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_UTRACE_H 1" >>confdefs.h
++    $as_echo "#define HAVE_PAGEANON 1" >>confdefs.h
  
-      HAVE_LINUX_UTRACE_H=1
+      HAVE_PAGEANON=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_UTRACE_H 0
+-#define HAVE_PAGEANON 0
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_UTRACE_H 0" >>confdefs.h
++    $as_echo "#define HAVE_PAGEANON 0" >>confdefs.h
  
-      HAVE_LINUX_UTRACE_H=''
+      HAVE_PAGEANON=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
+@@ -31919,12 +24046,11 @@
  
  
--  echo "$as_me:$LINENO: checking kernel for asm/elf.h" >&5
--echo $ECHO_N "checking kernel for asm/elf.h... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/perf_event.h" >&5
-+$as_echo_n "checking kernel for linux/perf_event.h... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_ASM_ELF_H+set}" = set; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.vdso_base" >&5
++$as_echo_n "checking kernel for thread.vdso_base... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for thread.vdso_base" >&5
+-echo $ECHO_N "checking kernel for thread.vdso_base... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_THREAD_VDSO_BASE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_VDSO_BASE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
- 
- 
-@@ -27947,11 +20029,78 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+
-+   #include <linux/perf_event.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H=yes
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+fi
-+
-+  cr_result=$cr_cv_kconfig_HAVE_LINUX_PERF_EVENT_H
-+
-+  if test $cr_result = yes; then
-+    $as_echo "#define HAVE_LINUX_PERF_EVENT_H 1" >>confdefs.h
-+
-+     HAVE_LINUX_PERF_EVENT_H=1
-+  else
-+    $as_echo "#define HAVE_LINUX_PERF_EVENT_H 0" >>confdefs.h
-+
-+     HAVE_LINUX_PERF_EVENT_H=''
-+  fi
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/elf.h" >&5
-+$as_echo_n "checking kernel for asm/elf.h... " >&6; }
-+
-+    if test "${cr_cv_kconfig_HAVE_ASM_ELF_H+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
+ 
+ 
+@@ -31935,11 +24061,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -27971,76 +20120,189 @@
+@@ -31957,42 +24079,18 @@
    return 0;
  }
  _ACEOF
@@ -72984,7 +78486,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_ASM_ELF_H=yes
+ 	 cr_cv_kconfig_HAVE_THREAD_VDSO_BASE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -72993,180 +78495,36 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_ASM_ELF_H=no
+ 	 cr_cv_kconfig_HAVE_THREAD_VDSO_BASE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+fi
-+
-+  cr_result=$cr_cv_kconfig_HAVE_ASM_ELF_H
-+
-+  if test $cr_result = yes; then
-+    $as_echo "#define HAVE_ASM_ELF_H 1" >>confdefs.h
-+
-+     HAVE_ASM_ELF_H=1
-+  else
-+    $as_echo "#define HAVE_ASM_ELF_H 0" >>confdefs.h
-+
-+     HAVE_ASM_ELF_H=''
-+  fi
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/desc.h" >&5
-+$as_echo_n "checking kernel for asm/desc.h... " >&6; }
-+
-+    if test "${cr_cv_kconfig_HAVE_ASM_DESC_H+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+   #include <linux/sched.h>
-+   #include <asm/desc.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_kconfig_HAVE_ASM_DESC_H=yes
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_kconfig_HAVE_ASM_DESC_H=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+fi
-+
-+  cr_result=$cr_cv_kconfig_HAVE_ASM_DESC_H
-+
-+  if test $cr_result = yes; then
-+    $as_echo "#define HAVE_ASM_DESC_H 1" >>confdefs.h
-+
-+     HAVE_ASM_DESC_H=1
-+  else
-+    $as_echo "#define HAVE_ASM_DESC_H 0" >>confdefs.h
-+
-+     HAVE_ASM_DESC_H=''
-+  fi
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/vsyscall32.h" >&5
-+$as_echo_n "checking kernel for asm/vsyscall32.h... " >&6; }
-+
-+    if test "${cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+
-+   #include <asm/vsyscall32.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=yes
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
- 
--  cr_result=$cr_cv_kconfig_HAVE_ASM_ELF_H
-+  cr_result=$cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H
+@@ -32000,33 +24098,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_VDSO_BASE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_ASM_ELF_H 1
+-#define HAVE_THREAD_VDSO_BASE 1
 -_ACEOF
-+    $as_echo "#define HAVE_ASM_VSYSCALL32_H 1" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_VDSO_BASE 1" >>confdefs.h
  
--     HAVE_ASM_ELF_H=1
-+     HAVE_ASM_VSYSCALL32_H=1
+      HAVE_THREAD_VDSO_BASE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_ASM_ELF_H 0
+-#define HAVE_THREAD_VDSO_BASE 0
 -_ACEOF
-+    $as_echo "#define HAVE_ASM_VSYSCALL32_H 0" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_VDSO_BASE 0" >>confdefs.h
  
--     HAVE_ASM_ELF_H=''
-+     HAVE_ASM_VSYSCALL32_H=''
+      HAVE_THREAD_VDSO_BASE=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -73174,20 +78532,19 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/i387.h" >&5
-+$as_echo_n "checking kernel for asm/i387.h... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for mm.context.vdso_base" >&5
+-echo $ECHO_N "checking kernel for mm.context.vdso_base... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.context.vdso_base" >&5
++$as_echo_n "checking kernel for mm.context.vdso_base... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for asm/desc.h" >&5
--echo $ECHO_N "checking kernel for asm/desc.h... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_ASM_DESC_H+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_ASM_I387_H+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -28051,11 +20313,7 @@
+@@ -32037,11 +24130,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -73200,18 +78557,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -28064,8 +20322,8 @@
- 		 #endif
- 		 #include <linux/types.h>
- 
--   #include <linux/sched.h>
--   #include <asm/desc.h>
-+
-+   #include <asm/i387.h>
- 
- int
- main ()
-@@ -28075,76 +20333,48 @@
+@@ -32059,42 +24148,18 @@
    return 0;
  }
  _ACEOF
@@ -73241,8 +78587,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_ASM_DESC_H=yes
-+	 cr_cv_kconfig_HAVE_ASM_I387_H=yes
+ 	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -73251,34 +78596,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_ASM_DESC_H=no
-+	 cr_cv_kconfig_HAVE_ASM_I387_H=no
+ 	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
- 
--  cr_result=$cr_cv_kconfig_HAVE_ASM_DESC_H
-+  cr_result=$cr_cv_kconfig_HAVE_ASM_I387_H
+@@ -32102,33 +24167,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_ASM_DESC_H 1
+-#define HAVE_MM_CONTEXT_VDSO_BASE 1
 -_ACEOF
-+    $as_echo "#define HAVE_ASM_I387_H 1" >>confdefs.h
++    $as_echo "#define HAVE_MM_CONTEXT_VDSO_BASE 1" >>confdefs.h
  
--     HAVE_ASM_DESC_H=1
-+     HAVE_ASM_I387_H=1
+      HAVE_MM_CONTEXT_VDSO_BASE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_ASM_DESC_H 0
+-#define HAVE_MM_CONTEXT_VDSO_BASE 0
 -_ACEOF
-+    $as_echo "#define HAVE_ASM_I387_H 0" >>confdefs.h
++    $as_echo "#define HAVE_MM_CONTEXT_VDSO_BASE 0" >>confdefs.h
  
--     HAVE_ASM_DESC_H=''
-+     HAVE_ASM_I387_H=''
+      HAVE_MM_CONTEXT_VDSO_BASE=''
    fi
  
  
@@ -73291,20 +78632,20 @@
  
  
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.context.vdso" >&5
++$as_echo_n "checking kernel for mm.context.vdso... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for asm/vsyscall32.h" >&5
--echo $ECHO_N "checking kernel for asm/vsyscall32.h... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/utsrelease.h" >&5
-+$as_echo_n "checking kernel for linux/utsrelease.h... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for mm.context.vdso" >&5
+-echo $ECHO_N "checking kernel for mm.context.vdso... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -28155,11 +20385,7 @@
+@@ -32139,11 +24199,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -73317,16 +78658,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -28169,7 +20395,7 @@
- 		 #include <linux/types.h>
- 
- 
--   #include <asm/vsyscall32.h>
-+   #include <linux/utsrelease.h>
- 
- int
- main ()
-@@ -28179,76 +20405,47 @@
+@@ -32161,42 +24217,18 @@
    return 0;
  }
  _ACEOF
@@ -73356,8 +78688,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=yes
-+	 cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H=yes
+ 	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -73366,34 +78697,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=no
-+	 cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H=no
+ 	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
- 
--  cr_result=$cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H
-+  cr_result=$cr_cv_kconfig_HAVE_LINUX_UTSRELEASE_H
+@@ -32204,33 +24236,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_ASM_VSYSCALL32_H 1
+-#define HAVE_MM_CONTEXT_VDSO 1
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_UTSRELEASE_H 1" >>confdefs.h
++    $as_echo "#define HAVE_MM_CONTEXT_VDSO 1" >>confdefs.h
  
--     HAVE_ASM_VSYSCALL32_H=1
-+     HAVE_LINUX_UTSRELEASE_H=1
+      HAVE_MM_CONTEXT_VDSO=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_ASM_VSYSCALL32_H 0
+-#define HAVE_MM_CONTEXT_VDSO 0
 -_ACEOF
-+    $as_echo "#define HAVE_LINUX_UTSRELEASE_H 0" >>confdefs.h
++    $as_echo "#define HAVE_MM_CONTEXT_VDSO 0" >>confdefs.h
  
--     HAVE_ASM_VSYSCALL32_H=''
-+     HAVE_LINUX_UTSRELEASE_H=''
+      HAVE_MM_CONTEXT_VDSO=''
    fi
  
  
@@ -73407,19 +78734,19 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel for asm/i387.h" >&5
--echo $ECHO_N "checking kernel for asm/i387.h... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for generated/utsrelease.h" >&5
-+$as_echo_n "checking kernel for generated/utsrelease.h... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for thread_info.sysenter_return" >&5
+-echo $ECHO_N "checking kernel for thread_info.sysenter_return... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread_info.sysenter_return" >&5
++$as_echo_n "checking kernel for thread_info.sysenter_return... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_ASM_I387_H+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -28259,11 +20456,7 @@
+@@ -32241,11 +24268,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -73432,16 +78759,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -28273,7 +20466,7 @@
- 		 #include <linux/types.h>
- 
- 
--   #include <asm/i387.h>
-+   #include <generated/utsrelease.h>
- 
- int
- main ()
-@@ -28283,65 +20476,37 @@
+@@ -32263,42 +24286,18 @@
    return 0;
  }
  _ACEOF
@@ -73471,8 +78789,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_ASM_I387_H=yes
-+	 cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H=yes
+ 	 cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -73481,34 +78798,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_ASM_I387_H=no
-+	 cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H=no
+ 	 cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
- 
--  cr_result=$cr_cv_kconfig_HAVE_ASM_I387_H
-+  cr_result=$cr_cv_kconfig_HAVE_GENERATED_UTSRELEASE_H
+@@ -32306,34 +24305,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_ASM_I387_H 1
+-#define HAVE_THREAD_INFO_SYSENTER_RETURN 1
 -_ACEOF
-+    $as_echo "#define HAVE_GENERATED_UTSRELEASE_H 1" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_INFO_SYSENTER_RETURN 1" >>confdefs.h
  
--     HAVE_ASM_I387_H=1
-+     HAVE_GENERATED_UTSRELEASE_H=1
+      HAVE_THREAD_INFO_SYSENTER_RETURN=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_ASM_I387_H 0
+-#define HAVE_THREAD_INFO_SYSENTER_RETURN 0
 -_ACEOF
-+    $as_echo "#define HAVE_GENERATED_UTSRELEASE_H 0" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_INFO_SYSENTER_RETURN 0" >>confdefs.h
  
--     HAVE_ASM_I387_H=''
-+     HAVE_GENERATED_UTSRELEASE_H=''
+      HAVE_THREAD_INFO_SYSENTER_RETURN=''
    fi
  
  
@@ -73518,25 +78831,24 @@
 +$as_echo "$cr_result" >&6; }
  
  
+ if test $CR_KARCH = arm; then
  
-@@ -28349,12 +20514,12 @@
  
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread_info.tp_value" >&5
++$as_echo_n "checking kernel for thread_info.tp_value... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel symbol table for timeval_to_jiffies" >&5
--echo $ECHO_N "checking kernel symbol table for timeval_to_jiffies... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for timeval_to_jiffies" >&5
-+$as_echo_n "checking kernel symbol table for timeval_to_jiffies... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_timeval_to_jiffies+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for thread_info.tp_value" >&5
+-echo $ECHO_N "checking kernel for thread_info.tp_value... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_timeval_to_jiffies+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_timeval_to_jiffies=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}timeval_to_jiffies$/ {s/ .*//p;q;}"`
-@@ -28370,11 +20535,7 @@
+ 
+@@ -32344,11 +24338,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -73549,7 +78861,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -28394,42 +20555,18 @@
+@@ -32366,42 +24356,18 @@
    return 0;
  }
  _ACEOF
@@ -73579,7 +78891,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_timeval_to_jiffies="Y$cr_cv_ksymtab_timeval_to_jiffies"
+ 	 cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -73588,49 +78900,55 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_timeval_to_jiffies="N$cr_cv_ksymtab_timeval_to_jiffies"
+ 	 cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -28440,9 +20577,7 @@
-     cr_result='not found'
+ fi
+@@ -32409,32 +24375,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_INFO_TP_VALUE 1
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_INFO_TP_VALUE 1" >>confdefs.h
+ 
+      HAVE_THREAD_INFO_TP_VALUE=1
    else
-     if expr "$cr_cv_ksymtab_timeval_to_jiffies" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol timeval_to_jiffies but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol timeval_to_jiffies but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol timeval_to_jiffies but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_timeval_to_jiffies | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -28458,17 +20593,17 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_INFO_TP_VALUE 0
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_INFO_TP_VALUE 0" >>confdefs.h
  
+      HAVE_THREAD_INFO_TP_VALUE=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for jiffies_to_timeval" >&5
--echo $ECHO_N "checking kernel symbol table for jiffies_to_timeval... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for jiffies_to_timeval" >&5
-+$as_echo_n "checking kernel symbol table for jiffies_to_timeval... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for __kuser_helper_start" >&5
+-echo $ECHO_N "checking kernel symbol table for __kuser_helper_start... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __kuser_helper_start" >&5
++$as_echo_n "checking kernel symbol table for __kuser_helper_start... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_jiffies_to_timeval+set}" = set; then
+-    if test "${cr_cv_ksymtab___kuser_helper_start+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_jiffies_to_timeval+set}" = set; then :
++    if ${cr_cv_ksymtab___kuser_helper_start+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_jiffies_to_timeval=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}jiffies_to_timeval$/ {s/ .*//p;q;}"`
-@@ -28484,11 +20619,7 @@
+     cr_cv_ksymtab___kuser_helper_start=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__kuser_helper_start$/ {s/ .*//p;q;}"`
+@@ -32450,11 +24412,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -73643,7 +78961,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -28508,42 +20639,18 @@
+@@ -32474,42 +24432,18 @@
    return 0;
  }
  _ACEOF
@@ -73673,7 +78991,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_jiffies_to_timeval="Y$cr_cv_ksymtab_jiffies_to_timeval"
+ 	 cr_cv_ksymtab___kuser_helper_start="Y$cr_cv_ksymtab___kuser_helper_start"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -73682,25 +79000,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_jiffies_to_timeval="N$cr_cv_ksymtab_jiffies_to_timeval"
+ 	 cr_cv_ksymtab___kuser_helper_start="N$cr_cv_ksymtab___kuser_helper_start"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -28554,9 +20661,7 @@
-     cr_result='not found'
-   else
-     if expr "$cr_cv_ksymtab_jiffies_to_timeval" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol jiffies_to_timeval but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol jiffies_to_timeval but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol jiffies_to_timeval but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_jiffies_to_timeval | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -28572,19 +20677,18 @@
+@@ -32539,17 +24473,17 @@
  _ACEOF
  
    fi
@@ -73711,22 +79018,20 @@
  
  
  
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct fdtable" >&5
-+$as_echo_n "checking kernel for struct fdtable... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for struct fdtable" >&5
--echo $ECHO_N "checking kernel for struct fdtable... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_STRUCT_FDTABLE+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for __kuser_cmpxchg" >&5
+-echo $ECHO_N "checking kernel symbol table for __kuser_cmpxchg... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __kuser_cmpxchg" >&5
++$as_echo_n "checking kernel symbol table for __kuser_cmpxchg... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab___kuser_cmpxchg+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_STRUCT_FDTABLE+set}" = set; then :
++    if ${cr_cv_ksymtab___kuser_cmpxchg+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -28595,11 +20699,7 @@
+     cr_cv_ksymtab___kuser_cmpxchg=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__kuser_cmpxchg$/ {s/ .*//p;q;}"`
+@@ -32565,11 +24499,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -73739,7 +79044,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -28625,42 +20725,18 @@
+@@ -32589,42 +24519,18 @@
    return 0;
  }
  _ACEOF
@@ -73769,7 +79074,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_STRUCT_FDTABLE=yes
+ 	 cr_cv_ksymtab___kuser_cmpxchg="Y$cr_cv_ksymtab___kuser_cmpxchg"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -73778,58 +79083,40 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_STRUCT_FDTABLE=no
+ 	 cr_cv_ksymtab___kuser_cmpxchg="N$cr_cv_ksymtab___kuser_cmpxchg"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -28668,22 +20744,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_STRUCT_FDTABLE
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_FDTABLE 1
--_ACEOF
-+    $as_echo "#define HAVE_STRUCT_FDTABLE 1" >>confdefs.h
- 
-      HAVE_STRUCT_FDTABLE=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_FDTABLE 0
--_ACEOF
-+    $as_echo "#define HAVE_STRUCT_FDTABLE 0" >>confdefs.h
+@@ -32654,19 +24560,18 @@
+ _ACEOF
  
-      HAVE_STRUCT_FDTABLE=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- 
- # OK if missing
-@@ -28691,12 +20763,11 @@
+ fi
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for files_struct.next_fd" >&5
-+$as_echo_n "checking kernel for files_struct.next_fd... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for VSYSCALL_BASE" >&5
++$as_echo_n "checking kernel for VSYSCALL_BASE... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for files_struct.next_fd" >&5
--echo $ECHO_N "checking kernel for files_struct.next_fd... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for VSYSCALL_BASE" >&5
+-echo $ECHO_N "checking kernel for VSYSCALL_BASE... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_VSYSCALL_BASE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_VSYSCALL_BASE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -28707,11 +20778,7 @@
+@@ -32677,11 +24582,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -73842,7 +79129,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -28735,42 +20802,18 @@
+@@ -32701,42 +24602,18 @@
    return 0;
  }
  _ACEOF
@@ -73872,7 +79159,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD=yes
+ 	 cr_cv_kconfig_HAVE_VSYSCALL_BASE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -73881,30 +79168,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD=no
+ 	 cr_cv_kconfig_HAVE_VSYSCALL_BASE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -28778,33 +20821,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD
+@@ -32744,22 +24621,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_VSYSCALL_BASE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FILES_STRUCT_NEXT_FD 1
+-#define HAVE_VSYSCALL_BASE 1
 -_ACEOF
-+    $as_echo "#define HAVE_FILES_STRUCT_NEXT_FD 1" >>confdefs.h
++    $as_echo "#define HAVE_VSYSCALL_BASE 1" >>confdefs.h
  
-      HAVE_FILES_STRUCT_NEXT_FD=1
+      HAVE_VSYSCALL_BASE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FILES_STRUCT_NEXT_FD 0
+-#define HAVE_VSYSCALL_BASE 0
 -_ACEOF
-+    $as_echo "#define HAVE_FILES_STRUCT_NEXT_FD 0" >>confdefs.h
++    $as_echo "#define HAVE_VSYSCALL_BASE 0" >>confdefs.h
  
-      HAVE_FILES_STRUCT_NEXT_FD=''
+      HAVE_VSYSCALL_BASE=''
    fi
  
  
@@ -73915,22 +79202,24 @@
  
  
  
+@@ -32768,12 +24641,11 @@
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for fdtable.next_fd" >&5
-+$as_echo_n "checking kernel for fdtable.next_fd... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for fdtable.next_fd" >&5
--echo $ECHO_N "checking kernel for fdtable.next_fd... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg arch_setup_additional_pages" >&5
++$as_echo_n "checking kernel for 2-arg arch_setup_additional_pages... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2-arg arch_setup_additional_pages" >&5
+-echo $ECHO_N "checking kernel for 2-arg arch_setup_additional_pages... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -28815,11 +20853,7 @@
+@@ -32784,11 +24656,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -73943,7 +79232,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -28843,42 +20877,18 @@
+@@ -32812,42 +24680,18 @@
    return 0;
  }
  _ACEOF
@@ -73973,7 +79262,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD=yes
+ 	 cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -73982,146 +79271,58 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD=no
+ 	 cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -28886,22 +20896,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD
+@@ -32855,23 +24699,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FDTABLE_NEXT_FD 1
+-#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1
 -_ACEOF
-+    $as_echo "#define HAVE_FDTABLE_NEXT_FD 1" >>confdefs.h
++    $as_echo "#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1" >>confdefs.h
  
-      HAVE_FDTABLE_NEXT_FD=1
+      HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FDTABLE_NEXT_FD 0
+-#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0
 -_ACEOF
-+    $as_echo "#define HAVE_FDTABLE_NEXT_FD 0" >>confdefs.h
++    $as_echo "#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0" >>confdefs.h
  
-      HAVE_FDTABLE_NEXT_FD=''
+      HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
- # Allow only exactly one match
-@@ -28925,39 +20931,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -28971,21 +20997,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" "$LINENO" 5
  
- fi
  
+@@ -32881,11 +24720,11 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for files_struct.max_fdset" >&5
-+$as_echo_n "checking kernel for files_struct.max_fdset... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for 4-arg arch_setup_additional_pages" >&5
+-echo $ECHO_N "checking kernel for 4-arg arch_setup_additional_pages... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg arch_setup_additional_pages" >&5
++$as_echo_n "checking kernel for 4-arg arch_setup_additional_pages... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for files_struct.max_fdset" >&5
--echo $ECHO_N "checking kernel for files_struct.max_fdset... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -28996,11 +21019,7 @@
+@@ -32896,11 +24735,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -74134,7 +79335,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -29024,42 +21043,18 @@
+@@ -32924,42 +24759,18 @@
    return 0;
  }
  _ACEOF
@@ -74164,7 +79365,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET=yes
+ 	 cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -74173,57 +79374,58 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET=no
+ 	 cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -29067,34 +21062,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET
+@@ -32967,22 +24778,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FILES_STRUCT_MAX_FDSET 1
+-#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1
 -_ACEOF
-+    $as_echo "#define HAVE_FILES_STRUCT_MAX_FDSET 1" >>confdefs.h
++    $as_echo "#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1" >>confdefs.h
  
-      HAVE_FILES_STRUCT_MAX_FDSET=1
+      HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FILES_STRUCT_MAX_FDSET 0
+-#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0
 -_ACEOF
-+    $as_echo "#define HAVE_FILES_STRUCT_MAX_FDSET 0" >>confdefs.h
++    $as_echo "#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0" >>confdefs.h
  
-      HAVE_FILES_STRUCT_MAX_FDSET=''
+      HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
+@@ -32990,12 +24797,12 @@
+ if test -n "${HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES}${HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES}"; then
  
  
- 
--  echo "$as_me:$LINENO: checking kernel for struct path" >&5
--echo $ECHO_N "checking kernel for struct path... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct path" >&5
-+$as_echo_n "checking kernel for struct path... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_STRUCT_PATH+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for arch_setup_additional_pages" >&5
+-echo $ECHO_N "checking kernel symbol table for arch_setup_additional_pages... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_setup_additional_pages" >&5
++$as_echo_n "checking kernel symbol table for arch_setup_additional_pages... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_arch_setup_additional_pages+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_STRUCT_PATH+set}" = set; then :
++    if ${cr_cv_ksymtab_arch_setup_additional_pages+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -29105,11 +21095,7 @@
+     cr_cv_ksymtab_arch_setup_additional_pages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_setup_additional_pages$/ {s/ .*//p;q;}"`
+@@ -33011,11 +24818,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -74236,7 +79438,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -29129,42 +21115,18 @@
+@@ -33035,42 +24838,18 @@
    return 0;
  }
  _ACEOF
@@ -74266,7 +79468,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_STRUCT_PATH=yes
+ 	 cr_cv_ksymtab_arch_setup_additional_pages="Y$cr_cv_ksymtab_arch_setup_additional_pages"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -74275,55 +79477,51 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_STRUCT_PATH=no
+ 	 cr_cv_ksymtab_arch_setup_additional_pages="N$cr_cv_ksymtab_arch_setup_additional_pages"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -29172,32 +21134,27 @@
-   cr_result=$cr_cv_kconfig_HAVE_STRUCT_PATH
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_PATH 1
--_ACEOF
-+    $as_echo "#define HAVE_STRUCT_PATH 1" >>confdefs.h
- 
-      HAVE_STRUCT_PATH=1
+@@ -33081,9 +24860,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_PATH 0
--_ACEOF
-+    $as_echo "#define HAVE_STRUCT_PATH 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_arch_setup_additional_pages" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_arch_setup_additional_pages | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -33099,19 +24876,18 @@
+ _ACEOF
  
-      HAVE_STRUCT_PATH=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+ fi
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for nameidata.path" >&5
-+$as_echo_n "checking kernel for nameidata.path... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for map_vsyscall" >&5
++$as_echo_n "checking kernel for map_vsyscall... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for nameidata.path" >&5
--echo $ECHO_N "checking kernel for nameidata.path... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for map_vsyscall" >&5
+-echo $ECHO_N "checking kernel for map_vsyscall... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_NAMEIDATA_PATH+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_MAP_VSYSCALL+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_NAMEIDATA_PATH+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_MAP_VSYSCALL+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -29208,11 +21165,7 @@
+@@ -33122,11 +24898,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -74336,7 +79534,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -29247,42 +21200,18 @@
+@@ -33155,42 +24927,18 @@
    return 0;
  }
  _ACEOF
@@ -74366,7 +79564,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_NAMEIDATA_PATH=yes
+ 	 cr_cv_kconfig_HAVE_MAP_VSYSCALL=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -74375,54 +79573,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_NAMEIDATA_PATH=no
+ 	 cr_cv_kconfig_HAVE_MAP_VSYSCALL=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -29290,31 +21219,26 @@
-   cr_result=$cr_cv_kconfig_HAVE_NAMEIDATA_PATH
+@@ -33198,33 +24946,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_MAP_VSYSCALL
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_NAMEIDATA_PATH 1
+-#define HAVE_MAP_VSYSCALL 1
 -_ACEOF
-+    $as_echo "#define HAVE_NAMEIDATA_PATH 1" >>confdefs.h
++    $as_echo "#define HAVE_MAP_VSYSCALL 1" >>confdefs.h
  
-      HAVE_NAMEIDATA_PATH=1
+      HAVE_MAP_VSYSCALL=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_NAMEIDATA_PATH 0
+-#define HAVE_MAP_VSYSCALL 0
 -_ACEOF
-+    $as_echo "#define HAVE_NAMEIDATA_PATH 0" >>confdefs.h
++    $as_echo "#define HAVE_MAP_VSYSCALL 0" >>confdefs.h
  
-      HAVE_NAMEIDATA_PATH=''
+      HAVE_MAP_VSYSCALL=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ if test -n "${HAVE_MAP_VSYSCALL}"; then
  
--  echo "$as_me:$LINENO: checking kernel for nameidata.dentry" >&5
--echo $ECHO_N "checking kernel for nameidata.dentry... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for nameidata.dentry" >&5
-+$as_echo_n "checking kernel for nameidata.dentry... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for map_vsyscall" >&5
+-echo $ECHO_N "checking kernel symbol table for map_vsyscall... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for map_vsyscall" >&5
++$as_echo_n "checking kernel symbol table for map_vsyscall... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_map_vsyscall+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY+set}" = set; then :
++    if ${cr_cv_ksymtab_map_vsyscall+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -29325,11 +21249,7 @@
+     cr_cv_ksymtab_map_vsyscall=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}map_vsyscall$/ {s/ .*//p;q;}"`
+@@ -33240,11 +24984,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -74435,7 +79635,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -29364,42 +21284,18 @@
+@@ -33264,42 +25004,18 @@
    return 0;
  }
  _ACEOF
@@ -74465,7 +79665,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY=yes
+ 	 cr_cv_ksymtab_map_vsyscall="Y$cr_cv_ksymtab_map_vsyscall"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -74474,146 +79674,136 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY=no
+ 	 cr_cv_ksymtab_map_vsyscall="N$cr_cv_ksymtab_map_vsyscall"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -29407,22 +21303,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_NAMEIDATA_DENTRY 1
--_ACEOF
-+    $as_echo "#define HAVE_NAMEIDATA_DENTRY 1" >>confdefs.h
- 
-      HAVE_NAMEIDATA_DENTRY=1
+@@ -33310,9 +25026,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_NAMEIDATA_DENTRY 0
--_ACEOF
-+    $as_echo "#define HAVE_NAMEIDATA_DENTRY 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_map_vsyscall" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol map_vsyscall but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol map_vsyscall but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol map_vsyscall but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_map_vsyscall | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -33328,19 +25042,19 @@
+ _ACEOF
  
-      HAVE_NAMEIDATA_DENTRY=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- if test "${HAVE_NAMEIDATA_PATH}${HAVE_NAMEIDATA_DENTRY}" != "1"; then
+ fi
+ if test $CR_KARCH = x86_64; then
  
-@@ -29444,39 +21336,59 @@
  
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -29490,21 +21402,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
+-  echo "$as_me:$LINENO: checking kernel symbol table for syscall32_setup_pages" >&5
+-echo $ECHO_N "checking kernel symbol table for syscall32_setup_pages... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for syscall32_setup_pages" >&5
++$as_echo_n "checking kernel symbol table for syscall32_setup_pages... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_syscall32_setup_pages+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_syscall32_setup_pages+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" "$LINENO" 5
+     cr_cv_ksymtab_syscall32_setup_pages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}syscall32_setup_pages$/ {s/ .*//p;q;}"`
+@@ -33356,11 +25070,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
+ 		 #include <linux/kernel.h>
+@@ -33380,42 +25090,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_syscall32_setup_pages="Y$cr_cv_ksymtab_syscall32_setup_pages"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_syscall32_setup_pages="N$cr_cv_ksymtab_syscall32_setup_pages"
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
+ 
+@@ -33445,19 +25131,19 @@
+ _ACEOF
  
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
+ fi
+ if test $CR_KARCH = arm; then
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for __putname" >&5
-+$as_echo_n "checking kernel for __putname... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for __putname" >&5
--echo $ECHO_N "checking kernel for __putname... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE___PUTNAME+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for vectors_user_mapping" >&5
+-echo $ECHO_N "checking kernel symbol table for vectors_user_mapping... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for vectors_user_mapping" >&5
++$as_echo_n "checking kernel symbol table for vectors_user_mapping... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_vectors_user_mapping+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE___PUTNAME+set}" = set; then :
++    if ${cr_cv_ksymtab_vectors_user_mapping+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -29515,11 +21424,7 @@
+     cr_cv_ksymtab_vectors_user_mapping=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}vectors_user_mapping$/ {s/ .*//p;q;}"`
+@@ -33473,11 +25159,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -74626,7 +79816,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -29543,42 +21448,18 @@
+@@ -33497,42 +25179,18 @@
    return 0;
  }
  _ACEOF
@@ -74656,7 +79846,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE___PUTNAME=yes
+ 	 cr_cv_ksymtab_vectors_user_mapping="Y$cr_cv_ksymtab_vectors_user_mapping"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -74665,57 +79855,40 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE___PUTNAME=no
+ 	 cr_cv_ksymtab_vectors_user_mapping="N$cr_cv_ksymtab_vectors_user_mapping"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -29586,34 +21467,29 @@
-   cr_result=$cr_cv_kconfig_HAVE___PUTNAME
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE___PUTNAME 1
--_ACEOF
-+    $as_echo "#define HAVE___PUTNAME 1" >>confdefs.h
- 
-      HAVE___PUTNAME=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE___PUTNAME 0
--_ACEOF
-+    $as_echo "#define HAVE___PUTNAME 0" >>confdefs.h
+@@ -33562,19 +25220,19 @@
+ _ACEOF
  
-      HAVE___PUTNAME=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+ fi
  
  
  
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct delayed_work" >&5
-+$as_echo_n "checking kernel for struct delayed_work... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for struct delayed_work" >&5
--echo $ECHO_N "checking kernel for struct delayed_work... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for arch_pick_mmap_layout" >&5
+-echo $ECHO_N "checking kernel symbol table for arch_pick_mmap_layout... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_pick_mmap_layout" >&5
++$as_echo_n "checking kernel symbol table for arch_pick_mmap_layout... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_arch_pick_mmap_layout+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK+set}" = set; then :
++    if ${cr_cv_ksymtab_arch_pick_mmap_layout+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -29624,11 +21500,7 @@
+     cr_cv_ksymtab_arch_pick_mmap_layout=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_pick_mmap_layout$/ {s/ .*//p;q;}"`
+@@ -33590,11 +25248,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -74728,7 +79901,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -29648,42 +21520,18 @@
+@@ -33614,42 +25268,18 @@
    return 0;
  }
  _ACEOF
@@ -74758,7 +79931,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK=yes
+ 	 cr_cv_ksymtab_arch_pick_mmap_layout="Y$cr_cv_ksymtab_arch_pick_mmap_layout"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -74767,58 +79940,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK=no
+ 	 cr_cv_ksymtab_arch_pick_mmap_layout="N$cr_cv_ksymtab_arch_pick_mmap_layout"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -29691,22 +21539,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_DELAYED_WORK 1
--_ACEOF
-+    $as_echo "#define HAVE_STRUCT_DELAYED_WORK 1" >>confdefs.h
- 
-      HAVE_STRUCT_DELAYED_WORK=1
+@@ -33660,9 +25290,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_DELAYED_WORK 0
--_ACEOF
-+    $as_echo "#define HAVE_STRUCT_DELAYED_WORK 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_arch_pick_mmap_layout" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_arch_pick_mmap_layout | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -33678,17 +25306,17 @@
+ _ACEOF
  
-      HAVE_STRUCT_DELAYED_WORK=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
-@@ -29714,12 +21558,11 @@
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for do_each_pid_task" >&5
-+$as_echo_n "checking kernel for do_each_pid_task... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for do_each_pid_task" >&5
--echo $ECHO_N "checking kernel for do_each_pid_task... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_DO_EACH_PID_TASK+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for arch_get_unmaped_area" >&5
+-echo $ECHO_N "checking kernel symbol table for arch_get_unmaped_area... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_get_unmaped_area" >&5
++$as_echo_n "checking kernel symbol table for arch_get_unmaped_area... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_arch_get_unmaped_area+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_DO_EACH_PID_TASK+set}" = set; then :
++    if ${cr_cv_ksymtab_arch_get_unmaped_area+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -29730,11 +21573,7 @@
+     cr_cv_ksymtab_arch_get_unmaped_area=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_get_unmaped_area$/ {s/ .*//p;q;}"`
+@@ -33704,11 +25332,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -74831,7 +79995,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -29755,42 +21594,18 @@
+@@ -33728,42 +25352,18 @@
    return 0;
  }
  _ACEOF
@@ -74861,7 +80025,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_DO_EACH_PID_TASK=yes
+ 	 cr_cv_ksymtab_arch_get_unmaped_area="Y$cr_cv_ksymtab_arch_get_unmaped_area"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -74870,56 +80034,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_DO_EACH_PID_TASK=no
+ 	 cr_cv_ksymtab_arch_get_unmaped_area="N$cr_cv_ksymtab_arch_get_unmaped_area"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -29798,33 +21613,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_DO_EACH_PID_TASK
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_DO_EACH_PID_TASK 1
--_ACEOF
-+    $as_echo "#define HAVE_DO_EACH_PID_TASK 1" >>confdefs.h
- 
-      HAVE_DO_EACH_PID_TASK=1
+@@ -33774,9 +25374,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_DO_EACH_PID_TASK 0
--_ACEOF
-+    $as_echo "#define HAVE_DO_EACH_PID_TASK 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_arch_get_unmaped_area" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_arch_get_unmaped_area | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -33792,17 +25390,17 @@
+ _ACEOF
  
-      HAVE_DO_EACH_PID_TASK=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for do_each_task_pid" >&5
-+$as_echo_n "checking kernel for do_each_task_pid... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for do_each_task_pid" >&5
--echo $ECHO_N "checking kernel for do_each_task_pid... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_DO_EACH_TASK_PID+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for arch_unmap_area" >&5
+-echo $ECHO_N "checking kernel symbol table for arch_unmap_area... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_unmap_area" >&5
++$as_echo_n "checking kernel symbol table for arch_unmap_area... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_arch_unmap_area+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_DO_EACH_TASK_PID+set}" = set; then :
++    if ${cr_cv_ksymtab_arch_unmap_area+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -29835,11 +21645,7 @@
+     cr_cv_ksymtab_arch_unmap_area=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_unmap_area$/ {s/ .*//p;q;}"`
+@@ -33818,11 +25416,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -74932,7 +80089,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -29860,42 +21666,18 @@
+@@ -33842,42 +25436,18 @@
    return 0;
  }
  _ACEOF
@@ -74962,7 +80119,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_DO_EACH_TASK_PID=yes
+ 	 cr_cv_ksymtab_arch_unmap_area="Y$cr_cv_ksymtab_arch_unmap_area"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -74971,57 +80128,50 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_DO_EACH_TASK_PID=no
+ 	 cr_cv_ksymtab_arch_unmap_area="N$cr_cv_ksymtab_arch_unmap_area"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -29903,34 +21685,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_DO_EACH_TASK_PID
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_DO_EACH_TASK_PID 1
--_ACEOF
-+    $as_echo "#define HAVE_DO_EACH_TASK_PID 1" >>confdefs.h
- 
-      HAVE_DO_EACH_TASK_PID=1
+@@ -33888,9 +25458,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_DO_EACH_TASK_PID 0
--_ACEOF
-+    $as_echo "#define HAVE_DO_EACH_TASK_PID 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_arch_unmap_area" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol arch_unmap_area but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol arch_unmap_area but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol arch_unmap_area but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_arch_unmap_area | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -33906,18 +25474,17 @@
+ _ACEOF
  
-      HAVE_DO_EACH_TASK_PID=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
- if test -z "${HAVE_DO_EACH_TASK_PID}"; then
- 
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for for_each_task_pid" >&5
-+$as_echo_n "checking kernel for for_each_task_pid... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for mm.mmap_base" >&5
+-echo $ECHO_N "checking kernel for mm.mmap_base... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.mmap_base" >&5
++$as_echo_n "checking kernel for mm.mmap_base... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for for_each_task_pid" >&5
--echo $ECHO_N "checking kernel for for_each_task_pid... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_MM_MMAP_BASE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_MM_MMAP_BASE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -29941,11 +21718,7 @@
+@@ -33928,11 +25495,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -75034,7 +80184,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -29966,42 +21739,18 @@
+@@ -33950,42 +25513,18 @@
    return 0;
  }
  _ACEOF
@@ -75064,7 +80214,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID=yes
+ 	 cr_cv_kconfig_HAVE_MM_MMAP_BASE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -75073,30 +80223,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID=no
+ 	 cr_cv_kconfig_HAVE_MM_MMAP_BASE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -30009,22 +21758,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID
+@@ -33993,33 +25532,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_MM_MMAP_BASE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FOR_EACH_TASK_PID 1
+-#define HAVE_MM_MMAP_BASE 1
 -_ACEOF
-+    $as_echo "#define HAVE_FOR_EACH_TASK_PID 1" >>confdefs.h
++    $as_echo "#define HAVE_MM_MMAP_BASE 1" >>confdefs.h
  
-      HAVE_FOR_EACH_TASK_PID=1
+      HAVE_MM_MMAP_BASE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FOR_EACH_TASK_PID 0
+-#define HAVE_MM_MMAP_BASE 0
 -_ACEOF
-+    $as_echo "#define HAVE_FOR_EACH_TASK_PID 0" >>confdefs.h
++    $as_echo "#define HAVE_MM_MMAP_BASE 0" >>confdefs.h
  
-      HAVE_FOR_EACH_TASK_PID=''
+      HAVE_MM_MMAP_BASE=''
    fi
  
  
@@ -75106,113 +80256,23 @@
 +$as_echo "$cr_result" >&6; }
  
  
- fi
-@@ -30049,39 +21794,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -30095,21 +21860,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to find a task iterator" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to find a task iterator" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to find a task iterator" "$LINENO" 5
- 
- fi
- 
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.0 task ids" >&5
-+$as_echo_n "checking kernel for 2.6.0 task ids... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.cached_hole_size" >&5
++$as_echo_n "checking kernel for mm.cached_hole_size... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 2.6.0 task ids" >&5
--echo $ECHO_N "checking kernel for 2.6.0 task ids... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for mm.cached_hole_size" >&5
+-echo $ECHO_N "checking kernel for mm.cached_hole_size... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_2_6_0_TASK_IDS+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_6_0_TASK_IDS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -30120,11 +21882,7 @@
+@@ -34030,11 +25564,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -75225,7 +80285,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -30142,42 +21900,18 @@
+@@ -34052,42 +25582,18 @@
    return 0;
  }
  _ACEOF
@@ -75255,7 +80315,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_0_TASK_IDS=yes
+ 	 cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -75264,35 +80324,36 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_0_TASK_IDS=no
+ 	 cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -30185,33 +21919,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_6_0_TASK_IDS
+@@ -34095,34 +25601,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_0_TASK_IDS 1
+-#define HAVE_MM_CACHED_HOLE_SIZE 1
 -_ACEOF
-+    $as_echo "#define HAVE_2_6_0_TASK_IDS 1" >>confdefs.h
++    $as_echo "#define HAVE_MM_CACHED_HOLE_SIZE 1" >>confdefs.h
  
-      HAVE_2_6_0_TASK_IDS=1
+      HAVE_MM_CACHED_HOLE_SIZE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_0_TASK_IDS 0
+-#define HAVE_MM_CACHED_HOLE_SIZE 0
 -_ACEOF
-+    $as_echo "#define HAVE_2_6_0_TASK_IDS 0" >>confdefs.h
++    $as_echo "#define HAVE_MM_CACHED_HOLE_SIZE 0" >>confdefs.h
  
-      HAVE_2_6_0_TASK_IDS=''
+      HAVE_MM_CACHED_HOLE_SIZE=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -75300,20 +80361,20 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.6 task ids" >&5
-+$as_echo_n "checking kernel for 2.6.6 task ids... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 2.6.6 task ids" >&5
--echo $ECHO_N "checking kernel for 2.6.6 task ids... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_2_6_6_TASK_IDS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for CONFIG_HUGETLBFS" >&5
+-echo $ECHO_N "checking kernel for CONFIG_HUGETLBFS... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for CONFIG_HUGETLBFS" >&5
++$as_echo_n "checking kernel for CONFIG_HUGETLBFS... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_6_6_TASK_IDS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -30222,11 +21951,7 @@
+@@ -34133,11 +25634,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -75326,7 +80387,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -30244,42 +21969,18 @@
+@@ -34158,42 +25655,18 @@
    return 0;
  }
  _ACEOF
@@ -75356,7 +80417,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_6_TASK_IDS=yes
+ 	 cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -75365,56 +80426,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_6_TASK_IDS=no
+ 	 cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -30287,33 +21988,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_6_6_TASK_IDS
+@@ -34201,33 +25674,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_6_TASK_IDS 1
+-#define HAVE_CONFIG_HUGETLBFS 1
 -_ACEOF
-+    $as_echo "#define HAVE_2_6_6_TASK_IDS 1" >>confdefs.h
++    $as_echo "#define HAVE_CONFIG_HUGETLBFS 1" >>confdefs.h
  
-      HAVE_2_6_6_TASK_IDS=1
+      HAVE_CONFIG_HUGETLBFS=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_6_TASK_IDS 0
+-#define HAVE_CONFIG_HUGETLBFS 0
 -_ACEOF
-+    $as_echo "#define HAVE_2_6_6_TASK_IDS 0" >>confdefs.h
++    $as_echo "#define HAVE_CONFIG_HUGETLBFS 0" >>confdefs.h
  
-      HAVE_2_6_6_TASK_IDS=''
+      HAVE_CONFIG_HUGETLBFS=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ if test -n "${HAVE_CONFIG_HUGETLBFS}"; then
  
  
- 
--  echo "$as_me:$LINENO: checking kernel for 2.6.20 task ids" >&5
--echo $ECHO_N "checking kernel for 2.6.20 task ids... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.20 task ids" >&5
-+$as_echo_n "checking kernel for 2.6.20 task ids... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_2_6_20_TASK_IDS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for hugetlbfs_file_operations" >&5
+-echo $ECHO_N "checking kernel symbol table for hugetlbfs_file_operations... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for hugetlbfs_file_operations" >&5
++$as_echo_n "checking kernel symbol table for hugetlbfs_file_operations... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_hugetlbfs_file_operations+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_6_20_TASK_IDS+set}" = set; then :
++    if ${cr_cv_ksymtab_hugetlbfs_file_operations+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -30324,11 +22020,7 @@
+     cr_cv_ksymtab_hugetlbfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}hugetlbfs_file_operations$/ {s/ .*//p;q;}"`
+@@ -34243,11 +25712,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -75427,7 +80488,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -30349,42 +22041,18 @@
+@@ -34267,42 +25732,18 @@
    return 0;
  }
  _ACEOF
@@ -75457,7 +80518,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_20_TASK_IDS=yes
+ 	 cr_cv_ksymtab_hugetlbfs_file_operations="Y$cr_cv_ksymtab_hugetlbfs_file_operations"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -75466,56 +80527,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_20_TASK_IDS=no
+ 	 cr_cv_ksymtab_hugetlbfs_file_operations="N$cr_cv_ksymtab_hugetlbfs_file_operations"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -30392,33 +22060,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_6_20_TASK_IDS
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_20_TASK_IDS 1
--_ACEOF
-+    $as_echo "#define HAVE_2_6_20_TASK_IDS 1" >>confdefs.h
- 
-      HAVE_2_6_20_TASK_IDS=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_20_TASK_IDS 0
--_ACEOF
-+    $as_echo "#define HAVE_2_6_20_TASK_IDS 0" >>confdefs.h
+@@ -34332,17 +25773,17 @@
+ _ACEOF
  
-      HAVE_2_6_20_TASK_IDS=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.24 task ids" >&5
-+$as_echo_n "checking kernel for 2.6.24 task ids... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for 2.6.24 task ids" >&5
--echo $ECHO_N "checking kernel for 2.6.24 task ids... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_2_6_24_TASK_IDS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for is_file_shm_hugepages" >&5
+-echo $ECHO_N "checking kernel symbol table for is_file_shm_hugepages... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for is_file_shm_hugepages" >&5
++$as_echo_n "checking kernel symbol table for is_file_shm_hugepages... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_is_file_shm_hugepages+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_6_24_TASK_IDS+set}" = set; then :
++    if ${cr_cv_ksymtab_is_file_shm_hugepages+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -30429,11 +22092,7 @@
+     cr_cv_ksymtab_is_file_shm_hugepages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}is_file_shm_hugepages$/ {s/ .*//p;q;}"`
+@@ -34358,11 +25799,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -75528,7 +80571,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -30454,42 +22113,18 @@
+@@ -34382,42 +25819,18 @@
    return 0;
  }
  _ACEOF
@@ -75558,7 +80601,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_24_TASK_IDS=yes
+ 	 cr_cv_ksymtab_is_file_shm_hugepages="Y$cr_cv_ksymtab_is_file_shm_hugepages"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -75567,146 +80610,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_24_TASK_IDS=no
+ 	 cr_cv_ksymtab_is_file_shm_hugepages="N$cr_cv_ksymtab_is_file_shm_hugepages"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -30497,22 +22132,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_6_24_TASK_IDS
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_24_TASK_IDS 1
--_ACEOF
-+    $as_echo "#define HAVE_2_6_24_TASK_IDS 1" >>confdefs.h
- 
-      HAVE_2_6_24_TASK_IDS=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_24_TASK_IDS 0
--_ACEOF
-+    $as_echo "#define HAVE_2_6_24_TASK_IDS 0" >>confdefs.h
+@@ -34447,17 +25860,17 @@
+ _ACEOF
  
-      HAVE_2_6_24_TASK_IDS=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
- # Should allow only exactly one match, except that 2.6.6 and 2.6.20/24 overlap during transitional period
-@@ -30538,39 +22169,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -30584,21 +22235,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" "$LINENO" 5
- 
- 	;;
- esac
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for set_task_pgrp" >&5
-+$as_echo_n "checking kernel for set_task_pgrp... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for set_task_pgrp" >&5
--echo $ECHO_N "checking kernel for set_task_pgrp... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_SET_TASK_PGRP+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for hugepage_vma" >&5
+-echo $ECHO_N "checking kernel symbol table for hugepage_vma... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for hugepage_vma" >&5
++$as_echo_n "checking kernel symbol table for hugepage_vma... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_hugepage_vma+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_SET_TASK_PGRP+set}" = set; then :
++    if ${cr_cv_ksymtab_hugepage_vma+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -30609,11 +22257,7 @@
+     cr_cv_ksymtab_hugepage_vma=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}hugepage_vma$/ {s/ .*//p;q;}"`
+@@ -34473,11 +25886,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -75719,7 +80654,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -30637,42 +22281,18 @@
+@@ -34497,42 +25906,18 @@
    return 0;
  }
  _ACEOF
@@ -75749,7 +80684,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SET_TASK_PGRP=yes
+ 	 cr_cv_ksymtab_hugepage_vma="Y$cr_cv_ksymtab_hugepage_vma"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -75758,56 +80693,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SET_TASK_PGRP=no
+ 	 cr_cv_ksymtab_hugepage_vma="N$cr_cv_ksymtab_hugepage_vma"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -30680,33 +22300,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_SET_TASK_PGRP
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_TASK_PGRP 1
--_ACEOF
-+    $as_echo "#define HAVE_SET_TASK_PGRP 1" >>confdefs.h
- 
-      HAVE_SET_TASK_PGRP=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_TASK_PGRP 0
--_ACEOF
-+    $as_echo "#define HAVE_SET_TASK_PGRP 0" >>confdefs.h
+@@ -34562,17 +25947,17 @@
+ _ACEOF
  
-      HAVE_SET_TASK_PGRP=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
--  echo "$as_me:$LINENO: checking kernel for set_task_session" >&5
--echo $ECHO_N "checking kernel for set_task_session... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for set_task_session" >&5
-+$as_echo_n "checking kernel for set_task_session... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_SET_TASK_SESSION+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for pmd_huge" >&5
+-echo $ECHO_N "checking kernel symbol table for pmd_huge... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pmd_huge" >&5
++$as_echo_n "checking kernel symbol table for pmd_huge... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_pmd_huge+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_SET_TASK_SESSION+set}" = set; then :
++    if ${cr_cv_ksymtab_pmd_huge+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -30717,11 +22332,7 @@
+     cr_cv_ksymtab_pmd_huge=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}pmd_huge$/ {s/ .*//p;q;}"`
+@@ -34588,11 +25973,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -75820,7 +80737,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -30745,42 +22356,18 @@
+@@ -34612,42 +25993,18 @@
    return 0;
  }
  _ACEOF
@@ -75850,7 +80767,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SET_TASK_SESSION=yes
+ 	 cr_cv_ksymtab_pmd_huge="Y$cr_cv_ksymtab_pmd_huge"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -75859,57 +80776,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SET_TASK_SESSION=no
+ 	 cr_cv_ksymtab_pmd_huge="N$cr_cv_ksymtab_pmd_huge"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -30788,34 +22375,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_SET_TASK_SESSION
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_TASK_SESSION 1
--_ACEOF
-+    $as_echo "#define HAVE_SET_TASK_SESSION 1" >>confdefs.h
- 
-      HAVE_SET_TASK_SESSION=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_TASK_SESSION 0
--_ACEOF
-+    $as_echo "#define HAVE_SET_TASK_SESSION 0" >>confdefs.h
+@@ -34677,17 +26034,17 @@
+ _ACEOF
  
-      HAVE_SET_TASK_SESSION=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for valid_signal" >&5
-+$as_echo_n "checking kernel for valid_signal... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for valid_signal" >&5
--echo $ECHO_N "checking kernel for valid_signal... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_VALID_SIGNAL+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for follow_huge_pmd" >&5
+-echo $ECHO_N "checking kernel symbol table for follow_huge_pmd... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for follow_huge_pmd" >&5
++$as_echo_n "checking kernel symbol table for follow_huge_pmd... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_follow_huge_pmd+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_VALID_SIGNAL+set}" = set; then :
++    if ${cr_cv_ksymtab_follow_huge_pmd+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -30826,11 +22408,7 @@
+     cr_cv_ksymtab_follow_huge_pmd=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}follow_huge_pmd$/ {s/ .*//p;q;}"`
+@@ -34703,11 +26060,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -75922,7 +80820,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -30854,42 +22432,18 @@
+@@ -34727,42 +26080,18 @@
    return 0;
  }
  _ACEOF
@@ -75952,7 +80850,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_VALID_SIGNAL=yes
+ 	 cr_cv_ksymtab_follow_huge_pmd="Y$cr_cv_ksymtab_follow_huge_pmd"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -75961,57 +80859,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_VALID_SIGNAL=no
+ 	 cr_cv_ksymtab_follow_huge_pmd="N$cr_cv_ksymtab_follow_huge_pmd"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -30897,34 +22451,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_VALID_SIGNAL
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_VALID_SIGNAL 1
--_ACEOF
-+    $as_echo "#define HAVE_VALID_SIGNAL 1" >>confdefs.h
- 
-      HAVE_VALID_SIGNAL=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_VALID_SIGNAL 0
--_ACEOF
-+    $as_echo "#define HAVE_VALID_SIGNAL 0" >>confdefs.h
+@@ -34792,17 +26121,17 @@
+ _ACEOF
  
-      HAVE_VALID_SIGNAL=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
- 
- 
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
  
--  echo "$as_me:$LINENO: checking kernel for REMOVE_LINKS" >&5
--echo $ECHO_N "checking kernel for REMOVE_LINKS... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for REMOVE_LINKS" >&5
-+$as_echo_n "checking kernel for REMOVE_LINKS... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_REMOVE_LINKS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for follow_huge_addr" >&5
+-echo $ECHO_N "checking kernel symbol table for follow_huge_addr... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for follow_huge_addr" >&5
++$as_echo_n "checking kernel symbol table for follow_huge_addr... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_follow_huge_addr+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_REMOVE_LINKS+set}" = set; then :
++    if ${cr_cv_ksymtab_follow_huge_addr+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -30935,11 +22484,7 @@
+     cr_cv_ksymtab_follow_huge_addr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}follow_huge_addr$/ {s/ .*//p;q;}"`
+@@ -34818,11 +26147,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -76024,7 +80903,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -30960,42 +22505,18 @@
+@@ -34842,42 +26167,18 @@
    return 0;
  }
  _ACEOF
@@ -76054,7 +80933,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_REMOVE_LINKS=yes
+ 	 cr_cv_ksymtab_follow_huge_addr="Y$cr_cv_ksymtab_follow_huge_addr"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -76063,57 +80942,53 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_REMOVE_LINKS=no
+ 	 cr_cv_ksymtab_follow_huge_addr="N$cr_cv_ksymtab_follow_huge_addr"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -31003,34 +22524,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_REMOVE_LINKS
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_REMOVE_LINKS 1
--_ACEOF
-+    $as_echo "#define HAVE_REMOVE_LINKS 1" >>confdefs.h
- 
-      HAVE_REMOVE_LINKS=1
+@@ -34888,9 +26189,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_REMOVE_LINKS 0
--_ACEOF
-+    $as_echo "#define HAVE_REMOVE_LINKS 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_follow_huge_addr" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol follow_huge_addr but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol follow_huge_addr but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol follow_huge_addr but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_follow_huge_addr | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -34906,8 +26205,8 @@
+ _ACEOF
  
-      HAVE_REMOVE_LINKS=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
+  # Must have prototype, or NARGS probe will fail
  
  
+@@ -34915,12 +26214,11 @@
  
  
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg follow_huge_addr" >&5
++$as_echo_n "checking kernel for 3-arg follow_huge_addr... " >&6; }
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.pids pid_link" >&5
-+$as_echo_n "checking kernel for task.pids pid_link... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for task.pids pid_link" >&5
--echo $ECHO_N "checking kernel for task.pids pid_link... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for 3-arg follow_huge_addr" >&5
+-echo $ECHO_N "checking kernel for 3-arg follow_huge_addr... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -31041,11 +22557,7 @@
+@@ -34931,11 +26229,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -76126,7 +81001,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -31063,42 +22575,18 @@
+@@ -34957,42 +26251,18 @@
    return 0;
  }
  _ACEOF
@@ -76156,7 +81031,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK=yes
+ 	 cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -76165,30 +81040,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK=no
+ 	 cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -31106,33 +22594,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK
+@@ -35000,23 +26270,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PIDS_PID_LINK 1
+-#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 1
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_PIDS_PID_LINK 1" >>confdefs.h
++    $as_echo "#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 1" >>confdefs.h
  
-      HAVE_TASK_PIDS_PID_LINK=1
+      HAVE_3_ARG_FOLLOW_HUGE_ADDR=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PIDS_PID_LINK 0
+-#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 0
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_PIDS_PID_LINK 0" >>confdefs.h
++    $as_echo "#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 0" >>confdefs.h
  
-      HAVE_TASK_PIDS_PID_LINK=''
+      HAVE_3_ARG_FOLLOW_HUGE_ADDR=''
    fi
  
  
@@ -76200,21 +81075,23 @@
  
  
  
+@@ -35026,11 +26291,11 @@
  
  
--  echo "$as_me:$LINENO: checking kernel for task.pids pid" >&5
--echo $ECHO_N "checking kernel for task.pids pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.pids pid" >&5
-+$as_echo_n "checking kernel for task.pids pid... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for 4-arg follow_huge_addr" >&5
+-echo $ECHO_N "checking kernel for 4-arg follow_huge_addr... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg follow_huge_addr" >&5
++$as_echo_n "checking kernel for 4-arg follow_huge_addr... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -31143,11 +22626,7 @@
+@@ -35041,11 +26306,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -76227,7 +81104,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -31165,42 +22644,18 @@
+@@ -35067,42 +26328,18 @@
    return 0;
  }
  _ACEOF
@@ -76257,7 +81134,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PIDS_PID=yes
+ 	 cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -76266,30 +81143,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PIDS_PID=no
+ 	 cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -31208,22 +22663,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_PIDS_PID
+@@ -35110,22 +26347,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PIDS_PID 1
+-#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 1
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_PIDS_PID 1" >>confdefs.h
++    $as_echo "#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 1" >>confdefs.h
  
-      HAVE_TASK_PIDS_PID=1
+      HAVE_4_ARG_FOLLOW_HUGE_ADDR=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PIDS_PID 0
+-#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 0
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_PIDS_PID 0" >>confdefs.h
++    $as_echo "#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 0" >>confdefs.h
  
-      HAVE_TASK_PIDS_PID=''
+      HAVE_4_ARG_FOLLOW_HUGE_ADDR=''
    fi
  
  
@@ -76299,8 +81176,8 @@
 +$as_echo "$cr_result" >&6; }
  
  
- # Allow zero or one match
-@@ -31247,39 +22698,59 @@
+ 
+@@ -35150,39 +26383,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -76363,14 +81240,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -76378,34 +81267,35 @@
    fi
  fi
  rm -f confcache
-@@ -31293,21 +22764,19 @@
+@@ -35196,9 +26460,7 @@
    echo "  Kernel running currently = `uname -r`"
    echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" >&2;}
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" "$LINENO" 5
++   as_fn_error $? "Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" "$LINENO" 5
  
+   fi
  fi
- 
- # put_task_struct() requires one of these:
+@@ -35211,12 +26473,12 @@
+   sparc*)
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for __put_task_struct" >&5
--echo $ECHO_N "checking kernel symbol table for __put_task_struct... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __put_task_struct" >&5
-+$as_echo_n "checking kernel symbol table for __put_task_struct... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for mem_map_zero" >&5
+-echo $ECHO_N "checking kernel symbol table for mem_map_zero... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for mem_map_zero" >&5
++$as_echo_n "checking kernel symbol table for mem_map_zero... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab___put_task_struct+set}" = set; then
+-    if test "${cr_cv_ksymtab_mem_map_zero+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab___put_task_struct+set}" = set; then :
++    if ${cr_cv_ksymtab_mem_map_zero+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab___put_task_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__put_task_struct$/ {s/ .*//p;q;}"`
-@@ -31323,11 +22792,7 @@
+     cr_cv_ksymtab_mem_map_zero=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}mem_map_zero$/ {s/ .*//p;q;}"`
+@@ -35232,11 +26494,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -76418,7 +81308,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -31347,42 +22812,18 @@
+@@ -35256,42 +26514,18 @@
    return 0;
  }
  _ACEOF
@@ -76448,7 +81338,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab___put_task_struct="Y$cr_cv_ksymtab___put_task_struct"
+ 	 cr_cv_ksymtab_mem_map_zero="Y$cr_cv_ksymtab_mem_map_zero"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -76457,28 +81347,25 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab___put_task_struct="N$cr_cv_ksymtab___put_task_struct"
+ 	 cr_cv_ksymtab_mem_map_zero="N$cr_cv_ksymtab_mem_map_zero"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -31393,9 +22834,10 @@
+@@ -35302,9 +26536,7 @@
      cr_result='not found'
    else
-     if expr "$cr_cv_ksymtab___put_task_struct" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol __put_task_struct but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol __put_task_struct but no declaration -- please file a bug report." >&2;}
+     if expr "$cr_cv_ksymtab_mem_map_zero" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol mem_map_zero but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol mem_map_zero but no declaration -- please file a bug report." >&2;}
 -   { (exit 1); exit 1; }; }
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern void __put_task_struct(struct task_struct *);
-+_EOF
-+
++      as_fn_error $? "Found symbol mem_map_zero but no declaration -- please file a bug report." "$LINENO" 5
      fi
-     cr_result=`echo $cr_cv_ksymtab___put_task_struct | tr -d 'YN'`
+     cr_result=`echo $cr_cv_ksymtab_mem_map_zero | tr -d 'YN'`
      if test $cr_result = 0; then
-@@ -31411,17 +22853,17 @@
+@@ -35320,20 +26552,20 @@
  _ACEOF
  
    fi
@@ -76487,22 +81374,25 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+     ZERO_PAGE_SYMBOL=mem_map_zero
+     ;;
+   *)
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for __put_task_struct_cb" >&5
--echo $ECHO_N "checking kernel symbol table for __put_task_struct_cb... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __put_task_struct_cb" >&5
-+$as_echo_n "checking kernel symbol table for __put_task_struct_cb... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for empty_zero_page" >&5
+-echo $ECHO_N "checking kernel symbol table for empty_zero_page... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for empty_zero_page" >&5
++$as_echo_n "checking kernel symbol table for empty_zero_page... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab___put_task_struct_cb+set}" = set; then
+-    if test "${cr_cv_ksymtab_empty_zero_page+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab___put_task_struct_cb+set}" = set; then :
++    if ${cr_cv_ksymtab_empty_zero_page+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab___put_task_struct_cb=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__put_task_struct_cb$/ {s/ .*//p;q;}"`
-@@ -31437,11 +22879,7 @@
+     cr_cv_ksymtab_empty_zero_page=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}empty_zero_page$/ {s/ .*//p;q;}"`
+@@ -35349,11 +26581,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -76515,7 +81405,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -31461,42 +22899,18 @@
+@@ -35373,42 +26601,18 @@
    return 0;
  }
  _ACEOF
@@ -76545,7 +81435,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab___put_task_struct_cb="Y$cr_cv_ksymtab___put_task_struct_cb"
+ 	 cr_cv_ksymtab_empty_zero_page="Y$cr_cv_ksymtab_empty_zero_page"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -76554,25 +81444,25 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab___put_task_struct_cb="N$cr_cv_ksymtab___put_task_struct_cb"
+ 	 cr_cv_ksymtab_empty_zero_page="N$cr_cv_ksymtab_empty_zero_page"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -31507,9 +22921,7 @@
+@@ -35419,9 +26623,7 @@
      cr_result='not found'
    else
-     if expr "$cr_cv_ksymtab___put_task_struct_cb" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol __put_task_struct_cb but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol __put_task_struct_cb but no declaration -- please file a bug report." >&2;}
+     if expr "$cr_cv_ksymtab_empty_zero_page" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol empty_zero_page but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol empty_zero_page but no declaration -- please file a bug report." >&2;}
 -   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol __put_task_struct_cb but no declaration -- please file a bug report." "$LINENO" 5
++      as_fn_error $? "Found symbol empty_zero_page but no declaration -- please file a bug report." "$LINENO" 5
      fi
-     cr_result=`echo $cr_cv_ksymtab___put_task_struct_cb | tr -d 'YN'`
+     cr_result=`echo $cr_cv_ksymtab_empty_zero_page | tr -d 'YN'`
      if test $cr_result = 0; then
-@@ -31525,19 +22937,18 @@
+@@ -35437,28 +26639,25 @@
  _ACEOF
  
    fi
@@ -76581,24 +81471,34 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+     ZERO_PAGE_SYMBOL=empty_zero_page
+     ;;
+ esac
+ if test -z "$cr_addr"; then
+-  { { echo "$as_me:$LINENO: error: failed to find symbol $ZERO_PAGE_SYMBOL" >&5
+-echo "$as_me: error: failed to find symbol $ZERO_PAGE_SYMBOL" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "failed to find symbol $ZERO_PAGE_SYMBOL" "$LINENO" 5
+ fi
  
+ # How to check for permission
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.task_size" >&5
-+$as_echo_n "checking kernel for mm.task_size... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode_permission" >&5
++$as_echo_n "checking kernel for inode_permission... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for mm.task_size" >&5
--echo $ECHO_N "checking kernel for mm.task_size... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for inode_permission" >&5
+-echo $ECHO_N "checking kernel for inode_permission... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_MM_TASK_SIZE+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_INODE_PERMISSION+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_MM_TASK_SIZE+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_INODE_PERMISSION+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -31548,11 +22959,7 @@
+@@ -35469,11 +26668,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -76611,7 +81511,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -31570,42 +22977,18 @@
+@@ -35497,42 +26692,18 @@
    return 0;
  }
  _ACEOF
@@ -76641,7 +81541,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_TASK_SIZE=yes
+ 	 cr_cv_kconfig_HAVE_INODE_PERMISSION=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -76650,30 +81550,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_TASK_SIZE=no
+ 	 cr_cv_kconfig_HAVE_INODE_PERMISSION=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -31613,34 +22996,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_MM_TASK_SIZE
+@@ -35540,33 +26711,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_INODE_PERMISSION
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_TASK_SIZE 1
+-#define HAVE_INODE_PERMISSION 1
 -_ACEOF
-+    $as_echo "#define HAVE_MM_TASK_SIZE 1" >>confdefs.h
++    $as_echo "#define HAVE_INODE_PERMISSION 1" >>confdefs.h
  
-      HAVE_MM_TASK_SIZE=1
+      HAVE_INODE_PERMISSION=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_TASK_SIZE 0
+-#define HAVE_INODE_PERMISSION 0
 -_ACEOF
-+    $as_echo "#define HAVE_MM_TASK_SIZE 0" >>confdefs.h
++    $as_echo "#define HAVE_INODE_PERMISSION 0" >>confdefs.h
  
-      HAVE_MM_TASK_SIZE=''
+      HAVE_INODE_PERMISSION=''
    fi
  
  
@@ -76687,20 +81587,19 @@
  
  
  
+-  echo "$as_me:$LINENO: checking kernel for permission" >&5
+-echo $ECHO_N "checking kernel for permission... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for permission" >&5
++$as_echo_n "checking kernel for permission... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for PageAnon" >&5
--echo $ECHO_N "checking kernel for PageAnon... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for PageAnon" >&5
-+$as_echo_n "checking kernel for PageAnon... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_PAGEANON+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_PERMISSION+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PAGEANON+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PERMISSION+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -31651,11 +23029,7 @@
+@@ -35577,11 +26743,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -76713,7 +81612,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -31679,42 +23053,18 @@
+@@ -35605,42 +26767,18 @@
    return 0;
  }
  _ACEOF
@@ -76743,7 +81642,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PAGEANON=yes
+ 	 cr_cv_kconfig_HAVE_PERMISSION=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -76752,30 +81651,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PAGEANON=no
+ 	 cr_cv_kconfig_HAVE_PERMISSION=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -31722,22 +23072,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_PAGEANON
+@@ -35648,22 +26786,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_PERMISSION
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PAGEANON 1
+-#define HAVE_PERMISSION 1
 -_ACEOF
-+    $as_echo "#define HAVE_PAGEANON 1" >>confdefs.h
++    $as_echo "#define HAVE_PERMISSION 1" >>confdefs.h
  
-      HAVE_PAGEANON=1
+      HAVE_PERMISSION=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PAGEANON 0
+-#define HAVE_PERMISSION 0
 -_ACEOF
-+    $as_echo "#define HAVE_PAGEANON 0" >>confdefs.h
++    $as_echo "#define HAVE_PERMISSION 0" >>confdefs.h
  
-      HAVE_PAGEANON=''
+      HAVE_PERMISSION=''
    fi
  
  
@@ -76785,25 +81684,208 @@
 +$as_echo "$cr_result" >&6; }
  
  
+ if test -z "${HAVE_INODE_PERMISSION}${HAVE_PERMISSION}"; then
+@@ -35686,39 +26820,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -35732,21 +26897,19 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" "$LINENO" 5
+ 
+ fi
  
-@@ -31745,12 +23091,11 @@
+ # Bits for save/restore of pending signals
  
  
+-  echo "$as_me:$LINENO: checking kernel symbol table for copy_siginfo_to_user" >&5
+-echo $ECHO_N "checking kernel symbol table for copy_siginfo_to_user... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for copy_siginfo_to_user" >&5
++$as_echo_n "checking kernel symbol table for copy_siginfo_to_user... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_copy_siginfo_to_user+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_copy_siginfo_to_user+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.vdso_base" >&5
-+$as_echo_n "checking kernel for thread.vdso_base... " >&6; }
+     cr_cv_ksymtab_copy_siginfo_to_user=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_siginfo_to_user$/ {s/ .*//p;q;}"`
+@@ -35762,11 +26925,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  echo "$as_me:$LINENO: checking kernel for thread.vdso_base" >&5
--echo $ECHO_N "checking kernel for thread.vdso_base... $ECHO_C" >&6
+ 		 #include <linux/kernel.h>
+@@ -35786,42 +26945,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_copy_siginfo_to_user="Y$cr_cv_ksymtab_copy_siginfo_to_user"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
--    if test "${cr_cv_kconfig_HAVE_THREAD_VDSO_BASE+set}" = set; then
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_copy_siginfo_to_user="N$cr_cv_ksymtab_copy_siginfo_to_user"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+     fi
+ 
+@@ -35851,17 +26986,17 @@
+ _ACEOF
+ 
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for group_send_sig_info" >&5
+-echo $ECHO_N "checking kernel symbol table for group_send_sig_info... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for group_send_sig_info" >&5
++$as_echo_n "checking kernel symbol table for group_send_sig_info... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_group_send_sig_info+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_VDSO_BASE+set}" = set; then :
++    if ${cr_cv_ksymtab_group_send_sig_info+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -31761,11 +23106,7 @@
+     cr_cv_ksymtab_group_send_sig_info=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}group_send_sig_info$/ {s/ .*//p;q;}"`
+@@ -35877,11 +27012,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -76816,7 +81898,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -31783,42 +23124,18 @@
+@@ -35901,42 +27032,18 @@
    return 0;
  }
  _ACEOF
@@ -76846,7 +81928,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_VDSO_BASE=yes
+ 	 cr_cv_ksymtab_group_send_sig_info="Y$cr_cv_ksymtab_group_send_sig_info"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -76855,56 +81937,126 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_VDSO_BASE=no
+ 	 cr_cv_ksymtab_group_send_sig_info="N$cr_cv_ksymtab_group_send_sig_info"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -31826,33 +23143,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_VDSO_BASE
+@@ -35966,19 +27073,19 @@
+ _ACEOF
  
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_VDSO_BASE 1
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_VDSO_BASE 1" >>confdefs.h
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
-      HAVE_THREAD_VDSO_BASE=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_VDSO_BASE 0
+ 
+ # For save/restore of sigaltstack
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for do_sigaltstack" >&5
+-echo $ECHO_N "checking kernel symbol table for do_sigaltstack... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_sigaltstack" >&5
++$as_echo_n "checking kernel symbol table for do_sigaltstack... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_do_sigaltstack+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_do_sigaltstack+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+     cr_cv_ksymtab_do_sigaltstack=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_sigaltstack$/ {s/ .*//p;q;}"`
+@@ -35994,11 +27101,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 -_ACEOF
-+    $as_echo "#define HAVE_THREAD_VDSO_BASE 0" >>confdefs.h
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -36018,42 +27121,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_do_sigaltstack="Y$cr_cv_ksymtab_do_sigaltstack"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_do_sigaltstack="N$cr_cv_ksymtab_do_sigaltstack"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-      HAVE_THREAD_VDSO_BASE=''
-   fi
+     fi
  
+@@ -36083,20 +27162,19 @@
+ _ACEOF
  
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ if test $CR_KARCH = i386 -o $CR_KARCH = x86_64; then
  
  
  
--  echo "$as_me:$LINENO: checking kernel for mm.context.vdso_base" >&5
--echo $ECHO_N "checking kernel for mm.context.vdso_base... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.context.vdso_base" >&5
-+$as_echo_n "checking kernel for mm.context.vdso_base... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct n_desc_struct" >&5
++$as_echo_n "checking kernel for struct n_desc_struct... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for struct n_desc_struct" >&5
+-echo $ECHO_N "checking kernel for struct n_desc_struct... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -31863,11 +23175,7 @@
+@@ -36107,11 +27185,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -76917,7 +82069,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -31885,42 +23193,18 @@
+@@ -36133,42 +27207,18 @@
    return 0;
  }
  _ACEOF
@@ -76947,7 +82099,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE=yes
+ 	 cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -76956,35 +82108,36 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE=no
+ 	 cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -31928,33 +23212,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE
+@@ -36176,33 +27226,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_CONTEXT_VDSO_BASE 1
+-#define HAVE_STRUCT_N_DESC_STRUCT 1
 -_ACEOF
-+    $as_echo "#define HAVE_MM_CONTEXT_VDSO_BASE 1" >>confdefs.h
++    $as_echo "#define HAVE_STRUCT_N_DESC_STRUCT 1" >>confdefs.h
  
-      HAVE_MM_CONTEXT_VDSO_BASE=1
+      HAVE_STRUCT_N_DESC_STRUCT=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_CONTEXT_VDSO_BASE 0
+-#define HAVE_STRUCT_N_DESC_STRUCT 0
 -_ACEOF
-+    $as_echo "#define HAVE_MM_CONTEXT_VDSO_BASE 0" >>confdefs.h
++    $as_echo "#define HAVE_STRUCT_N_DESC_STRUCT 0" >>confdefs.h
  
-      HAVE_MM_CONTEXT_VDSO_BASE=''
+      HAVE_STRUCT_N_DESC_STRUCT=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -76992,20 +82145,19 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.context.vdso" >&5
-+$as_echo_n "checking kernel for mm.context.vdso... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for cpu_gdt_descr" >&5
+-echo $ECHO_N "checking kernel for cpu_gdt_descr... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for cpu_gdt_descr" >&5
++$as_echo_n "checking kernel for cpu_gdt_descr... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for mm.context.vdso" >&5
--echo $ECHO_N "checking kernel for mm.context.vdso... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_CPU_GDT_DESCR+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_CPU_GDT_DESCR+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -31965,11 +23244,7 @@
+@@ -36213,11 +27258,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77018,7 +82170,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -31987,42 +23262,18 @@
+@@ -36237,42 +27278,18 @@
    return 0;
  }
  _ACEOF
@@ -77048,7 +82200,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO=yes
+ 	 cr_cv_kconfig_HAVE_CPU_GDT_DESCR=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -77057,56 +82209,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO=no
+ 	 cr_cv_kconfig_HAVE_CPU_GDT_DESCR=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -32030,33 +23281,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO
+@@ -36280,33 +27297,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_CPU_GDT_DESCR
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_CONTEXT_VDSO 1
+-#define HAVE_CPU_GDT_DESCR 1
 -_ACEOF
-+    $as_echo "#define HAVE_MM_CONTEXT_VDSO 1" >>confdefs.h
++    $as_echo "#define HAVE_CPU_GDT_DESCR 1" >>confdefs.h
  
-      HAVE_MM_CONTEXT_VDSO=1
+      HAVE_CPU_GDT_DESCR=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_CONTEXT_VDSO 0
+-#define HAVE_CPU_GDT_DESCR 0
 -_ACEOF
-+    $as_echo "#define HAVE_MM_CONTEXT_VDSO 0" >>confdefs.h
++    $as_echo "#define HAVE_CPU_GDT_DESCR 0" >>confdefs.h
  
-      HAVE_MM_CONTEXT_VDSO=''
+      HAVE_CPU_GDT_DESCR=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+   if test -n "${HAVE_CPU_GDT_DESCR}"; then
  
  
- 
--  echo "$as_me:$LINENO: checking kernel for thread_info.sysenter_return" >&5
--echo $ECHO_N "checking kernel for thread_info.sysenter_return... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread_info.sysenter_return" >&5
-+$as_echo_n "checking kernel for thread_info.sysenter_return... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for cpu_gdt_descr" >&5
+-echo $ECHO_N "checking kernel symbol table for cpu_gdt_descr... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for cpu_gdt_descr" >&5
++$as_echo_n "checking kernel symbol table for cpu_gdt_descr... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_cpu_gdt_descr+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN+set}" = set; then :
++    if ${cr_cv_ksymtab_cpu_gdt_descr+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -32067,11 +23313,7 @@
+     cr_cv_ksymtab_cpu_gdt_descr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}cpu_gdt_descr$/ {s/ .*//p;q;}"`
+@@ -36322,11 +27335,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77119,7 +82271,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -32089,42 +23331,18 @@
+@@ -36346,42 +27355,18 @@
    return 0;
  }
  _ACEOF
@@ -77149,7 +82301,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN=yes
+ 	 cr_cv_ksymtab_cpu_gdt_descr="Y$cr_cv_ksymtab_cpu_gdt_descr"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -77158,57 +82310,50 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN=no
+ 	 cr_cv_ksymtab_cpu_gdt_descr="N$cr_cv_ksymtab_cpu_gdt_descr"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -32132,34 +23350,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_INFO_SYSENTER_RETURN 1
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_INFO_SYSENTER_RETURN 1" >>confdefs.h
- 
-      HAVE_THREAD_INFO_SYSENTER_RETURN=1
+@@ -36392,9 +27377,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_INFO_SYSENTER_RETURN 0
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_INFO_SYSENTER_RETURN 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_cpu_gdt_descr" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol cpu_gdt_descr but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol cpu_gdt_descr but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol cpu_gdt_descr but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_cpu_gdt_descr | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -36410,18 +27393,18 @@
+ _ACEOF
  
-      HAVE_THREAD_INFO_SYSENTER_RETURN=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+   fi
  
- if test $CR_ARCH = arm; then
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread_info.tp_value" >&5
-+$as_echo_n "checking kernel for thread_info.tp_value... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for thread_info.tp_value" >&5
--echo $ECHO_N "checking kernel for thread_info.tp_value... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for cpu_gdt_table" >&5
+-echo $ECHO_N "checking kernel symbol table for cpu_gdt_table... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for cpu_gdt_table" >&5
++$as_echo_n "checking kernel symbol table for cpu_gdt_table... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_cpu_gdt_table+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE+set}" = set; then :
++    if ${cr_cv_ksymtab_cpu_gdt_table+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -32170,11 +23383,7 @@
+     cr_cv_ksymtab_cpu_gdt_table=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}cpu_gdt_table$/ {s/ .*//p;q;}"`
+@@ -36437,11 +27420,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77221,7 +82366,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -32192,42 +23401,18 @@
+@@ -36461,42 +27440,18 @@
    return 0;
  }
  _ACEOF
@@ -77251,7 +82396,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE=yes
+ 	 cr_cv_ksymtab_cpu_gdt_table="Y$cr_cv_ksymtab_cpu_gdt_table"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -77260,55 +82405,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE=no
+ 	 cr_cv_ksymtab_cpu_gdt_table="N$cr_cv_ksymtab_cpu_gdt_table"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -32235,32 +23420,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_INFO_TP_VALUE 1
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_INFO_TP_VALUE 1" >>confdefs.h
- 
-      HAVE_THREAD_INFO_TP_VALUE=1
+@@ -36507,9 +27462,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_INFO_TP_VALUE 0
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_INFO_TP_VALUE 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_cpu_gdt_table" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol cpu_gdt_table but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol cpu_gdt_table but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol cpu_gdt_table but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_cpu_gdt_table | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -36525,17 +27478,17 @@
+ _ACEOF
  
-      HAVE_THREAD_INFO_TP_VALUE=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for __kuser_helper_start" >&5
--echo $ECHO_N "checking kernel symbol table for __kuser_helper_start... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __kuser_helper_start" >&5
-+$as_echo_n "checking kernel symbol table for __kuser_helper_start... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for per_cpu__cpu_gdt_descr" >&5
+-echo $ECHO_N "checking kernel symbol table for per_cpu__cpu_gdt_descr... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for per_cpu__cpu_gdt_descr" >&5
++$as_echo_n "checking kernel symbol table for per_cpu__cpu_gdt_descr... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab___kuser_helper_start+set}" = set; then
+-    if test "${cr_cv_ksymtab_per_cpu__cpu_gdt_descr+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab___kuser_helper_start+set}" = set; then :
++    if ${cr_cv_ksymtab_per_cpu__cpu_gdt_descr+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab___kuser_helper_start=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__kuser_helper_start$/ {s/ .*//p;q;}"`
-@@ -32276,11 +23457,7 @@
+     cr_cv_ksymtab_per_cpu__cpu_gdt_descr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}per_cpu__cpu_gdt_descr$/ {s/ .*//p;q;}"`
+@@ -36551,11 +27504,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77321,7 +82460,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -32300,42 +23477,18 @@
+@@ -36575,42 +27524,18 @@
    return 0;
  }
  _ACEOF
@@ -77351,7 +82490,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab___kuser_helper_start="Y$cr_cv_ksymtab___kuser_helper_start"
+ 	 cr_cv_ksymtab_per_cpu__cpu_gdt_descr="Y$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -77360,14 +82499,25 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab___kuser_helper_start="N$cr_cv_ksymtab___kuser_helper_start"
+ 	 cr_cv_ksymtab_per_cpu__cpu_gdt_descr="N$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -32365,17 +23518,17 @@
+@@ -36621,9 +27546,7 @@
+     cr_result='not found'
+   else
+     if expr "$cr_cv_ksymtab_per_cpu__cpu_gdt_descr" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_per_cpu__cpu_gdt_descr | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -36639,19 +27562,18 @@
  _ACEOF
  
    fi
@@ -77378,20 +82528,22 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for __kuser_cmpxchg" >&5
--echo $ECHO_N "checking kernel symbol table for __kuser_cmpxchg... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __kuser_cmpxchg" >&5
-+$as_echo_n "checking kernel symbol table for __kuser_cmpxchg... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab___kuser_cmpxchg+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.sp0" >&5
++$as_echo_n "checking kernel for thread.sp0... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for thread.sp0" >&5
+-echo $ECHO_N "checking kernel for thread.sp0... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_THREAD_SP0+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab___kuser_cmpxchg+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_SP0+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab___kuser_cmpxchg=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__kuser_cmpxchg$/ {s/ .*//p;q;}"`
-@@ -32391,11 +23544,7 @@
+ 
+@@ -36662,11 +27584,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77404,7 +82556,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -32415,42 +23564,18 @@
+@@ -36684,42 +27602,18 @@
    return 0;
  }
  _ACEOF
@@ -77434,7 +82586,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab___kuser_cmpxchg="Y$cr_cv_ksymtab___kuser_cmpxchg"
+ 	 cr_cv_kconfig_HAVE_THREAD_SP0=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -77443,40 +82595,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab___kuser_cmpxchg="N$cr_cv_ksymtab___kuser_cmpxchg"
+ 	 cr_cv_kconfig_HAVE_THREAD_SP0=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -32480,19 +23605,18 @@
- _ACEOF
+ fi
+@@ -36727,33 +27621,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_SP0
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_SP0 1
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_SP0 1" >>confdefs.h
+ 
+      HAVE_THREAD_SP0=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_SP0 0
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_SP0 0" >>confdefs.h
  
+      HAVE_THREAD_SP0=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- fi
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for VSYSCALL_BASE" >&5
-+$as_echo_n "checking kernel for VSYSCALL_BASE... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for VSYSCALL_BASE" >&5
--echo $ECHO_N "checking kernel for VSYSCALL_BASE... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_VSYSCALL_BASE+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for thread.esp0" >&5
+-echo $ECHO_N "checking kernel for thread.esp0... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.esp0" >&5
++$as_echo_n "checking kernel for thread.esp0... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_THREAD_ESP0+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_VSYSCALL_BASE+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_ESP0+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -32503,11 +23627,7 @@
+@@ -36764,11 +27653,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77489,7 +82657,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -32527,42 +23647,18 @@
+@@ -36786,42 +27671,18 @@
    return 0;
  }
  _ACEOF
@@ -77519,7 +82687,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_VSYSCALL_BASE=yes
+ 	 cr_cv_kconfig_HAVE_THREAD_ESP0=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -77528,30 +82696,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_VSYSCALL_BASE=no
+ 	 cr_cv_kconfig_HAVE_THREAD_ESP0=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -32570,22 +23666,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_VSYSCALL_BASE
+@@ -36829,33 +27690,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_ESP0
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_VSYSCALL_BASE 1
+-#define HAVE_THREAD_ESP0 1
 -_ACEOF
-+    $as_echo "#define HAVE_VSYSCALL_BASE 1" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_ESP0 1" >>confdefs.h
  
-      HAVE_VSYSCALL_BASE=1
+      HAVE_THREAD_ESP0=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_VSYSCALL_BASE 0
+-#define HAVE_THREAD_ESP0 0
 -_ACEOF
-+    $as_echo "#define HAVE_VSYSCALL_BASE 0" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_ESP0 0" >>confdefs.h
  
-      HAVE_VSYSCALL_BASE=''
+      HAVE_THREAD_ESP0=''
    fi
  
  
@@ -77562,24 +82730,22 @@
  
  
  
-@@ -32594,12 +23686,11 @@
- 
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg arch_setup_additional_pages" >&5
-+$as_echo_n "checking kernel for 2-arg arch_setup_additional_pages... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.rsp0" >&5
++$as_echo_n "checking kernel for thread.rsp0... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 2-arg arch_setup_additional_pages" >&5
--echo $ECHO_N "checking kernel for 2-arg arch_setup_additional_pages... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for thread.rsp0" >&5
+-echo $ECHO_N "checking kernel for thread.rsp0... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_THREAD_RSP0+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_RSP0+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -32610,11 +23701,7 @@
+@@ -36866,11 +27722,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77592,7 +82758,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -32638,42 +23725,18 @@
+@@ -36888,42 +27740,18 @@
    return 0;
  }
  _ACEOF
@@ -77622,7 +82788,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=yes
+ 	 cr_cv_kconfig_HAVE_THREAD_RSP0=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -77631,30 +82797,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=no
+ 	 cr_cv_kconfig_HAVE_THREAD_RSP0=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -32681,23 +23744,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES
+@@ -36931,33 +27759,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_RSP0
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1
+-#define HAVE_THREAD_RSP0 1
 -_ACEOF
-+    $as_echo "#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_RSP0 1" >>confdefs.h
  
-      HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=1
+      HAVE_THREAD_RSP0=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0
+-#define HAVE_THREAD_RSP0 0
 -_ACEOF
-+    $as_echo "#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_RSP0 0" >>confdefs.h
  
-      HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=''
+      HAVE_THREAD_RSP0=''
    fi
  
  
@@ -77666,23 +82832,21 @@
  
  
  
-@@ -32707,11 +23765,11 @@
  
  
+-  echo "$as_me:$LINENO: checking kernel for thread.usersp" >&5
+-echo $ECHO_N "checking kernel for thread.usersp... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.usersp" >&5
++$as_echo_n "checking kernel for thread.usersp... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 4-arg arch_setup_additional_pages" >&5
--echo $ECHO_N "checking kernel for 4-arg arch_setup_additional_pages... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg arch_setup_additional_pages" >&5
-+$as_echo_n "checking kernel for 4-arg arch_setup_additional_pages... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_THREAD_USERSP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_USERSP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -32722,11 +23780,7 @@
+@@ -36968,11 +27791,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77695,7 +82859,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -32750,42 +23804,18 @@
+@@ -36990,42 +27809,18 @@
    return 0;
  }
  _ACEOF
@@ -77725,7 +82889,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=yes
+ 	 cr_cv_kconfig_HAVE_THREAD_USERSP=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -77734,30 +82898,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=no
+ 	 cr_cv_kconfig_HAVE_THREAD_USERSP=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -32793,22 +23823,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES
+@@ -37033,33 +27828,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_USERSP
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1
+-#define HAVE_THREAD_USERSP 1
 -_ACEOF
-+    $as_echo "#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_USERSP 1" >>confdefs.h
  
-      HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=1
+      HAVE_THREAD_USERSP=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0
+-#define HAVE_THREAD_USERSP 0
 -_ACEOF
-+    $as_echo "#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_USERSP 0" >>confdefs.h
  
-      HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=''
+      HAVE_THREAD_USERSP=''
    fi
  
  
@@ -77768,24 +82932,22 @@
  
  
  
-@@ -32816,12 +23842,12 @@
- if test -n "${HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES}${HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES}"; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for arch_setup_additional_pages" >&5
--echo $ECHO_N "checking kernel symbol table for arch_setup_additional_pages... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_setup_additional_pages" >&5
-+$as_echo_n "checking kernel symbol table for arch_setup_additional_pages... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_arch_setup_additional_pages+set}" = set; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.userrsp" >&5
++$as_echo_n "checking kernel for thread.userrsp... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for thread.userrsp" >&5
+-echo $ECHO_N "checking kernel for thread.userrsp... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_THREAD_USERRSP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_arch_setup_additional_pages+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_USERRSP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_arch_setup_additional_pages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_setup_additional_pages$/ {s/ .*//p;q;}"`
-@@ -32837,11 +23863,7 @@
+ 
+@@ -37070,11 +27860,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77798,7 +82960,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -32861,42 +23883,18 @@
+@@ -37092,42 +27878,18 @@
    return 0;
  }
  _ACEOF
@@ -77828,7 +82990,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_arch_setup_additional_pages="Y$cr_cv_ksymtab_arch_setup_additional_pages"
+ 	 cr_cv_kconfig_HAVE_THREAD_USERRSP=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -77837,51 +82999,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_arch_setup_additional_pages="N$cr_cv_ksymtab_arch_setup_additional_pages"
+ 	 cr_cv_kconfig_HAVE_THREAD_USERRSP=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -32907,9 +23905,7 @@
-     cr_result='not found'
+ fi
+@@ -37135,33 +27897,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_USERRSP
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_USERRSP 1
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_USERRSP 1" >>confdefs.h
+ 
+      HAVE_THREAD_USERRSP=1
    else
-     if expr "$cr_cv_ksymtab_arch_setup_additional_pages" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_arch_setup_additional_pages | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -32925,19 +23921,18 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_USERRSP 0
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_USERRSP 0" >>confdefs.h
  
+      HAVE_THREAD_USERRSP=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- fi
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for map_vsyscall" >&5
-+$as_echo_n "checking kernel for map_vsyscall... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for map_vsyscall" >&5
--echo $ECHO_N "checking kernel for map_vsyscall... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_MAP_VSYSCALL+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for thread.debugreg0" >&5
+-echo $ECHO_N "checking kernel for thread.debugreg0... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.debugreg0" >&5
++$as_echo_n "checking kernel for thread.debugreg0... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREG0+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_MAP_VSYSCALL+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_DEBUGREG0+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -32948,11 +23943,7 @@
+@@ -37172,11 +27929,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77894,7 +83061,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -32981,42 +23972,18 @@
+@@ -37194,42 +27947,18 @@
    return 0;
  }
  _ACEOF
@@ -77924,7 +83091,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MAP_VSYSCALL=yes
+ 	 cr_cv_kconfig_HAVE_THREAD_DEBUGREG0=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -77933,30 +83100,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MAP_VSYSCALL=no
+ 	 cr_cv_kconfig_HAVE_THREAD_DEBUGREG0=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -33024,33 +23991,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_MAP_VSYSCALL
+@@ -37237,33 +27966,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_DEBUGREG0
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MAP_VSYSCALL 1
+-#define HAVE_THREAD_DEBUGREG0 1
 -_ACEOF
-+    $as_echo "#define HAVE_MAP_VSYSCALL 1" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_DEBUGREG0 1" >>confdefs.h
  
-      HAVE_MAP_VSYSCALL=1
+      HAVE_THREAD_DEBUGREG0=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MAP_VSYSCALL 0
+-#define HAVE_THREAD_DEBUGREG0 0
 -_ACEOF
-+    $as_echo "#define HAVE_MAP_VSYSCALL 0" >>confdefs.h
++    $as_echo "#define HAVE_THREAD_DEBUGREG0 0" >>confdefs.h
  
-      HAVE_MAP_VSYSCALL=''
+      HAVE_THREAD_DEBUGREG0=''
    fi
  
  
@@ -77966,23 +83133,23 @@
 +$as_echo "$cr_result" >&6; }
  
  
- if test -n "${HAVE_MAP_VSYSCALL}"; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for map_vsyscall" >&5
--echo $ECHO_N "checking kernel symbol table for map_vsyscall... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for map_vsyscall" >&5
-+$as_echo_n "checking kernel symbol table for map_vsyscall... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_map_vsyscall+set}" = set; then
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.debugregs" >&5
++$as_echo_n "checking kernel for thread.debugregs... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for thread.debugregs" >&5
+-echo $ECHO_N "checking kernel for thread.debugregs... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREGS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_map_vsyscall+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_DEBUGREGS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_map_vsyscall=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}map_vsyscall$/ {s/ .*//p;q;}"`
-@@ -33066,11 +24029,7 @@
+ 
+@@ -37274,11 +27998,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -77995,7 +83162,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -33090,42 +24049,18 @@
+@@ -37296,42 +28016,18 @@
    return 0;
  }
  _ACEOF
@@ -78025,7 +83192,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_map_vsyscall="Y$cr_cv_ksymtab_map_vsyscall"
+ 	 cr_cv_kconfig_HAVE_THREAD_DEBUGREGS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78034,52 +83201,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_map_vsyscall="N$cr_cv_ksymtab_map_vsyscall"
+ 	 cr_cv_kconfig_HAVE_THREAD_DEBUGREGS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -33136,9 +24071,7 @@
-     cr_result='not found'
+ fi
+@@ -37339,33 +28035,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_DEBUGREGS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_DEBUGREGS 1
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_DEBUGREGS 1" >>confdefs.h
+ 
+      HAVE_THREAD_DEBUGREGS=1
    else
-     if expr "$cr_cv_ksymtab_map_vsyscall" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol map_vsyscall but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol map_vsyscall but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol map_vsyscall but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_map_vsyscall | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -33154,19 +24087,19 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_DEBUGREGS 0
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_DEBUGREGS 0" >>confdefs.h
  
+      HAVE_THREAD_DEBUGREGS=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- fi
--if test $CR_ARCH = x86_64; then
-+if test $CR_KARCH = x86_64; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for syscall32_setup_pages" >&5
--echo $ECHO_N "checking kernel symbol table for syscall32_setup_pages... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for syscall32_setup_pages" >&5
-+$as_echo_n "checking kernel symbol table for syscall32_setup_pages... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_syscall32_setup_pages+set}" = set; then
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for thread.ptrace_bps" >&5
+-echo $ECHO_N "checking kernel for thread.ptrace_bps... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.ptrace_bps" >&5
++$as_echo_n "checking kernel for thread.ptrace_bps... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_syscall32_setup_pages+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_syscall32_setup_pages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}syscall32_setup_pages$/ {s/ .*//p;q;}"`
-@@ -33182,11 +24115,7 @@
+ 
+@@ -37376,11 +28067,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -78092,7 +83263,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -33206,42 +24135,18 @@
+@@ -37400,42 +28087,18 @@
    return 0;
  }
  _ACEOF
@@ -78122,7 +83293,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_syscall32_setup_pages="Y$cr_cv_ksymtab_syscall32_setup_pages"
+ 	 cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78131,40 +83302,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_syscall32_setup_pages="N$cr_cv_ksymtab_syscall32_setup_pages"
+ 	 cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -33271,19 +24176,19 @@
- _ACEOF
+ fi
+@@ -37443,33 +28106,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_PTRACE_BPS 1
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_PTRACE_BPS 1" >>confdefs.h
+ 
+      HAVE_THREAD_PTRACE_BPS=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_PTRACE_BPS 0
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_PTRACE_BPS 0" >>confdefs.h
  
+      HAVE_THREAD_PTRACE_BPS=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- fi
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for arch_pick_mmap_layout" >&5
--echo $ECHO_N "checking kernel symbol table for arch_pick_mmap_layout... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_pick_mmap_layout" >&5
-+$as_echo_n "checking kernel symbol table for arch_pick_mmap_layout... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_arch_pick_mmap_layout+set}" = set; then
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.i387" >&5
++$as_echo_n "checking kernel for thread.i387... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for thread.i387" >&5
+-echo $ECHO_N "checking kernel for thread.i387... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_THREAD_I387+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_arch_pick_mmap_layout+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_I387+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_arch_pick_mmap_layout=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_pick_mmap_layout$/ {s/ .*//p;q;}"`
-@@ -33299,11 +24204,7 @@
+ 
+@@ -37480,11 +28138,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -78177,7 +83364,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -33323,42 +24224,18 @@
+@@ -37502,42 +28156,18 @@
    return 0;
  }
  _ACEOF
@@ -78207,7 +83394,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_arch_pick_mmap_layout="Y$cr_cv_ksymtab_arch_pick_mmap_layout"
+ 	 cr_cv_kconfig_HAVE_THREAD_I387=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78216,49 +83403,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_arch_pick_mmap_layout="N$cr_cv_ksymtab_arch_pick_mmap_layout"
+ 	 cr_cv_kconfig_HAVE_THREAD_I387=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -33369,9 +24246,7 @@
-     cr_result='not found'
+ fi
+@@ -37545,33 +28175,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_I387
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_I387 1
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_I387 1" >>confdefs.h
+ 
+      HAVE_THREAD_I387=1
    else
-     if expr "$cr_cv_ksymtab_arch_pick_mmap_layout" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_arch_pick_mmap_layout | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -33387,17 +24262,17 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_I387 0
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_I387 0" >>confdefs.h
  
+      HAVE_THREAD_I387=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for arch_get_unmaped_area" >&5
--echo $ECHO_N "checking kernel symbol table for arch_get_unmaped_area... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_get_unmaped_area" >&5
-+$as_echo_n "checking kernel symbol table for arch_get_unmaped_area... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_arch_get_unmaped_area+set}" = set; then
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for thread.xstate" >&5
+-echo $ECHO_N "checking kernel for thread.xstate... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.xstate" >&5
++$as_echo_n "checking kernel for thread.xstate... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_THREAD_XSTATE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_arch_get_unmaped_area+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_XSTATE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_arch_get_unmaped_area=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_get_unmaped_area$/ {s/ .*//p;q;}"`
-@@ -33413,11 +24288,7 @@
+ 
+@@ -37582,11 +28207,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -78271,7 +83465,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -33437,42 +24308,18 @@
+@@ -37604,42 +28225,18 @@
    return 0;
  }
  _ACEOF
@@ -78301,7 +83495,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_arch_get_unmaped_area="Y$cr_cv_ksymtab_arch_get_unmaped_area"
+ 	 cr_cv_kconfig_HAVE_THREAD_XSTATE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78310,49 +83504,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_arch_get_unmaped_area="N$cr_cv_ksymtab_arch_get_unmaped_area"
+ 	 cr_cv_kconfig_HAVE_THREAD_XSTATE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -33483,9 +24330,7 @@
-     cr_result='not found'
+ fi
+@@ -37647,33 +28244,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_XSTATE
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_XSTATE 1
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_XSTATE 1" >>confdefs.h
+ 
+      HAVE_THREAD_XSTATE=1
    else
-     if expr "$cr_cv_ksymtab_arch_get_unmaped_area" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_arch_get_unmaped_area | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -33501,17 +24346,17 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_XSTATE 0
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_XSTATE 0" >>confdefs.h
  
+      HAVE_THREAD_XSTATE=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for arch_unmap_area" >&5
--echo $ECHO_N "checking kernel symbol table for arch_unmap_area... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_unmap_area" >&5
-+$as_echo_n "checking kernel symbol table for arch_unmap_area... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_arch_unmap_area+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.fpu" >&5
++$as_echo_n "checking kernel for thread.fpu... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for thread.fpu" >&5
+-echo $ECHO_N "checking kernel for thread.fpu... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_THREAD_FPU+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_arch_unmap_area+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_THREAD_FPU+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_arch_unmap_area=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_unmap_area$/ {s/ .*//p;q;}"`
-@@ -33527,11 +24372,7 @@
+ 
+@@ -37684,11 +28276,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -78365,7 +83566,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -33551,42 +24392,18 @@
+@@ -37706,42 +28294,18 @@
    return 0;
  }
  _ACEOF
@@ -78395,7 +83596,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_arch_unmap_area="Y$cr_cv_ksymtab_arch_unmap_area"
+ 	 cr_cv_kconfig_HAVE_THREAD_FPU=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78404,50 +83605,57 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_arch_unmap_area="N$cr_cv_ksymtab_arch_unmap_area"
+ 	 cr_cv_kconfig_HAVE_THREAD_FPU=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -33597,9 +24414,7 @@
-     cr_result='not found'
+ fi
+@@ -37749,34 +28313,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_THREAD_FPU
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_FPU 1
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_FPU 1" >>confdefs.h
+ 
+      HAVE_THREAD_FPU=1
    else
-     if expr "$cr_cv_ksymtab_arch_unmap_area" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol arch_unmap_area but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol arch_unmap_area but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol arch_unmap_area but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_arch_unmap_area | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -33615,18 +24430,17 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_THREAD_FPU 0
+-_ACEOF
++    $as_echo "#define HAVE_THREAD_FPU 0" >>confdefs.h
  
+      HAVE_THREAD_FPU=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
 -
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
  
--  echo "$as_me:$LINENO: checking kernel for mm.mmap_base" >&5
--echo $ECHO_N "checking kernel for mm.mmap_base... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.mmap_base" >&5
-+$as_echo_n "checking kernel for mm.mmap_base... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_MM_MMAP_BASE+set}" = set; then
+ 
+-  echo "$as_me:$LINENO: checking kernel for pt_regs.eflags" >&5
+-echo $ECHO_N "checking kernel for pt_regs.eflags... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.eflags" >&5
++$as_echo_n "checking kernel for pt_regs.eflags... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_PT_REGS_EFLAGS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_MM_MMAP_BASE+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PT_REGS_EFLAGS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -33637,11 +24451,7 @@
+@@ -37787,11 +28346,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -78460,7 +83668,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -33659,42 +24469,18 @@
+@@ -37809,42 +28364,18 @@
    return 0;
  }
  _ACEOF
@@ -78490,7 +83698,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_MMAP_BASE=yes
+ 	 cr_cv_kconfig_HAVE_PT_REGS_EFLAGS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78499,30 +83707,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_MMAP_BASE=no
+ 	 cr_cv_kconfig_HAVE_PT_REGS_EFLAGS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -33702,33 +24488,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_MM_MMAP_BASE
+@@ -37852,33 +28383,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_EFLAGS
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_MMAP_BASE 1
+-#define HAVE_PT_REGS_EFLAGS 1
 -_ACEOF
-+    $as_echo "#define HAVE_MM_MMAP_BASE 1" >>confdefs.h
++    $as_echo "#define HAVE_PT_REGS_EFLAGS 1" >>confdefs.h
  
-      HAVE_MM_MMAP_BASE=1
+      HAVE_PT_REGS_EFLAGS=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_MMAP_BASE 0
+-#define HAVE_PT_REGS_EFLAGS 0
 -_ACEOF
-+    $as_echo "#define HAVE_MM_MMAP_BASE 0" >>confdefs.h
++    $as_echo "#define HAVE_PT_REGS_EFLAGS 0" >>confdefs.h
  
-      HAVE_MM_MMAP_BASE=''
+      HAVE_PT_REGS_EFLAGS=''
    fi
  
  
@@ -78535,20 +83743,20 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.cached_hole_size" >&5
-+$as_echo_n "checking kernel for mm.cached_hole_size... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.flags" >&5
++$as_echo_n "checking kernel for pt_regs.flags... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for mm.cached_hole_size" >&5
--echo $ECHO_N "checking kernel for mm.cached_hole_size... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for pt_regs.flags" >&5
+-echo $ECHO_N "checking kernel for pt_regs.flags... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_PT_REGS_FLAGS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PT_REGS_FLAGS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -33739,11 +24520,7 @@
+@@ -37889,11 +28415,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -78561,7 +83769,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -33761,42 +24538,18 @@
+@@ -37911,42 +28433,18 @@
    return 0;
  }
  _ACEOF
@@ -78591,7 +83799,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE=yes
+ 	 cr_cv_kconfig_HAVE_PT_REGS_FLAGS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78600,36 +83808,35 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE=no
+ 	 cr_cv_kconfig_HAVE_PT_REGS_FLAGS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -33804,34 +24557,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE
+@@ -37954,33 +28452,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_FLAGS
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_CACHED_HOLE_SIZE 1
+-#define HAVE_PT_REGS_FLAGS 1
 -_ACEOF
-+    $as_echo "#define HAVE_MM_CACHED_HOLE_SIZE 1" >>confdefs.h
++    $as_echo "#define HAVE_PT_REGS_FLAGS 1" >>confdefs.h
  
-      HAVE_MM_CACHED_HOLE_SIZE=1
+      HAVE_PT_REGS_FLAGS=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_CACHED_HOLE_SIZE 0
+-#define HAVE_PT_REGS_FLAGS 0
 -_ACEOF
-+    $as_echo "#define HAVE_MM_CACHED_HOLE_SIZE 0" >>confdefs.h
++    $as_echo "#define HAVE_PT_REGS_FLAGS 0" >>confdefs.h
  
-      HAVE_MM_CACHED_HOLE_SIZE=''
+      HAVE_PT_REGS_FLAGS=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -78637,20 +83844,20 @@
  
  
  
- 
--  echo "$as_me:$LINENO: checking kernel for CONFIG_HUGETLBFS" >&5
--echo $ECHO_N "checking kernel for CONFIG_HUGETLBFS... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for CONFIG_HUGETLBFS" >&5
-+$as_echo_n "checking kernel for CONFIG_HUGETLBFS... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for init_fpu" >&5
+-echo $ECHO_N "checking kernel symbol table for init_fpu... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for init_fpu" >&5
++$as_echo_n "checking kernel symbol table for init_fpu... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_init_fpu+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS+set}" = set; then :
++    if ${cr_cv_ksymtab_init_fpu+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -33842,11 +24590,7 @@
+     cr_cv_ksymtab_init_fpu=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}init_fpu$/ {s/ .*//p;q;}"`
+@@ -37996,11 +28490,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -78663,7 +83870,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -33867,42 +24611,18 @@
+@@ -38020,42 +28510,18 @@
    return 0;
  }
  _ACEOF
@@ -78693,7 +83900,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS=yes
+ 	 cr_cv_ksymtab_init_fpu="Y$cr_cv_ksymtab_init_fpu"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78702,56 +83909,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS=no
+ 	 cr_cv_ksymtab_init_fpu="N$cr_cv_ksymtab_init_fpu"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -33910,33 +24630,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_CONFIG_HUGETLBFS 1
--_ACEOF
-+    $as_echo "#define HAVE_CONFIG_HUGETLBFS 1" >>confdefs.h
- 
-      HAVE_CONFIG_HUGETLBFS=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_CONFIG_HUGETLBFS 0
--_ACEOF
-+    $as_echo "#define HAVE_CONFIG_HUGETLBFS 0" >>confdefs.h
+@@ -38085,17 +28551,17 @@
+ _ACEOF
  
-      HAVE_CONFIG_HUGETLBFS=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
- if test -n "${HAVE_CONFIG_HUGETLBFS}"; then
- 
  
--  echo "$as_me:$LINENO: checking kernel symbol table for hugetlbfs_file_operations" >&5
--echo $ECHO_N "checking kernel symbol table for hugetlbfs_file_operations... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for hugetlbfs_file_operations" >&5
-+$as_echo_n "checking kernel symbol table for hugetlbfs_file_operations... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for xstate_size" >&5
+-echo $ECHO_N "checking kernel symbol table for xstate_size... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for xstate_size" >&5
++$as_echo_n "checking kernel symbol table for xstate_size... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_hugetlbfs_file_operations+set}" = set; then
+-    if test "${cr_cv_ksymtab_xstate_size+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_hugetlbfs_file_operations+set}" = set; then :
++    if ${cr_cv_ksymtab_xstate_size+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_hugetlbfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}hugetlbfs_file_operations$/ {s/ .*//p;q;}"`
-@@ -33952,11 +24668,7 @@
+     cr_cv_ksymtab_xstate_size=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}xstate_size$/ {s/ .*//p;q;}"`
+@@ -38111,11 +28577,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -78764,7 +83953,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -33976,42 +24688,18 @@
+@@ -38135,42 +28597,18 @@
    return 0;
  }
  _ACEOF
@@ -78794,7 +83983,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_hugetlbfs_file_operations="Y$cr_cv_ksymtab_hugetlbfs_file_operations"
+ 	 cr_cv_ksymtab_xstate_size="Y$cr_cv_ksymtab_xstate_size"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78803,38 +83992,40 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_hugetlbfs_file_operations="N$cr_cv_ksymtab_hugetlbfs_file_operations"
+ 	 cr_cv_ksymtab_xstate_size="N$cr_cv_ksymtab_xstate_size"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -34041,17 +24729,17 @@
+@@ -38200,19 +28638,18 @@
  _ACEOF
  
    fi
 -    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for is_file_shm_hugepages" >&5
--echo $ECHO_N "checking kernel symbol table for is_file_shm_hugepages... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for is_file_shm_hugepages" >&5
-+$as_echo_n "checking kernel symbol table for is_file_shm_hugepages... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_is_file_shm_hugepages+set}" = set; then
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for restore_fpu_checking" >&5
+-echo $ECHO_N "checking kernel for restore_fpu_checking... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for restore_fpu_checking" >&5
++$as_echo_n "checking kernel for restore_fpu_checking... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_is_file_shm_hugepages+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_is_file_shm_hugepages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}is_file_shm_hugepages$/ {s/ .*//p;q;}"`
-@@ -34067,11 +24755,7 @@
+ 
+@@ -38223,11 +28660,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -78847,7 +84038,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -34091,42 +24775,18 @@
+@@ -38251,42 +28684,18 @@
    return 0;
  }
  _ACEOF
@@ -78877,7 +84068,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_is_file_shm_hugepages="Y$cr_cv_ksymtab_is_file_shm_hugepages"
+ 	 cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78886,38 +84077,57 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_is_file_shm_hugepages="N$cr_cv_ksymtab_is_file_shm_hugepages"
+ 	 cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -34156,17 +24816,17 @@
- _ACEOF
+ fi
+@@ -38294,34 +28703,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_RESTORE_FPU_CHECKING 1
+-_ACEOF
++    $as_echo "#define HAVE_RESTORE_FPU_CHECKING 1" >>confdefs.h
  
+      HAVE_RESTORE_FPU_CHECKING=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_RESTORE_FPU_CHECKING 0
+-_ACEOF
++    $as_echo "#define HAVE_RESTORE_FPU_CHECKING 0" >>confdefs.h
+ 
+      HAVE_RESTORE_FPU_CHECKING=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+   if test -n "${HAVE_RESTORE_FPU_CHECKING}"; then
  
--  echo "$as_me:$LINENO: checking kernel symbol table for hugepage_vma" >&5
--echo $ECHO_N "checking kernel symbol table for hugepage_vma... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for hugepage_vma" >&5
-+$as_echo_n "checking kernel symbol table for hugepage_vma... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_hugepage_vma+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.0 restore_fpu_checking" >&5
++$as_echo_n "checking kernel for 2.6.0 restore_fpu_checking... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2.6.0 restore_fpu_checking" >&5
+-echo $ECHO_N "checking kernel for 2.6.0 restore_fpu_checking... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_hugepage_vma+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_hugepage_vma=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}hugepage_vma$/ {s/ .*//p;q;}"`
-@@ -34182,11 +24842,7 @@
+ 
+@@ -38332,11 +28736,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -78930,7 +84140,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -34206,42 +24862,18 @@
+@@ -38354,42 +28754,18 @@
    return 0;
  }
  _ACEOF
@@ -78960,7 +84170,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_hugepage_vma="Y$cr_cv_ksymtab_hugepage_vma"
+ 	 cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -78969,38 +84179,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_hugepage_vma="N$cr_cv_ksymtab_hugepage_vma"
+ 	 cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -34271,17 +24903,17 @@
- _ACEOF
+ fi
+@@ -38397,33 +28773,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_0_RESTORE_FPU_CHECKING 1
+-_ACEOF
++    $as_echo "#define HAVE_2_6_0_RESTORE_FPU_CHECKING 1" >>confdefs.h
+ 
+      HAVE_2_6_0_RESTORE_FPU_CHECKING=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_0_RESTORE_FPU_CHECKING 0
+-_ACEOF
++    $as_echo "#define HAVE_2_6_0_RESTORE_FPU_CHECKING 0" >>confdefs.h
  
+      HAVE_2_6_0_RESTORE_FPU_CHECKING=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for pmd_huge" >&5
--echo $ECHO_N "checking kernel symbol table for pmd_huge... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pmd_huge" >&5
-+$as_echo_n "checking kernel symbol table for pmd_huge... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_pmd_huge+set}" = set; then
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2.6.28 restore_fpu_checking" >&5
+-echo $ECHO_N "checking kernel for 2.6.28 restore_fpu_checking... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.28 restore_fpu_checking" >&5
++$as_echo_n "checking kernel for 2.6.28 restore_fpu_checking... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_pmd_huge+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_pmd_huge=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}pmd_huge$/ {s/ .*//p;q;}"`
-@@ -34297,11 +24929,7 @@
+ 
+@@ -38434,11 +28805,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -79013,7 +84241,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -34321,42 +24949,18 @@
+@@ -38456,42 +28823,18 @@
    return 0;
  }
  _ACEOF
@@ -79043,7 +84271,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pmd_huge="Y$cr_cv_ksymtab_pmd_huge"
+ 	 cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -79052,38 +84280,159 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pmd_huge="N$cr_cv_ksymtab_pmd_huge"
+ 	 cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -34386,17 +24990,17 @@
- _ACEOF
+ fi
+@@ -38499,22 +28842,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_28_RESTORE_FPU_CHECKING 1
+-_ACEOF
++    $as_echo "#define HAVE_2_6_28_RESTORE_FPU_CHECKING 1" >>confdefs.h
+ 
+      HAVE_2_6_28_RESTORE_FPU_CHECKING=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_28_RESTORE_FPU_CHECKING 0
+-_ACEOF
++    $as_echo "#define HAVE_2_6_28_RESTORE_FPU_CHECKING 0" >>confdefs.h
+ 
+      HAVE_2_6_28_RESTORE_FPU_CHECKING=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+     if test "${HAVE_2_6_0_RESTORE_FPU_CHECKING}${HAVE_2_6_28_RESTORE_FPU_CHECKING}" != "1"; then
+@@ -38537,39 +28876,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -38583,9 +28953,7 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" "$LINENO" 5
  
+     fi
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
+@@ -38595,12 +28963,11 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for follow_huge_pmd" >&5
--echo $ECHO_N "checking kernel symbol table for follow_huge_pmd... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for follow_huge_pmd" >&5
-+$as_echo_n "checking kernel symbol table for follow_huge_pmd... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_follow_huge_pmd+set}" = set; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.xcs" >&5
++$as_echo_n "checking kernel for pt_regs.xcs... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for pt_regs.xcs" >&5
+-echo $ECHO_N "checking kernel for pt_regs.xcs... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_PT_REGS_XCS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_follow_huge_pmd+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PT_REGS_XCS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_follow_huge_pmd=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}follow_huge_pmd$/ {s/ .*//p;q;}"`
-@@ -34412,11 +25016,7 @@
+ 
+@@ -38611,11 +28978,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -79096,7 +84445,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -34436,42 +25036,18 @@
+@@ -38633,42 +28996,18 @@
    return 0;
  }
  _ACEOF
@@ -79126,7 +84475,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_follow_huge_pmd="Y$cr_cv_ksymtab_follow_huge_pmd"
+ 	 cr_cv_kconfig_HAVE_PT_REGS_XCS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -79135,38 +84484,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_follow_huge_pmd="N$cr_cv_ksymtab_follow_huge_pmd"
+ 	 cr_cv_kconfig_HAVE_PT_REGS_XCS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -34501,17 +25077,17 @@
- _ACEOF
+ fi
+@@ -38676,33 +29015,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XCS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PT_REGS_XCS 1
+-_ACEOF
++    $as_echo "#define HAVE_PT_REGS_XCS 1" >>confdefs.h
+ 
+      HAVE_PT_REGS_XCS=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PT_REGS_XCS 0
+-_ACEOF
++    $as_echo "#define HAVE_PT_REGS_XCS 0" >>confdefs.h
  
+      HAVE_PT_REGS_XCS=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for follow_huge_addr" >&5
--echo $ECHO_N "checking kernel symbol table for follow_huge_addr... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for follow_huge_addr" >&5
-+$as_echo_n "checking kernel symbol table for follow_huge_addr... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_follow_huge_addr+set}" = set; then
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for pt_regs.xfs" >&5
+-echo $ECHO_N "checking kernel for pt_regs.xfs... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.xfs" >&5
++$as_echo_n "checking kernel for pt_regs.xfs... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_PT_REGS_XFS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_follow_huge_addr+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PT_REGS_XFS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_follow_huge_addr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}follow_huge_addr$/ {s/ .*//p;q;}"`
-@@ -34527,11 +25103,7 @@
+ 
+@@ -38713,11 +29047,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -79179,7 +84546,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -34551,42 +25123,18 @@
+@@ -38735,42 +29065,18 @@
    return 0;
  }
  _ACEOF
@@ -79209,7 +84576,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_follow_huge_addr="Y$cr_cv_ksymtab_follow_huge_addr"
+ 	 cr_cv_kconfig_HAVE_PT_REGS_XFS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -79218,53 +84585,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_follow_huge_addr="N$cr_cv_ksymtab_follow_huge_addr"
+ 	 cr_cv_kconfig_HAVE_PT_REGS_XFS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -34597,9 +25145,7 @@
-     cr_result='not found'
+ fi
+@@ -38778,33 +29084,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XFS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PT_REGS_XFS 1
+-_ACEOF
++    $as_echo "#define HAVE_PT_REGS_XFS 1" >>confdefs.h
+ 
+      HAVE_PT_REGS_XFS=1
    else
-     if expr "$cr_cv_ksymtab_follow_huge_addr" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol follow_huge_addr but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol follow_huge_addr but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol follow_huge_addr but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_follow_huge_addr | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -34615,8 +25161,8 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PT_REGS_XFS 0
+-_ACEOF
++    $as_echo "#define HAVE_PT_REGS_XFS 0" >>confdefs.h
  
+      HAVE_PT_REGS_XFS=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-  # Must have prototype, or NARGS probe will fail
  
  
-@@ -34624,12 +25170,11 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg follow_huge_addr" >&5
-+$as_echo_n "checking kernel for 3-arg follow_huge_addr... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.xgs" >&5
++$as_echo_n "checking kernel for pt_regs.xgs... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 3-arg follow_huge_addr" >&5
--echo $ECHO_N "checking kernel for 3-arg follow_huge_addr... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for pt_regs.xgs" >&5
+-echo $ECHO_N "checking kernel for pt_regs.xgs... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_PT_REGS_XGS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PT_REGS_XGS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -34640,11 +25185,7 @@
+@@ -38815,11 +29116,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -79277,7 +84647,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -34666,42 +25207,18 @@
+@@ -38837,42 +29134,18 @@
    return 0;
  }
  _ACEOF
@@ -79307,7 +84677,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR=yes
+ 	 cr_cv_kconfig_HAVE_PT_REGS_XGS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -79316,30 +84686,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR=no
+ 	 cr_cv_kconfig_HAVE_PT_REGS_XGS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -34709,23 +25226,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR
+@@ -38880,33 +29153,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XGS
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 1
+-#define HAVE_PT_REGS_XGS 1
 -_ACEOF
-+    $as_echo "#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 1" >>confdefs.h
++    $as_echo "#define HAVE_PT_REGS_XGS 1" >>confdefs.h
  
-      HAVE_3_ARG_FOLLOW_HUGE_ADDR=1
+      HAVE_PT_REGS_XGS=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 0
+-#define HAVE_PT_REGS_XGS 0
 -_ACEOF
-+    $as_echo "#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 0" >>confdefs.h
++    $as_echo "#define HAVE_PT_REGS_XGS 0" >>confdefs.h
  
-      HAVE_3_ARG_FOLLOW_HUGE_ADDR=''
+      HAVE_PT_REGS_XGS=''
    fi
  
  
@@ -79351,23 +84721,21 @@
  
  
  
-@@ -34735,11 +25247,11 @@
- 
  
  
--  echo "$as_me:$LINENO: checking kernel for 4-arg follow_huge_addr" >&5
--echo $ECHO_N "checking kernel for 4-arg follow_huge_addr... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg follow_huge_addr" >&5
-+$as_echo_n "checking kernel for 4-arg follow_huge_addr... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for pt_regs.cs" >&5
+-echo $ECHO_N "checking kernel for pt_regs.cs... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.cs" >&5
++$as_echo_n "checking kernel for pt_regs.cs... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_PT_REGS_CS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PT_REGS_CS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -34750,11 +25262,7 @@
+@@ -38917,11 +29185,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -79380,7 +84748,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -34776,42 +25284,18 @@
+@@ -38939,42 +29203,18 @@
    return 0;
  }
  _ACEOF
@@ -79410,7 +84778,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR=yes
+ 	 cr_cv_kconfig_HAVE_PT_REGS_CS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -79419,30 +84787,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR=no
+ 	 cr_cv_kconfig_HAVE_PT_REGS_CS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -34819,22 +25303,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR
+@@ -38982,33 +29222,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_CS
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 1
+-#define HAVE_PT_REGS_CS 1
 -_ACEOF
-+    $as_echo "#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 1" >>confdefs.h
++    $as_echo "#define HAVE_PT_REGS_CS 1" >>confdefs.h
  
-      HAVE_4_ARG_FOLLOW_HUGE_ADDR=1
+      HAVE_PT_REGS_CS=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 0
+-#define HAVE_PT_REGS_CS 0
 -_ACEOF
-+    $as_echo "#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 0" >>confdefs.h
++    $as_echo "#define HAVE_PT_REGS_CS 0" >>confdefs.h
  
-      HAVE_4_ARG_FOLLOW_HUGE_ADDR=''
+      HAVE_PT_REGS_CS=''
    fi
  
  
@@ -79453,113 +84821,22 @@
  
  
  
-@@ -34859,39 +25339,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -34905,9 +25405,7 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" "$LINENO" 5
  
-   fi
- fi
-@@ -34920,12 +25418,12 @@
-   sparc*)
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.fs" >&5
++$as_echo_n "checking kernel for pt_regs.fs... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel symbol table for mem_map_zero" >&5
--echo $ECHO_N "checking kernel symbol table for mem_map_zero... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for mem_map_zero" >&5
-+$as_echo_n "checking kernel symbol table for mem_map_zero... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_mem_map_zero+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for pt_regs.fs" >&5
+-echo $ECHO_N "checking kernel for pt_regs.fs... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_PT_REGS_FS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_mem_map_zero+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PT_REGS_FS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_mem_map_zero=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}mem_map_zero$/ {s/ .*//p;q;}"`
-@@ -34941,11 +25439,7 @@
+ 
+@@ -39019,11 +29254,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -79572,7 +84849,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -34965,42 +25459,18 @@
+@@ -39041,42 +29272,18 @@
    return 0;
  }
  _ACEOF
@@ -79602,7 +84879,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_mem_map_zero="Y$cr_cv_ksymtab_mem_map_zero"
+ 	 cr_cv_kconfig_HAVE_PT_REGS_FS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -79611,52 +84888,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_mem_map_zero="N$cr_cv_ksymtab_mem_map_zero"
+ 	 cr_cv_kconfig_HAVE_PT_REGS_FS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -35011,9 +25481,7 @@
-     cr_result='not found'
+ fi
+@@ -39084,33 +29291,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_FS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PT_REGS_FS 1
+-_ACEOF
++    $as_echo "#define HAVE_PT_REGS_FS 1" >>confdefs.h
+ 
+      HAVE_PT_REGS_FS=1
    else
-     if expr "$cr_cv_ksymtab_mem_map_zero" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol mem_map_zero but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol mem_map_zero but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol mem_map_zero but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_mem_map_zero | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -35029,20 +25497,20 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PT_REGS_FS 0
+-_ACEOF
++    $as_echo "#define HAVE_PT_REGS_FS 0" >>confdefs.h
  
+      HAVE_PT_REGS_FS=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
-     ZERO_PAGE_SYMBOL=mem_map_zero
-     ;;
-   *)
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for empty_zero_page" >&5
--echo $ECHO_N "checking kernel symbol table for empty_zero_page... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for empty_zero_page" >&5
-+$as_echo_n "checking kernel symbol table for empty_zero_page... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_empty_zero_page+set}" = set; then
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for pt_regs.gs" >&5
+-echo $ECHO_N "checking kernel for pt_regs.gs... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.gs" >&5
++$as_echo_n "checking kernel for pt_regs.gs... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_PT_REGS_GS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_empty_zero_page+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PT_REGS_GS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_empty_zero_page=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}empty_zero_page$/ {s/ .*//p;q;}"`
-@@ -35058,11 +25526,7 @@
+ 
+@@ -39121,11 +29323,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -79669,7 +84950,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -35082,42 +25546,18 @@
+@@ -39143,42 +29341,18 @@
    return 0;
  }
  _ACEOF
@@ -79699,7 +84980,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_empty_zero_page="Y$cr_cv_ksymtab_empty_zero_page"
+ 	 cr_cv_kconfig_HAVE_PT_REGS_GS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -79708,61 +84989,58 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_empty_zero_page="N$cr_cv_ksymtab_empty_zero_page"
+ 	 cr_cv_kconfig_HAVE_PT_REGS_GS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -35128,9 +25568,7 @@
-     cr_result='not found'
+ fi
+@@ -39186,22 +29360,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_GS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PT_REGS_GS 1
+-_ACEOF
++    $as_echo "#define HAVE_PT_REGS_GS 1" >>confdefs.h
+ 
+      HAVE_PT_REGS_GS=1
    else
-     if expr "$cr_cv_ksymtab_empty_zero_page" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol empty_zero_page but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol empty_zero_page but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol empty_zero_page but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_empty_zero_page | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -35146,28 +25584,25 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PT_REGS_GS 0
+-_ACEOF
++    $as_echo "#define HAVE_PT_REGS_GS 0" >>confdefs.h
  
+      HAVE_PT_REGS_GS=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
-     ZERO_PAGE_SYMBOL=empty_zero_page
-     ;;
- esac
- if test -z "$cr_addr"; then
--  { { echo "$as_me:$LINENO: error: failed to find symbol $ZERO_PAGE_SYMBOL" >&5
--echo "$as_me: error: failed to find symbol $ZERO_PAGE_SYMBOL" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error $? "failed to find symbol $ZERO_PAGE_SYMBOL" "$LINENO" 5
- fi
  
- # How to check for permission
+ fi
+@@ -39209,12 +29379,11 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode_permission" >&5
-+$as_echo_n "checking kernel for inode_permission... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode sem" >&5
++$as_echo_n "checking kernel for inode sem... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for inode_permission" >&5
--echo $ECHO_N "checking kernel for inode_permission... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for inode sem" >&5
+-echo $ECHO_N "checking kernel for inode sem... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_INODE_PERMISSION+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_INODE_SEM+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_INODE_PERMISSION+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_INODE_SEM+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -35178,11 +25613,7 @@
+@@ -39225,11 +29394,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -79775,7 +85053,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -35206,42 +25637,18 @@
+@@ -39250,42 +29415,18 @@
    return 0;
  }
  _ACEOF
@@ -79805,7 +85083,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_INODE_PERMISSION=yes
+ 	 cr_cv_kconfig_HAVE_INODE_SEM=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -79814,35 +85092,36 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_INODE_PERMISSION=no
+ 	 cr_cv_kconfig_HAVE_INODE_SEM=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -35249,33 +25656,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_INODE_PERMISSION
+@@ -39293,33 +29434,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_INODE_SEM
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_INODE_PERMISSION 1
+-#define HAVE_INODE_SEM 1
 -_ACEOF
-+    $as_echo "#define HAVE_INODE_PERMISSION 1" >>confdefs.h
++    $as_echo "#define HAVE_INODE_SEM 1" >>confdefs.h
  
-      HAVE_INODE_PERMISSION=1
+      HAVE_INODE_SEM=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_INODE_PERMISSION 0
+-#define HAVE_INODE_SEM 0
 -_ACEOF
-+    $as_echo "#define HAVE_INODE_PERMISSION 0" >>confdefs.h
++    $as_echo "#define HAVE_INODE_SEM 0" >>confdefs.h
  
-      HAVE_INODE_PERMISSION=''
+      HAVE_INODE_SEM=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -79850,20 +85129,19 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for permission" >&5
-+$as_echo_n "checking kernel for permission... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for inode mutex" >&5
+-echo $ECHO_N "checking kernel for inode mutex... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode mutex" >&5
++$as_echo_n "checking kernel for inode mutex... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for permission" >&5
--echo $ECHO_N "checking kernel for permission... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_PERMISSION+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_INODE_MUTEX+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PERMISSION+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_INODE_MUTEX+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -35286,11 +25688,7 @@
+@@ -39330,11 +29466,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -79876,7 +85154,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -35314,42 +25712,18 @@
+@@ -39356,42 +29488,18 @@
    return 0;
  }
  _ACEOF
@@ -79906,7 +85184,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PERMISSION=yes
+ 	 cr_cv_kconfig_HAVE_INODE_MUTEX=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -79915,30 +85193,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PERMISSION=no
+ 	 cr_cv_kconfig_HAVE_INODE_MUTEX=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -35357,22 +25731,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_PERMISSION
+@@ -39399,22 +29507,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_INODE_MUTEX
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PERMISSION 1
+-#define HAVE_INODE_MUTEX 1
 -_ACEOF
-+    $as_echo "#define HAVE_PERMISSION 1" >>confdefs.h
++    $as_echo "#define HAVE_INODE_MUTEX 1" >>confdefs.h
  
-      HAVE_PERMISSION=1
+      HAVE_INODE_MUTEX=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PERMISSION 0
+-#define HAVE_INODE_MUTEX 0
 -_ACEOF
-+    $as_echo "#define HAVE_PERMISSION 0" >>confdefs.h
++    $as_echo "#define HAVE_INODE_MUTEX 0" >>confdefs.h
  
-      HAVE_PERMISSION=''
+      HAVE_INODE_MUTEX=''
    fi
  
  
@@ -79948,8 +85226,8 @@
 +$as_echo "$cr_result" >&6; }
  
  
- if test -z "${HAVE_INODE_PERMISSION}${HAVE_PERMISSION}"; then
-@@ -35395,39 +25765,59 @@
+ # Allow exactly one match
+@@ -39438,39 +29542,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -80012,132 +85290,61 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -35441,21 +25831,19 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" "$LINENO" 5
- 
- fi
- 
- # Bits for save/restore of pending signals
- 
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for copy_siginfo_to_user" >&5
--echo $ECHO_N "checking kernel symbol table for copy_siginfo_to_user... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for copy_siginfo_to_user" >&5
-+$as_echo_n "checking kernel symbol table for copy_siginfo_to_user... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_copy_siginfo_to_user+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_copy_siginfo_to_user+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
-     cr_cv_ksymtab_copy_siginfo_to_user=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_siginfo_to_user$/ {s/ .*//p;q;}"`
-@@ -35471,11 +25859,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 		 #include <linux/kernel.h>
-@@ -35495,42 +25879,18 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_copy_siginfo_to_user="Y$cr_cv_ksymtab_copy_siginfo_to_user"
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_copy_siginfo_to_user="N$cr_cv_ksymtab_copy_siginfo_to_user"
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ rm -f confcache
+@@ -39484,21 +29619,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
  
-     fi
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" "$LINENO" 5
  
-@@ -35560,17 +25920,17 @@
- _ACEOF
+ fi
  
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for group_send_sig_info" >&5
--echo $ECHO_N "checking kernel symbol table for group_send_sig_info... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for group_send_sig_info" >&5
-+$as_echo_n "checking kernel symbol table for group_send_sig_info... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_group_send_sig_info+set}" = set; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.dumpable" >&5
++$as_echo_n "checking kernel for mm.dumpable... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for mm.dumpable" >&5
+-echo $ECHO_N "checking kernel for mm.dumpable... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_MM_DUMPABLE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_group_send_sig_info+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_MM_DUMPABLE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_group_send_sig_info=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}group_send_sig_info$/ {s/ .*//p;q;}"`
-@@ -35586,11 +25946,7 @@
+ 
+@@ -39509,11 +29641,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -80150,7 +85357,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -35610,42 +25966,18 @@
+@@ -39531,42 +29659,18 @@
    return 0;
  }
  _ACEOF
@@ -80180,7 +85387,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_group_send_sig_info="Y$cr_cv_ksymtab_group_send_sig_info"
+ 	 cr_cv_kconfig_HAVE_MM_DUMPABLE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -80189,40 +85396,55 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_group_send_sig_info="N$cr_cv_ksymtab_group_send_sig_info"
+ 	 cr_cv_kconfig_HAVE_MM_DUMPABLE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -35675,19 +26007,19 @@
- _ACEOF
+ fi
+@@ -39574,32 +29678,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_MM_DUMPABLE
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MM_DUMPABLE 1
+-_ACEOF
++    $as_echo "#define HAVE_MM_DUMPABLE 1" >>confdefs.h
+ 
+      HAVE_MM_DUMPABLE=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MM_DUMPABLE 0
+-_ACEOF
++    $as_echo "#define HAVE_MM_DUMPABLE 0" >>confdefs.h
  
+      HAVE_MM_DUMPABLE=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
- # For save/restore of sigaltstack
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for do_sigaltstack" >&5
--echo $ECHO_N "checking kernel symbol table for do_sigaltstack... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_sigaltstack" >&5
-+$as_echo_n "checking kernel symbol table for do_sigaltstack... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for get_dumpable" >&5
+-echo $ECHO_N "checking kernel symbol table for get_dumpable... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for get_dumpable" >&5
++$as_echo_n "checking kernel symbol table for get_dumpable... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_do_sigaltstack+set}" = set; then
+-    if test "${cr_cv_ksymtab_get_dumpable+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_do_sigaltstack+set}" = set; then :
++    if ${cr_cv_ksymtab_get_dumpable+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_do_sigaltstack=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_sigaltstack$/ {s/ .*//p;q;}"`
-@@ -35703,11 +26035,7 @@
+     cr_cv_ksymtab_get_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}get_dumpable$/ {s/ .*//p;q;}"`
+@@ -39615,11 +29715,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -80235,7 +85457,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -35727,42 +26055,18 @@
+@@ -39639,42 +29735,18 @@
    return 0;
  }
  _ACEOF
@@ -80265,7 +85487,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_do_sigaltstack="Y$cr_cv_ksymtab_do_sigaltstack"
+ 	 cr_cv_ksymtab_get_dumpable="Y$cr_cv_ksymtab_get_dumpable"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -80274,14 +85496,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_do_sigaltstack="N$cr_cv_ksymtab_do_sigaltstack"
+ 	 cr_cv_ksymtab_get_dumpable="N$cr_cv_ksymtab_get_dumpable"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -35792,20 +26096,19 @@
+@@ -39704,8 +29776,8 @@
  _ACEOF
  
    fi
@@ -80290,26 +85512,126 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+ # Allow one or more match(es)
+ if test -z "${HAVE_MM_DUMPABLE}${cr_addr}"; then
+@@ -39728,39 +29800,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -39774,21 +29877,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" "$LINENO" 5
  
--if test $CR_ARCH = i386 -o $CR_ARCH = x86_64; then
-+if test $CR_KARCH = i386 -o $CR_KARCH = x86_64; then
+ fi
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct n_desc_struct" >&5
-+$as_echo_n "checking kernel for struct n_desc_struct... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for struct n_desc_struct" >&5
--echo $ECHO_N "checking kernel for struct n_desc_struct... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.rlim" >&5
++$as_echo_n "checking kernel for task.rlim... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for task.rlim" >&5
+-echo $ECHO_N "checking kernel for task.rlim... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_TASK_RLIM+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_RLIM+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -35816,11 +26119,7 @@
+@@ -39799,11 +29899,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -80322,7 +85644,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -35842,42 +26141,18 @@
+@@ -39821,42 +29917,18 @@
    return 0;
  }
  _ACEOF
@@ -80352,7 +85674,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT=yes
+ 	 cr_cv_kconfig_HAVE_TASK_RLIM=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -80361,36 +85683,35 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT=no
+ 	 cr_cv_kconfig_HAVE_TASK_RLIM=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -35885,33 +26160,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT
+@@ -39864,33 +29936,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_RLIM
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_N_DESC_STRUCT 1
+-#define HAVE_TASK_RLIM 1
 -_ACEOF
-+    $as_echo "#define HAVE_STRUCT_N_DESC_STRUCT 1" >>confdefs.h
++    $as_echo "#define HAVE_TASK_RLIM 1" >>confdefs.h
  
-      HAVE_STRUCT_N_DESC_STRUCT=1
+      HAVE_TASK_RLIM=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_N_DESC_STRUCT 0
+-#define HAVE_TASK_RLIM 0
 -_ACEOF
-+    $as_echo "#define HAVE_STRUCT_N_DESC_STRUCT 0" >>confdefs.h
++    $as_echo "#define HAVE_TASK_RLIM 0" >>confdefs.h
  
-      HAVE_STRUCT_N_DESC_STRUCT=''
+      HAVE_TASK_RLIM=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -80398,19 +85719,20 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel for cpu_gdt_descr" >&5
--echo $ECHO_N "checking kernel for cpu_gdt_descr... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for cpu_gdt_descr" >&5
-+$as_echo_n "checking kernel for cpu_gdt_descr... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for signal.rlim" >&5
++$as_echo_n "checking kernel for signal.rlim... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_CPU_GDT_DESCR+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for signal.rlim" >&5
+-echo $ECHO_N "checking kernel for signal.rlim... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_SIGNAL_RLIM+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_CPU_GDT_DESCR+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_SIGNAL_RLIM+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -35922,11 +26192,7 @@
+@@ -39901,11 +29968,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -80423,7 +85745,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -35946,42 +26212,18 @@
+@@ -39923,42 +29986,18 @@
    return 0;
  }
  _ACEOF
@@ -80453,7 +85775,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_CPU_GDT_DESCR=yes
+ 	 cr_cv_kconfig_HAVE_SIGNAL_RLIM=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -80462,30 +85784,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_CPU_GDT_DESCR=no
+ 	 cr_cv_kconfig_HAVE_SIGNAL_RLIM=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -35989,33 +26231,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_CPU_GDT_DESCR
+@@ -39966,22 +30005,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_SIGNAL_RLIM
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_CPU_GDT_DESCR 1
+-#define HAVE_SIGNAL_RLIM 1
 -_ACEOF
-+    $as_echo "#define HAVE_CPU_GDT_DESCR 1" >>confdefs.h
++    $as_echo "#define HAVE_SIGNAL_RLIM 1" >>confdefs.h
  
-      HAVE_CPU_GDT_DESCR=1
+      HAVE_SIGNAL_RLIM=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_CPU_GDT_DESCR 0
+-#define HAVE_SIGNAL_RLIM 0
 -_ACEOF
-+    $as_echo "#define HAVE_CPU_GDT_DESCR 0" >>confdefs.h
++    $as_echo "#define HAVE_SIGNAL_RLIM 0" >>confdefs.h
  
-      HAVE_CPU_GDT_DESCR=''
+      HAVE_SIGNAL_RLIM=''
    fi
  
  
@@ -80495,118 +85817,125 @@
 +$as_echo "$cr_result" >&6; }
  
  
-   if test -n "${HAVE_CPU_GDT_DESCR}"; then
- 
+ # Allow exactly one match
+@@ -40005,39 +30040,70 @@
  
--  echo "$as_me:$LINENO: checking kernel symbol table for cpu_gdt_descr" >&5
--echo $ECHO_N "checking kernel symbol table for cpu_gdt_descr... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for cpu_gdt_descr" >&5
-+$as_echo_n "checking kernel symbol table for cpu_gdt_descr... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_cpu_gdt_descr+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_cpu_gdt_descr+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -40051,21 +30117,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
  
-     cr_cv_ksymtab_cpu_gdt_descr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}cpu_gdt_descr$/ {s/ .*//p;q;}"`
-@@ -36031,11 +26269,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" "$LINENO" 5
  
- 		 #include <linux/kernel.h>
-@@ -36055,42 +26289,18 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_cpu_gdt_descr="Y$cr_cv_ksymtab_cpu_gdt_descr"
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_cpu_gdt_descr="N$cr_cv_ksymtab_cpu_gdt_descr"
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
-     fi
  
-@@ -36101,9 +26311,7 @@
-     cr_result='not found'
-   else
-     if expr "$cr_cv_ksymtab_cpu_gdt_descr" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol cpu_gdt_descr but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol cpu_gdt_descr but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol cpu_gdt_descr but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_cpu_gdt_descr | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -36119,18 +26327,18 @@
- _ACEOF
  
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
  
-   fi
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.cred" >&5
++$as_echo_n "checking kernel for task.cred... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel symbol table for cpu_gdt_table" >&5
--echo $ECHO_N "checking kernel symbol table for cpu_gdt_table... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for cpu_gdt_table" >&5
-+$as_echo_n "checking kernel symbol table for cpu_gdt_table... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_cpu_gdt_table+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for task.cred" >&5
+-echo $ECHO_N "checking kernel for task.cred... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_TASK_CRED+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_cpu_gdt_table+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_CRED+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_cpu_gdt_table=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}cpu_gdt_table$/ {s/ .*//p;q;}"`
-@@ -36146,11 +26354,7 @@
+ 
+@@ -40076,11 +30139,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -80619,7 +85948,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -36170,42 +26374,18 @@
+@@ -40098,42 +30157,18 @@
    return 0;
  }
  _ACEOF
@@ -80649,7 +85978,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_cpu_gdt_table="Y$cr_cv_ksymtab_cpu_gdt_table"
+ 	 cr_cv_kconfig_HAVE_TASK_CRED=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -80658,49 +85987,57 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_cpu_gdt_table="N$cr_cv_ksymtab_cpu_gdt_table"
+ 	 cr_cv_kconfig_HAVE_TASK_CRED=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -36216,9 +26396,7 @@
-     cr_result='not found'
+ fi
+@@ -40141,34 +30176,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_CRED
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TASK_CRED 1
+-_ACEOF
++    $as_echo "#define HAVE_TASK_CRED 1" >>confdefs.h
+ 
+      HAVE_TASK_CRED=1
    else
-     if expr "$cr_cv_ksymtab_cpu_gdt_table" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol cpu_gdt_table but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol cpu_gdt_table but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol cpu_gdt_table but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_cpu_gdt_table | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -36234,17 +26412,17 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TASK_CRED 0
+-_ACEOF
++    $as_echo "#define HAVE_TASK_CRED 0" >>confdefs.h
  
+      HAVE_TASK_CRED=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for per_cpu__cpu_gdt_descr" >&5
--echo $ECHO_N "checking kernel symbol table for per_cpu__cpu_gdt_descr... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for per_cpu__cpu_gdt_descr" >&5
-+$as_echo_n "checking kernel symbol table for per_cpu__cpu_gdt_descr... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_per_cpu__cpu_gdt_descr+set}" = set; then
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.group_info" >&5
++$as_echo_n "checking kernel for task.group_info... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for task.group_info" >&5
+-echo $ECHO_N "checking kernel for task.group_info... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_TASK_GROUP_INFO+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_per_cpu__cpu_gdt_descr+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_GROUP_INFO+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_per_cpu__cpu_gdt_descr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}per_cpu__cpu_gdt_descr$/ {s/ .*//p;q;}"`
-@@ -36260,11 +26438,7 @@
+ 
+@@ -40179,11 +30209,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -80713,7 +86050,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -36284,42 +26458,18 @@
+@@ -40201,42 +30227,18 @@
    return 0;
  }
  _ACEOF
@@ -80743,7 +86080,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_per_cpu__cpu_gdt_descr="Y$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"
+ 	 cr_cv_kconfig_HAVE_TASK_GROUP_INFO=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -80752,51 +86089,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_per_cpu__cpu_gdt_descr="N$cr_cv_ksymtab_per_cpu__cpu_gdt_descr"
+ 	 cr_cv_kconfig_HAVE_TASK_GROUP_INFO=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -36330,9 +26480,7 @@
-     cr_result='not found'
+ fi
+@@ -40244,33 +30246,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_GROUP_INFO
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TASK_GROUP_INFO 1
+-_ACEOF
++    $as_echo "#define HAVE_TASK_GROUP_INFO 1" >>confdefs.h
+ 
+      HAVE_TASK_GROUP_INFO=1
    else
-     if expr "$cr_cv_ksymtab_per_cpu__cpu_gdt_descr" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_per_cpu__cpu_gdt_descr | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -36348,19 +26496,18 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TASK_GROUP_INFO 0
+-_ACEOF
++    $as_echo "#define HAVE_TASK_GROUP_INFO 0" >>confdefs.h
  
+      HAVE_TASK_GROUP_INFO=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.sp0" >&5
-+$as_echo_n "checking kernel for thread.sp0... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for suid_dumpable" >&5
+-echo $ECHO_N "checking kernel for suid_dumpable... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for suid_dumpable" >&5
++$as_echo_n "checking kernel for suid_dumpable... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for thread.sp0" >&5
--echo $ECHO_N "checking kernel for thread.sp0... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_THREAD_SP0+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_SUID_DUMPABLE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_SP0+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_SUID_DUMPABLE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -36371,11 +26518,7 @@
+@@ -40281,11 +30278,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -80809,7 +86151,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -36393,42 +26536,18 @@
+@@ -40304,42 +30297,18 @@
    return 0;
  }
  _ACEOF
@@ -80839,7 +86181,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_SP0=yes
+ 	 cr_cv_kconfig_HAVE_SUID_DUMPABLE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -80848,56 +86190,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_SP0=no
+ 	 cr_cv_kconfig_HAVE_SUID_DUMPABLE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -36436,33 +26555,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_SP0
+@@ -40347,33 +30316,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_SUID_DUMPABLE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_SP0 1
+-#define HAVE_SUID_DUMPABLE 1
 -_ACEOF
-+    $as_echo "#define HAVE_THREAD_SP0 1" >>confdefs.h
++    $as_echo "#define HAVE_SUID_DUMPABLE 1" >>confdefs.h
  
-      HAVE_THREAD_SP0=1
+      HAVE_SUID_DUMPABLE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_SP0 0
+-#define HAVE_SUID_DUMPABLE 0
 -_ACEOF
-+    $as_echo "#define HAVE_THREAD_SP0 0" >>confdefs.h
++    $as_echo "#define HAVE_SUID_DUMPABLE 0" >>confdefs.h
  
-      HAVE_THREAD_SP0=''
+      HAVE_SUID_DUMPABLE=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ if test -n "${HAVE_SUID_DUMPABLE}"; then
  
  
- 
--  echo "$as_me:$LINENO: checking kernel for thread.esp0" >&5
--echo $ECHO_N "checking kernel for thread.esp0... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.esp0" >&5
-+$as_echo_n "checking kernel for thread.esp0... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_THREAD_ESP0+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for suid_dumpable" >&5
+-echo $ECHO_N "checking kernel symbol table for suid_dumpable... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for suid_dumpable" >&5
++$as_echo_n "checking kernel symbol table for suid_dumpable... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_suid_dumpable+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_ESP0+set}" = set; then :
++    if ${cr_cv_ksymtab_suid_dumpable+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -36473,11 +26587,7 @@
+     cr_cv_ksymtab_suid_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}suid_dumpable$/ {s/ .*//p;q;}"`
+@@ -40389,11 +30354,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -80910,7 +86252,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -36495,42 +26605,18 @@
+@@ -40413,42 +30374,18 @@
    return 0;
  }
  _ACEOF
@@ -80940,7 +86282,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_ESP0=yes
+ 	 cr_cv_ksymtab_suid_dumpable="Y$cr_cv_ksymtab_suid_dumpable"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -80949,56 +86291,51 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_ESP0=no
+ 	 cr_cv_ksymtab_suid_dumpable="N$cr_cv_ksymtab_suid_dumpable"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -36538,33 +26624,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_ESP0
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_ESP0 1
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_ESP0 1" >>confdefs.h
- 
-      HAVE_THREAD_ESP0=1
+@@ -40459,9 +30396,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_ESP0 0
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_ESP0 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_suid_dumpable" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol suid_dumpable but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol suid_dumpable but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol suid_dumpable but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_suid_dumpable | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -40477,19 +30412,18 @@
+ _ACEOF
  
-      HAVE_THREAD_ESP0=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+ fi
  
  
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for set_dumpable" >&5
++$as_echo_n "checking kernel for set_dumpable... " >&6; }
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.rsp0" >&5
-+$as_echo_n "checking kernel for thread.rsp0... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for thread.rsp0" >&5
--echo $ECHO_N "checking kernel for thread.rsp0... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for set_dumpable" >&5
+-echo $ECHO_N "checking kernel for set_dumpable... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_THREAD_RSP0+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_SET_DUMPABLE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_RSP0+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_SET_DUMPABLE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -36575,11 +26656,7 @@
+@@ -40500,11 +30434,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -81011,7 +86348,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -36597,42 +26674,18 @@
+@@ -40528,42 +30458,18 @@
    return 0;
  }
  _ACEOF
@@ -81041,7 +86378,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_RSP0=yes
+ 	 cr_cv_kconfig_HAVE_SET_DUMPABLE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -81050,56 +86387,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_RSP0=no
+ 	 cr_cv_kconfig_HAVE_SET_DUMPABLE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -36640,33 +26693,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_RSP0
+@@ -40571,33 +30477,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_SET_DUMPABLE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_RSP0 1
+-#define HAVE_SET_DUMPABLE 1
 -_ACEOF
-+    $as_echo "#define HAVE_THREAD_RSP0 1" >>confdefs.h
++    $as_echo "#define HAVE_SET_DUMPABLE 1" >>confdefs.h
  
-      HAVE_THREAD_RSP0=1
+      HAVE_SET_DUMPABLE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_RSP0 0
+-#define HAVE_SET_DUMPABLE 0
 -_ACEOF
-+    $as_echo "#define HAVE_THREAD_RSP0 0" >>confdefs.h
++    $as_echo "#define HAVE_SET_DUMPABLE 0" >>confdefs.h
  
-      HAVE_THREAD_RSP0=''
+      HAVE_SET_DUMPABLE=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ if test -n "${HAVE_SET_DUMPABLE}"; then
  
  
- 
--  echo "$as_me:$LINENO: checking kernel for thread.usersp" >&5
--echo $ECHO_N "checking kernel for thread.usersp... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.usersp" >&5
-+$as_echo_n "checking kernel for thread.usersp... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_THREAD_USERSP+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for set_dumpable" >&5
+-echo $ECHO_N "checking kernel symbol table for set_dumpable... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for set_dumpable" >&5
++$as_echo_n "checking kernel symbol table for set_dumpable... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_set_dumpable+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_USERSP+set}" = set; then :
++    if ${cr_cv_ksymtab_set_dumpable+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -36677,11 +26725,7 @@
+     cr_cv_ksymtab_set_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}set_dumpable$/ {s/ .*//p;q;}"`
+@@ -40613,11 +30515,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -81112,7 +86449,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -36699,42 +26743,18 @@
+@@ -40637,42 +30535,18 @@
    return 0;
  }
  _ACEOF
@@ -81142,7 +86479,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_USERSP=yes
+ 	 cr_cv_ksymtab_set_dumpable="Y$cr_cv_ksymtab_set_dumpable"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -81151,56 +86488,50 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_USERSP=no
+ 	 cr_cv_ksymtab_set_dumpable="N$cr_cv_ksymtab_set_dumpable"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -36742,33 +26762,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_USERSP
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_USERSP 1
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_USERSP 1" >>confdefs.h
- 
-      HAVE_THREAD_USERSP=1
+@@ -40683,9 +30557,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_USERSP 0
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_USERSP 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_set_dumpable" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol set_dumpable but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol set_dumpable but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol set_dumpable but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_set_dumpable | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -40701,18 +30573,18 @@
+ _ACEOF
  
-      HAVE_THREAD_USERSP=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+ fi
  
  
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.userrsp" >&5
-+$as_echo_n "checking kernel for thread.userrsp... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for thread.userrsp" >&5
--echo $ECHO_N "checking kernel for thread.userrsp... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_THREAD_USERRSP+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for groups_search" >&5
+-echo $ECHO_N "checking kernel symbol table for groups_search... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for groups_search" >&5
++$as_echo_n "checking kernel symbol table for groups_search... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_groups_search+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_USERRSP+set}" = set; then :
++    if ${cr_cv_ksymtab_groups_search+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -36779,11 +26794,7 @@
+     cr_cv_ksymtab_groups_search=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}groups_search$/ {s/ .*//p;q;}"`
+@@ -40728,11 +30600,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -81213,7 +86544,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -36801,42 +26812,18 @@
+@@ -40752,42 +30620,18 @@
    return 0;
  }
  _ACEOF
@@ -81243,7 +86574,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_USERRSP=yes
+ 	 cr_cv_ksymtab_groups_search="Y$cr_cv_ksymtab_groups_search"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -81252,56 +86583,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_USERRSP=no
+ 	 cr_cv_ksymtab_groups_search="N$cr_cv_ksymtab_groups_search"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -36844,33 +26831,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_USERRSP
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_USERRSP 1
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_USERRSP 1" >>confdefs.h
- 
-      HAVE_THREAD_USERRSP=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_USERRSP 0
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_USERRSP 0" >>confdefs.h
+@@ -40817,17 +30661,17 @@
+ _ACEOF
  
-      HAVE_THREAD_USERRSP=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
--  echo "$as_me:$LINENO: checking kernel for thread.debugreg0" >&5
--echo $ECHO_N "checking kernel for thread.debugreg0... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.debugreg0" >&5
-+$as_echo_n "checking kernel for thread.debugreg0... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREG0+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for supplemental_group_member" >&5
+-echo $ECHO_N "checking kernel symbol table for supplemental_group_member... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for supplemental_group_member" >&5
++$as_echo_n "checking kernel symbol table for supplemental_group_member... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_supplemental_group_member+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREG0+set}" = set; then :
++    if ${cr_cv_ksymtab_supplemental_group_member+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -36881,11 +26863,7 @@
+     cr_cv_ksymtab_supplemental_group_member=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}supplemental_group_member$/ {s/ .*//p;q;}"`
+@@ -40843,11 +30687,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -81314,7 +86627,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -36903,42 +26881,18 @@
+@@ -40867,42 +30707,18 @@
    return 0;
  }
  _ACEOF
@@ -81344,7 +86657,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_DEBUGREG0=yes
+ 	 cr_cv_ksymtab_supplemental_group_member="Y$cr_cv_ksymtab_supplemental_group_member"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -81353,56 +86666,40 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_DEBUGREG0=no
+ 	 cr_cv_ksymtab_supplemental_group_member="N$cr_cv_ksymtab_supplemental_group_member"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -36946,33 +26900,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_DEBUGREG0
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_DEBUGREG0 1
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_DEBUGREG0 1" >>confdefs.h
- 
-      HAVE_THREAD_DEBUGREG0=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_DEBUGREG0 0
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_DEBUGREG0 0" >>confdefs.h
+@@ -40932,19 +30748,18 @@
+ _ACEOF
  
-      HAVE_THREAD_DEBUGREG0=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.debugregs" >&5
-+$as_echo_n "checking kernel for thread.debugregs... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for PIDTYPE_TGID" >&5
+-echo $ECHO_N "checking kernel for PIDTYPE_TGID... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for PIDTYPE_TGID" >&5
++$as_echo_n "checking kernel for PIDTYPE_TGID... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for thread.debugregs" >&5
--echo $ECHO_N "checking kernel for thread.debugregs... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREGS+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_PIDTYPE_TGID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREGS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PIDTYPE_TGID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -36983,11 +26932,7 @@
+@@ -40955,11 +30770,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -81415,7 +86712,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -37005,42 +26950,18 @@
+@@ -40979,42 +30790,18 @@
    return 0;
  }
  _ACEOF
@@ -81445,7 +86742,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_DEBUGREGS=yes
+ 	 cr_cv_kconfig_HAVE_PIDTYPE_TGID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -81454,36 +86751,35 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_DEBUGREGS=no
+ 	 cr_cv_kconfig_HAVE_PIDTYPE_TGID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -37048,33 +26969,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_DEBUGREGS
+@@ -41022,33 +30809,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_PIDTYPE_TGID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_DEBUGREGS 1
+-#define HAVE_PIDTYPE_TGID 1
 -_ACEOF
-+    $as_echo "#define HAVE_THREAD_DEBUGREGS 1" >>confdefs.h
++    $as_echo "#define HAVE_PIDTYPE_TGID 1" >>confdefs.h
  
-      HAVE_THREAD_DEBUGREGS=1
+      HAVE_PIDTYPE_TGID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_DEBUGREGS 0
+-#define HAVE_PIDTYPE_TGID 0
 -_ACEOF
-+    $as_echo "#define HAVE_THREAD_DEBUGREGS 0" >>confdefs.h
++    $as_echo "#define HAVE_PIDTYPE_TGID 0" >>confdefs.h
  
-      HAVE_THREAD_DEBUGREGS=''
+      HAVE_PIDTYPE_TGID=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -81491,102 +86787,33 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel for thread.i387" >&5
--echo $ECHO_N "checking kernel for thread.i387... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.ptrace_bps" >&5
-+$as_echo_n "checking kernel for thread.ptrace_bps... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.thread_group" >&5
++$as_echo_n "checking kernel for task.thread_group... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_THREAD_I387+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for task.thread_group" >&5
+-echo $ECHO_N "checking kernel for task.thread_group... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_TASK_THREAD_GROUP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_THREAD_GROUP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -37085,11 +27001,78 @@
+@@ -41059,11 +30841,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+	#include <linux/perf_event.h>
-+	#include <asm/processor.h>
-+int
-+main ()
-+{
-+struct thread_struct x;
-+          struct perf_event  tc_1 = *(x.ptrace_bps[1]);
-+  ;
-+  return 0;
-+}
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS=yes
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+fi
-+
-+  cr_result=$cr_cv_kconfig_HAVE_THREAD_PTRACE_BPS
-+
-+  if test $cr_result = yes; then
-+    $as_echo "#define HAVE_THREAD_PTRACE_BPS 1" >>confdefs.h
-+
-+     HAVE_THREAD_PTRACE_BPS=1
-+  else
-+    $as_echo "#define HAVE_THREAD_PTRACE_BPS 0" >>confdefs.h
-+
-+     HAVE_THREAD_PTRACE_BPS=''
-+  fi
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.i387" >&5
-+$as_echo_n "checking kernel for thread.i387... " >&6; }
-+
-+    if test "${cr_cv_kconfig_HAVE_THREAD_I387+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -37107,42 +27090,18 @@
+@@ -41081,42 +30859,18 @@
    return 0;
  }
  _ACEOF
@@ -81616,7 +86843,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_I387=yes
+ 	 cr_cv_kconfig_HAVE_TASK_THREAD_GROUP=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -81625,30 +86852,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_I387=no
+ 	 cr_cv_kconfig_HAVE_TASK_THREAD_GROUP=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -37150,33 +27109,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_I387
+@@ -41124,22 +30878,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_THREAD_GROUP
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_I387 1
+-#define HAVE_TASK_THREAD_GROUP 1
 -_ACEOF
-+    $as_echo "#define HAVE_THREAD_I387 1" >>confdefs.h
++    $as_echo "#define HAVE_TASK_THREAD_GROUP 1" >>confdefs.h
  
-      HAVE_THREAD_I387=1
+      HAVE_TASK_THREAD_GROUP=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_I387 0
+-#define HAVE_TASK_THREAD_GROUP 0
 -_ACEOF
-+    $as_echo "#define HAVE_THREAD_I387 0" >>confdefs.h
++    $as_echo "#define HAVE_TASK_THREAD_GROUP 0" >>confdefs.h
  
-      HAVE_THREAD_I387=''
+      HAVE_TASK_THREAD_GROUP=''
    fi
  
  
@@ -81658,23 +86885,124 @@
 +$as_echo "$cr_result" >&6; }
  
  
+ if test "${HAVE_PIDTYPE_TGID}${HAVE_TASK_THREAD_GROUP}" != "1"; then
+@@ -41162,39 +30912,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -41208,20 +30989,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine thread group list" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine thread group list" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine thread group list" "$LINENO" 5
  
+ fi
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.xstate" >&5
-+$as_echo_n "checking kernel for thread.xstate... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for thread.xstate" >&5
--echo $ECHO_N "checking kernel for thread.xstate... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_THREAD_XSTATE+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for detach_pid" >&5
+-echo $ECHO_N "checking kernel symbol table for detach_pid... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for detach_pid" >&5
++$as_echo_n "checking kernel symbol table for detach_pid... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_detach_pid+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_THREAD_XSTATE+set}" = set; then :
++    if ${cr_cv_ksymtab_detach_pid+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -37187,11 +27141,7 @@
+     cr_cv_ksymtab_detach_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}detach_pid$/ {s/ .*//p;q;}"`
+@@ -41237,11 +31016,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -81687,7 +87015,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -37209,42 +27159,18 @@
+@@ -41261,42 +31036,18 @@
    return 0;
  }
  _ACEOF
@@ -81717,7 +87045,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_XSTATE=yes
+ 	 cr_cv_ksymtab_detach_pid="Y$cr_cv_ksymtab_detach_pid"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -81726,57 +87054,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_THREAD_XSTATE=no
+ 	 cr_cv_ksymtab_detach_pid="N$cr_cv_ksymtab_detach_pid"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -37252,34 +27178,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_THREAD_XSTATE
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_XSTATE 1
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_XSTATE 1" >>confdefs.h
- 
-      HAVE_THREAD_XSTATE=1
+@@ -41307,9 +31058,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_THREAD_XSTATE 0
--_ACEOF
-+    $as_echo "#define HAVE_THREAD_XSTATE 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_detach_pid" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol detach_pid but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol detach_pid but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol detach_pid but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_detach_pid | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -41325,17 +31074,17 @@
+ _ACEOF
  
-      HAVE_THREAD_XSTATE=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
- 
--  echo "$as_me:$LINENO: checking kernel for pt_regs.eflags" >&5
--echo $ECHO_N "checking kernel for pt_regs.eflags... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.eflags" >&5
-+$as_echo_n "checking kernel for pt_regs.eflags... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_PT_REGS_EFLAGS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for attach_pid" >&5
+-echo $ECHO_N "checking kernel symbol table for attach_pid... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for attach_pid" >&5
++$as_echo_n "checking kernel symbol table for attach_pid... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_attach_pid+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PT_REGS_EFLAGS+set}" = set; then :
++    if ${cr_cv_ksymtab_attach_pid+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -37290,11 +27211,7 @@
+     cr_cv_ksymtab_attach_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}attach_pid$/ {s/ .*//p;q;}"`
+@@ -41351,11 +31100,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -81789,7 +87109,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -37312,42 +27229,18 @@
+@@ -41375,42 +31120,18 @@
    return 0;
  }
  _ACEOF
@@ -81819,7 +87139,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_EFLAGS=yes
+ 	 cr_cv_ksymtab_attach_pid="Y$cr_cv_ksymtab_attach_pid"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -81828,56 +87148,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_EFLAGS=no
+ 	 cr_cv_ksymtab_attach_pid="N$cr_cv_ksymtab_attach_pid"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -37355,33 +27248,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_EFLAGS
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_EFLAGS 1
--_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_EFLAGS 1" >>confdefs.h
- 
-      HAVE_PT_REGS_EFLAGS=1
+@@ -41421,9 +31142,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_EFLAGS 0
--_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_EFLAGS 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_attach_pid" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol attach_pid but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol attach_pid but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol attach_pid but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_attach_pid | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -41439,17 +31158,17 @@
+ _ACEOF
  
-      HAVE_PT_REGS_EFLAGS=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.flags" >&5
-+$as_echo_n "checking kernel for pt_regs.flags... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for pt_regs.flags" >&5
--echo $ECHO_N "checking kernel for pt_regs.flags... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_PT_REGS_FLAGS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for change_pid" >&5
+-echo $ECHO_N "checking kernel symbol table for change_pid... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for change_pid" >&5
++$as_echo_n "checking kernel symbol table for change_pid... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_change_pid+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PT_REGS_FLAGS+set}" = set; then :
++    if ${cr_cv_ksymtab_change_pid+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -37392,11 +27280,7 @@
+     cr_cv_ksymtab_change_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}change_pid$/ {s/ .*//p;q;}"`
+@@ -41465,11 +31184,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -81890,7 +87203,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -37414,42 +27298,18 @@
+@@ -41489,42 +31204,18 @@
    return 0;
  }
  _ACEOF
@@ -81920,7 +87233,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_FLAGS=yes
+ 	 cr_cv_ksymtab_change_pid="Y$cr_cv_ksymtab_change_pid"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -81929,56 +87242,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_FLAGS=no
+ 	 cr_cv_ksymtab_change_pid="N$cr_cv_ksymtab_change_pid"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -37457,33 +27317,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_FLAGS
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_FLAGS 1
--_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_FLAGS 1" >>confdefs.h
- 
-      HAVE_PT_REGS_FLAGS=1
+@@ -41535,9 +31226,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_FLAGS 0
--_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_FLAGS 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_change_pid" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol change_pid but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol change_pid but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol change_pid but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_change_pid | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -41553,17 +31242,17 @@
+ _ACEOF
  
-      HAVE_PT_REGS_FLAGS=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for init_fpu" >&5
--echo $ECHO_N "checking kernel symbol table for init_fpu... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for init_fpu" >&5
-+$as_echo_n "checking kernel symbol table for init_fpu... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for find_pid" >&5
+-echo $ECHO_N "checking kernel symbol table for find_pid... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for find_pid" >&5
++$as_echo_n "checking kernel symbol table for find_pid... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_init_fpu+set}" = set; then
+-    if test "${cr_cv_ksymtab_find_pid+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_init_fpu+set}" = set; then :
++    if ${cr_cv_ksymtab_find_pid+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_init_fpu=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}init_fpu$/ {s/ .*//p;q;}"`
-@@ -37499,11 +27355,7 @@
+     cr_cv_ksymtab_find_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}find_pid$/ {s/ .*//p;q;}"`
+@@ -41579,11 +31268,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -81991,7 +87297,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -37523,42 +27375,18 @@
+@@ -41603,42 +31288,18 @@
    return 0;
  }
  _ACEOF
@@ -82021,7 +87327,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_init_fpu="Y$cr_cv_ksymtab_init_fpu"
+ 	 cr_cv_ksymtab_find_pid="Y$cr_cv_ksymtab_find_pid"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -82030,14 +87336,25 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_init_fpu="N$cr_cv_ksymtab_init_fpu"
+ 	 cr_cv_ksymtab_find_pid="N$cr_cv_ksymtab_find_pid"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -37588,17 +27416,17 @@
+@@ -41649,9 +31310,7 @@
+     cr_result='not found'
+   else
+     if expr "$cr_cv_ksymtab_find_pid" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol find_pid but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol find_pid but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol find_pid but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_find_pid | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -41667,17 +31326,17 @@
  _ACEOF
  
    fi
@@ -82048,20 +87365,20 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for xstate_size" >&5
--echo $ECHO_N "checking kernel symbol table for xstate_size... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for xstate_size" >&5
-+$as_echo_n "checking kernel symbol table for xstate_size... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for link_pid" >&5
+-echo $ECHO_N "checking kernel symbol table for link_pid... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for link_pid" >&5
++$as_echo_n "checking kernel symbol table for link_pid... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_xstate_size+set}" = set; then
+-    if test "${cr_cv_ksymtab_link_pid+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_xstate_size+set}" = set; then :
++    if ${cr_cv_ksymtab_link_pid+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_xstate_size=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}xstate_size$/ {s/ .*//p;q;}"`
-@@ -37614,11 +27442,7 @@
+     cr_cv_ksymtab_link_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}link_pid$/ {s/ .*//p;q;}"`
+@@ -41693,11 +31352,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -82074,7 +87391,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -37638,42 +27462,18 @@
+@@ -41717,42 +31372,18 @@
    return 0;
  }
  _ACEOF
@@ -82104,7 +87421,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_xstate_size="Y$cr_cv_ksymtab_xstate_size"
+ 	 cr_cv_ksymtab_link_pid="Y$cr_cv_ksymtab_link_pid"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -82113,14 +87430,25 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_xstate_size="N$cr_cv_ksymtab_xstate_size"
+ 	 cr_cv_ksymtab_link_pid="N$cr_cv_ksymtab_link_pid"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -37703,19 +27503,18 @@
+@@ -41763,9 +31394,7 @@
+     cr_result='not found'
+   else
+     if expr "$cr_cv_ksymtab_link_pid" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol link_pid but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol link_pid but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol link_pid but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_link_pid | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -41781,9 +31410,8 @@
  _ACEOF
  
    fi
@@ -82132,21 +87460,23 @@
  
  
  
+@@ -41792,11 +31420,11 @@
  
  
--  echo "$as_me:$LINENO: checking kernel for restore_fpu_checking" >&5
--echo $ECHO_N "checking kernel for restore_fpu_checking... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for restore_fpu_checking" >&5
-+$as_echo_n "checking kernel for restore_fpu_checking... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for 1-arg find_pid" >&5
+-echo $ECHO_N "checking kernel for 1-arg find_pid... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 1-arg find_pid" >&5
++$as_echo_n "checking kernel for 1-arg find_pid... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_1_ARG_FIND_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_1_ARG_FIND_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -37726,11 +27525,7 @@
+@@ -41807,11 +31435,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -82159,7 +87489,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -37754,42 +27549,18 @@
+@@ -41832,42 +31456,18 @@
    return 0;
  }
  _ACEOF
@@ -82189,7 +87519,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING=yes
+ 	 cr_cv_kconfig_HAVE_1_ARG_FIND_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -82198,30 +87528,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING=no
+ 	 cr_cv_kconfig_HAVE_1_ARG_FIND_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -37797,34 +27568,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING
+@@ -41875,22 +31475,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_1_ARG_FIND_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_RESTORE_FPU_CHECKING 1
+-#define HAVE_1_ARG_FIND_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_RESTORE_FPU_CHECKING 1" >>confdefs.h
++    $as_echo "#define HAVE_1_ARG_FIND_PID 1" >>confdefs.h
  
-      HAVE_RESTORE_FPU_CHECKING=1
+      HAVE_1_ARG_FIND_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_RESTORE_FPU_CHECKING 0
+-#define HAVE_1_ARG_FIND_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_RESTORE_FPU_CHECKING 0" >>confdefs.h
++    $as_echo "#define HAVE_1_ARG_FIND_PID 0" >>confdefs.h
  
-      HAVE_RESTORE_FPU_CHECKING=''
+      HAVE_1_ARG_FIND_PID=''
    fi
  
  
@@ -82231,24 +87561,25 @@
 +$as_echo "$cr_result" >&6; }
  
  
-   if test -n "${HAVE_RESTORE_FPU_CHECKING}"; then
  
+@@ -41900,12 +31496,11 @@
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.0 restore_fpu_checking" >&5
-+$as_echo_n "checking kernel for 2.6.0 restore_fpu_checking... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 2.6.0 restore_fpu_checking" >&5
--echo $ECHO_N "checking kernel for 2.6.0 restore_fpu_checking... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg find_pid" >&5
++$as_echo_n "checking kernel for 2-arg find_pid... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2-arg find_pid" >&5
+-echo $ECHO_N "checking kernel for 2-arg find_pid... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_2_ARG_FIND_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_ARG_FIND_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -37835,11 +27601,7 @@
+@@ -41916,11 +31511,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -82261,7 +87592,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -37857,42 +27619,18 @@
+@@ -41941,42 +31532,18 @@
    return 0;
  }
  _ACEOF
@@ -82291,7 +87622,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING=yes
+ 	 cr_cv_kconfig_HAVE_2_ARG_FIND_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -82300,30 +87631,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING=no
+ 	 cr_cv_kconfig_HAVE_2_ARG_FIND_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -37900,33 +27638,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING
+@@ -41984,23 +31551,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_ARG_FIND_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_0_RESTORE_FPU_CHECKING 1
+-#define HAVE_2_ARG_FIND_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_2_6_0_RESTORE_FPU_CHECKING 1" >>confdefs.h
++    $as_echo "#define HAVE_2_ARG_FIND_PID 1" >>confdefs.h
  
-      HAVE_2_6_0_RESTORE_FPU_CHECKING=1
+      HAVE_2_ARG_FIND_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_0_RESTORE_FPU_CHECKING 0
+-#define HAVE_2_ARG_FIND_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_2_6_0_RESTORE_FPU_CHECKING 0" >>confdefs.h
++    $as_echo "#define HAVE_2_ARG_FIND_PID 0" >>confdefs.h
  
-      HAVE_2_6_0_RESTORE_FPU_CHECKING=''
+      HAVE_2_ARG_FIND_PID=''
    fi
  
  
@@ -82335,21 +87666,23 @@
  
  
  
+@@ -42008,11 +31570,11 @@
  
  
--  echo "$as_me:$LINENO: checking kernel for 2.6.28 restore_fpu_checking" >&5
--echo $ECHO_N "checking kernel for 2.6.28 restore_fpu_checking... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.28 restore_fpu_checking" >&5
-+$as_echo_n "checking kernel for 2.6.28 restore_fpu_checking... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for find_pid_ns" >&5
+-echo $ECHO_N "checking kernel for find_pid_ns... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_pid_ns" >&5
++$as_echo_n "checking kernel for find_pid_ns... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_FIND_PID_NS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FIND_PID_NS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -37937,11 +27670,7 @@
+@@ -42023,11 +31585,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -82362,7 +87695,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -37959,42 +27688,18 @@
+@@ -42051,42 +31609,18 @@
    return 0;
  }
  _ACEOF
@@ -82392,7 +87725,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING=yes
+ 	 cr_cv_kconfig_HAVE_FIND_PID_NS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -82401,30 +87734,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING=no
+ 	 cr_cv_kconfig_HAVE_FIND_PID_NS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -38002,22 +27707,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING
+@@ -42094,22 +31628,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_FIND_PID_NS
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_28_RESTORE_FPU_CHECKING 1
+-#define HAVE_FIND_PID_NS 1
 -_ACEOF
-+    $as_echo "#define HAVE_2_6_28_RESTORE_FPU_CHECKING 1" >>confdefs.h
++    $as_echo "#define HAVE_FIND_PID_NS 1" >>confdefs.h
  
-      HAVE_2_6_28_RESTORE_FPU_CHECKING=1
+      HAVE_FIND_PID_NS=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_28_RESTORE_FPU_CHECKING 0
+-#define HAVE_FIND_PID_NS 0
 -_ACEOF
-+    $as_echo "#define HAVE_2_6_28_RESTORE_FPU_CHECKING 0" >>confdefs.h
++    $as_echo "#define HAVE_FIND_PID_NS 0" >>confdefs.h
  
-      HAVE_2_6_28_RESTORE_FPU_CHECKING=''
+      HAVE_FIND_PID_NS=''
    fi
  
  
@@ -82434,8 +87767,8 @@
 +$as_echo "$cr_result" >&6; }
  
  
-     if test "${HAVE_2_6_0_RESTORE_FPU_CHECKING}${HAVE_2_6_28_RESTORE_FPU_CHECKING}" != "1"; then
-@@ -38040,39 +27741,59 @@
+ if test -z "${HAVE_1_ARG_FIND_PID}${HAVE_2_ARG_FIND_PID}${HAVE_FIND_PID_NS}"; then
+@@ -42132,39 +31662,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -82498,14 +87831,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -82513,38 +87858,34 @@
    fi
  fi
  rm -f confcache
-@@ -38086,24 +27807,21 @@
+@@ -42178,21 +31739,18 @@
    echo "  Kernel running currently = `uname -r`"
    echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" >&2;}
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" "$LINENO" 5
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" "$LINENO" 5
  
-     fi
-   fi
  fi
  
--if test $CR_ARCH = i386; then
--
-+if test $CR_KARCH = i386; then
  
  
  
--  echo "$as_me:$LINENO: checking kernel for pt_regs.xcs" >&5
--echo $ECHO_N "checking kernel for pt_regs.xcs... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.xcs" >&5
-+$as_echo_n "checking kernel for pt_regs.xcs... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid" >&5
++$as_echo_n "checking kernel for find_task_by_pid... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_PT_REGS_XCS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for find_task_by_pid" >&5
+-echo $ECHO_N "checking kernel for find_task_by_pid... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PT_REGS_XCS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -38114,11 +27832,7 @@
+@@ -42203,11 +31761,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -82557,12 +87898,10 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -38134,44 +27848,20 @@
-           int tc_1 = x.xcs;
-   ;
+@@ -42231,42 +31785,18 @@
    return 0;
--}
--_ACEOF
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -82585,13 +87924,11 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+}
-+_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_XCS=yes
+ 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -82600,30 +87937,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_XCS=no
+ 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -38179,33 +27869,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XCS
+@@ -42274,33 +31804,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_XCS 1
+-#define HAVE_FIND_TASK_BY_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_XCS 1" >>confdefs.h
++    $as_echo "#define HAVE_FIND_TASK_BY_PID 1" >>confdefs.h
  
-      HAVE_PT_REGS_XCS=1
+      HAVE_FIND_TASK_BY_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_XCS 0
+-#define HAVE_FIND_TASK_BY_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_XCS 0" >>confdefs.h
++    $as_echo "#define HAVE_FIND_TASK_BY_PID 0" >>confdefs.h
  
-      HAVE_PT_REGS_XCS=''
+      HAVE_FIND_TASK_BY_PID=''
    fi
  
  
@@ -82637,19 +87974,19 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel for pt_regs.xfs" >&5
--echo $ECHO_N "checking kernel for pt_regs.xfs... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.xfs" >&5
-+$as_echo_n "checking kernel for pt_regs.xfs... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_ns" >&5
+-echo $ECHO_N "checking kernel for find_task_by_pid_ns... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid_ns" >&5
++$as_echo_n "checking kernel for find_task_by_pid_ns... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_PT_REGS_XFS+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PT_REGS_XFS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -38216,11 +27901,7 @@
+@@ -42311,11 +31836,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -82662,7 +87999,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -38238,42 +27919,18 @@
+@@ -42339,42 +31860,18 @@
    return 0;
  }
  _ACEOF
@@ -82692,7 +88029,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_XFS=yes
+ 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -82701,30 +88038,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_XFS=no
+ 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -38281,33 +27938,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XFS
+@@ -42382,22 +31879,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_XFS 1
+-#define HAVE_FIND_TASK_BY_PID_NS 1
 -_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_XFS 1" >>confdefs.h
++    $as_echo "#define HAVE_FIND_TASK_BY_PID_NS 1" >>confdefs.h
  
-      HAVE_PT_REGS_XFS=1
+      HAVE_FIND_TASK_BY_PID_NS=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_XFS 0
+-#define HAVE_FIND_TASK_BY_PID_NS 0
 -_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_XFS 0" >>confdefs.h
++    $as_echo "#define HAVE_FIND_TASK_BY_PID_NS 0" >>confdefs.h
  
-      HAVE_PT_REGS_XFS=''
+      HAVE_FIND_TASK_BY_PID_NS=''
    fi
  
  
@@ -82734,23 +88071,123 @@
 +$as_echo "$cr_result" >&6; }
  
  
+ if test -z "${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
+@@ -42420,39 +31913,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -42466,19 +31990,17 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
  
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" "$LINENO" 5
  
+ fi
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.xgs" >&5
-+$as_echo_n "checking kernel for pt_regs.xgs... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for pt_regs.xgs" >&5
--echo $ECHO_N "checking kernel for pt_regs.xgs... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_PT_REGS_XGS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for find_task_by_pid_ns" >&5
+-echo $ECHO_N "checking kernel symbol table for find_task_by_pid_ns... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for find_task_by_pid_ns" >&5
++$as_echo_n "checking kernel symbol table for find_task_by_pid_ns... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_find_task_by_pid_ns+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PT_REGS_XGS+set}" = set; then :
++    if ${cr_cv_ksymtab_find_task_by_pid_ns+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -38318,11 +27970,7 @@
+     cr_cv_ksymtab_find_task_by_pid_ns=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}find_task_by_pid_ns$/ {s/ .*//p;q;}"`
+@@ -42494,11 +32016,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -82763,7 +88200,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -38340,42 +27988,18 @@
+@@ -42518,42 +32036,18 @@
    return 0;
  }
  _ACEOF
@@ -82793,7 +88230,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_XGS=yes
+ 	 cr_cv_ksymtab_find_task_by_pid_ns="Y$cr_cv_ksymtab_find_task_by_pid_ns"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -82802,56 +88239,51 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_XGS=no
+ 	 cr_cv_ksymtab_find_task_by_pid_ns="N$cr_cv_ksymtab_find_task_by_pid_ns"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -38383,33 +28007,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XGS
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_XGS 1
--_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_XGS 1" >>confdefs.h
- 
-      HAVE_PT_REGS_XGS=1
+@@ -42564,9 +32058,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_XGS 0
--_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_XGS 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_find_task_by_pid_ns" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol find_task_by_pid_ns but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol find_task_by_pid_ns but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol find_task_by_pid_ns but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_find_task_by_pid_ns | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -42582,19 +32074,18 @@
+ _ACEOF
  
-      HAVE_PT_REGS_XGS=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
  
  
--  echo "$as_me:$LINENO: checking kernel for pt_regs.cs" >&5
--echo $ECHO_N "checking kernel for pt_regs.cs... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.cs" >&5
-+$as_echo_n "checking kernel for pt_regs.cs... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid_type" >&5
++$as_echo_n "checking kernel for find_task_by_pid_type... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_PT_REGS_CS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_type" >&5
+-echo $ECHO_N "checking kernel for find_task_by_pid_type... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PT_REGS_CS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -38420,11 +28039,7 @@
+@@ -42605,11 +32096,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -82864,7 +88296,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -38442,42 +28057,18 @@
+@@ -42633,42 +32120,18 @@
    return 0;
  }
  _ACEOF
@@ -82894,7 +88326,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_CS=yes
+ 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -82903,35 +88335,36 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_CS=no
+ 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -38485,33 +28076,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_CS
+@@ -42676,33 +32139,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_CS 1
+-#define HAVE_FIND_TASK_BY_PID_TYPE 1
 -_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_CS 1" >>confdefs.h
++    $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE 1" >>confdefs.h
  
-      HAVE_PT_REGS_CS=1
+      HAVE_FIND_TASK_BY_PID_TYPE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_CS 0
+-#define HAVE_FIND_TASK_BY_PID_TYPE 0
 -_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_CS 0" >>confdefs.h
++    $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE 0" >>confdefs.h
  
-      HAVE_PT_REGS_CS=''
+      HAVE_FIND_TASK_BY_PID_TYPE=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -82939,20 +88372,19 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.fs" >&5
-+$as_echo_n "checking kernel for pt_regs.fs... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_type_ns" >&5
+-echo $ECHO_N "checking kernel for find_task_by_pid_type_ns... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid_type_ns" >&5
++$as_echo_n "checking kernel for find_task_by_pid_type_ns... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for pt_regs.fs" >&5
--echo $ECHO_N "checking kernel for pt_regs.fs... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_PT_REGS_FS+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PT_REGS_FS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -38522,11 +28108,7 @@
+@@ -42713,11 +32171,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -82965,7 +88397,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -38544,42 +28126,18 @@
+@@ -42741,42 +32195,18 @@
    return 0;
  }
  _ACEOF
@@ -82995,7 +88427,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_FS=yes
+ 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -83004,56 +88436,158 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_FS=no
+ 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -38587,33 +28145,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_FS
+@@ -42784,22 +32214,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_FS 1
+-#define HAVE_FIND_TASK_BY_PID_TYPE_NS 1
 -_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_FS 1" >>confdefs.h
++    $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE_NS 1" >>confdefs.h
  
-      HAVE_PT_REGS_FS=1
+      HAVE_FIND_TASK_BY_PID_TYPE_NS=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_FS 0
+-#define HAVE_FIND_TASK_BY_PID_TYPE_NS 0
 -_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_FS 0" >>confdefs.h
++    $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE_NS 0" >>confdefs.h
  
-      HAVE_PT_REGS_FS=''
+      HAVE_FIND_TASK_BY_PID_TYPE_NS=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ if test -z "${HAVE_2_ARG_FIND_PID}${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
+@@ -42822,39 +32248,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -42868,21 +32325,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" "$LINENO" 5
+ 
+ fi
  
  
  
--  echo "$as_me:$LINENO: checking kernel for pt_regs.gs" >&5
--echo $ECHO_N "checking kernel for pt_regs.gs... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.gs" >&5
-+$as_echo_n "checking kernel for pt_regs.gs... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_PT_REGS_GS+set}" = set; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for alloc_pid" >&5
++$as_echo_n "checking kernel for alloc_pid... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for alloc_pid" >&5
+-echo $ECHO_N "checking kernel for alloc_pid... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_ALLOC_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PT_REGS_GS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_ALLOC_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -38624,11 +28177,7 @@
+@@ -42893,11 +32347,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -83066,7 +88600,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -38646,42 +28195,18 @@
+@@ -42921,42 +32371,18 @@
    return 0;
  }
  _ACEOF
@@ -83096,7 +88630,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_GS=yes
+ 	 cr_cv_kconfig_HAVE_ALLOC_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -83105,30 +88639,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PT_REGS_GS=no
+ 	 cr_cv_kconfig_HAVE_ALLOC_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -38689,22 +28214,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_PT_REGS_GS
+@@ -42964,22 +32390,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_ALLOC_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_GS 1
+-#define HAVE_ALLOC_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_GS 1" >>confdefs.h
++    $as_echo "#define HAVE_ALLOC_PID 1" >>confdefs.h
  
-      HAVE_PT_REGS_GS=1
+      HAVE_ALLOC_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PT_REGS_GS 0
+-#define HAVE_ALLOC_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_PT_REGS_GS 0" >>confdefs.h
++    $as_echo "#define HAVE_ALLOC_PID 0" >>confdefs.h
  
-      HAVE_PT_REGS_GS=''
+      HAVE_ALLOC_PID=''
    fi
  
  
@@ -83138,25 +88672,25 @@
 +$as_echo "$cr_result" >&6; }
  
  
- fi
-@@ -38712,12 +28233,11 @@
+ if test -n "${HAVE_ALLOC_PID}"; then
+@@ -42989,12 +32411,11 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode sem" >&5
-+$as_echo_n "checking kernel for inode sem... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 0-arg alloc_pid" >&5
++$as_echo_n "checking kernel for 0-arg alloc_pid... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for inode sem" >&5
--echo $ECHO_N "checking kernel for inode sem... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for 0-arg alloc_pid" >&5
+-echo $ECHO_N "checking kernel for 0-arg alloc_pid... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_INODE_SEM+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_INODE_SEM+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -38728,11 +28248,7 @@
+@@ -43005,11 +32426,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -83169,7 +88703,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -38753,42 +28269,18 @@
+@@ -43030,42 +32447,18 @@
    return 0;
  }
  _ACEOF
@@ -83199,7 +88733,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_INODE_SEM=yes
+ 	 cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -83208,56 +88742,58 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_INODE_SEM=no
+ 	 cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -38796,33 +28288,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_INODE_SEM
+@@ -43073,22 +32466,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_INODE_SEM 1
+-#define HAVE_0_ARG_ALLOC_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_INODE_SEM 1" >>confdefs.h
++    $as_echo "#define HAVE_0_ARG_ALLOC_PID 1" >>confdefs.h
  
-      HAVE_INODE_SEM=1
+      HAVE_0_ARG_ALLOC_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_INODE_SEM 0
+-#define HAVE_0_ARG_ALLOC_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_INODE_SEM 0" >>confdefs.h
++    $as_echo "#define HAVE_0_ARG_ALLOC_PID 0" >>confdefs.h
  
-      HAVE_INODE_SEM=''
+      HAVE_0_ARG_ALLOC_PID=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
+@@ -43098,12 +32487,11 @@
  
  
--  echo "$as_me:$LINENO: checking kernel for inode mutex" >&5
--echo $ECHO_N "checking kernel for inode mutex... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode mutex" >&5
-+$as_echo_n "checking kernel for inode mutex... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_INODE_MUTEX+set}" = set; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 1-arg alloc_pid" >&5
++$as_echo_n "checking kernel for 1-arg alloc_pid... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 1-arg alloc_pid" >&5
+-echo $ECHO_N "checking kernel for 1-arg alloc_pid... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_INODE_MUTEX+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -38833,11 +28320,7 @@
+@@ -43114,11 +32502,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -83270,7 +88806,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -38859,42 +28342,18 @@
+@@ -43139,42 +32523,18 @@
    return 0;
  }
  _ACEOF
@@ -83300,7 +88836,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_INODE_MUTEX=yes
+ 	 cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -83309,30 +88845,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_INODE_MUTEX=no
+ 	 cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -38902,22 +28361,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_INODE_MUTEX
+@@ -43182,22 +32542,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_INODE_MUTEX 1
+-#define HAVE_1_ARG_ALLOC_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_INODE_MUTEX 1" >>confdefs.h
++    $as_echo "#define HAVE_1_ARG_ALLOC_PID 1" >>confdefs.h
  
-      HAVE_INODE_MUTEX=1
+      HAVE_1_ARG_ALLOC_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_INODE_MUTEX 0
+-#define HAVE_1_ARG_ALLOC_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_INODE_MUTEX 0" >>confdefs.h
++    $as_echo "#define HAVE_1_ARG_ALLOC_PID 0" >>confdefs.h
  
-      HAVE_INODE_MUTEX=''
+      HAVE_1_ARG_ALLOC_PID=''
    fi
  
  
@@ -83342,8 +88878,8 @@
 +$as_echo "$cr_result" >&6; }
  
  
- # Allow exactly one match
-@@ -38941,39 +28396,59 @@
+ 
+@@ -43222,39 +32578,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -83406,14 +88942,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -83421,34 +88969,32 @@
    fi
  fi
  rm -f confcache
-@@ -38987,21 +28462,18 @@
+@@ -43268,19 +32655,17 @@
    echo "  Kernel running currently = `uname -r`"
    echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" >&2;}
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" "$LINENO" 5
- 
- fi
- 
- 
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" "$LINENO" 5
  
+   fi
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.dumpable" >&5
-+$as_echo_n "checking kernel for mm.dumpable... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for mm.dumpable" >&5
--echo $ECHO_N "checking kernel for mm.dumpable... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_MM_DUMPABLE+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for free_pid" >&5
+-echo $ECHO_N "checking kernel symbol table for free_pid... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for free_pid" >&5
++$as_echo_n "checking kernel symbol table for free_pid... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_free_pid+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_MM_DUMPABLE+set}" = set; then :
++    if ${cr_cv_ksymtab_free_pid+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -39012,11 +28484,7 @@
+     cr_cv_ksymtab_free_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_pid$/ {s/ .*//p;q;}"`
+@@ -43296,11 +32681,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -83461,7 +89007,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -39034,42 +28502,18 @@
+@@ -43320,42 +32701,18 @@
    return 0;
  }
  _ACEOF
@@ -83491,7 +89037,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_DUMPABLE=yes
+ 	 cr_cv_ksymtab_free_pid="Y$cr_cv_ksymtab_free_pid"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -83500,55 +89046,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_MM_DUMPABLE=no
+ 	 cr_cv_ksymtab_free_pid="N$cr_cv_ksymtab_free_pid"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -39077,32 +28521,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_MM_DUMPABLE
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_DUMPABLE 1
--_ACEOF
-+    $as_echo "#define HAVE_MM_DUMPABLE 1" >>confdefs.h
- 
-      HAVE_MM_DUMPABLE=1
+@@ -43366,9 +32723,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_MM_DUMPABLE 0
--_ACEOF
-+    $as_echo "#define HAVE_MM_DUMPABLE 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_free_pid" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol free_pid but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol free_pid but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol free_pid but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_free_pid | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -43384,17 +32739,17 @@
+ _ACEOF
  
-      HAVE_MM_DUMPABLE=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for get_dumpable" >&5
--echo $ECHO_N "checking kernel symbol table for get_dumpable... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for get_dumpable" >&5
-+$as_echo_n "checking kernel symbol table for get_dumpable... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for pid_hash" >&5
+-echo $ECHO_N "checking kernel symbol table for pid_hash... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pid_hash" >&5
++$as_echo_n "checking kernel symbol table for pid_hash... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_get_dumpable+set}" = set; then
+-    if test "${cr_cv_ksymtab_pid_hash+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_get_dumpable+set}" = set; then :
++    if ${cr_cv_ksymtab_pid_hash+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_get_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}get_dumpable$/ {s/ .*//p;q;}"`
-@@ -39118,11 +28558,7 @@
+     cr_cv_ksymtab_pid_hash=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pid_hash$/ {s/ .*//p;q;}"`
+@@ -43410,11 +32765,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -83561,7 +89101,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -39142,42 +28578,18 @@
+@@ -43434,42 +32785,18 @@
    return 0;
  }
  _ACEOF
@@ -83591,7 +89131,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_get_dumpable="Y$cr_cv_ksymtab_get_dumpable"
+ 	 cr_cv_ksymtab_pid_hash="Y$cr_cv_ksymtab_pid_hash"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -83600,14 +89140,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_get_dumpable="N$cr_cv_ksymtab_get_dumpable"
+ 	 cr_cv_ksymtab_pid_hash="N$cr_cv_ksymtab_pid_hash"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -39207,8 +28619,8 @@
+@@ -43499,17 +32826,17 @@
  _ACEOF
  
    fi
@@ -83616,114 +89156,22 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- # Allow one or more match(es)
- if test -z "${HAVE_MM_DUMPABLE}${cr_addr}"; then
-@@ -39231,39 +28643,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -39277,21 +28709,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" "$LINENO" 5
- 
- fi
- 
- 
- 
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.rlim" >&5
-+$as_echo_n "checking kernel for task.rlim... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for task.rlim" >&5
--echo $ECHO_N "checking kernel for task.rlim... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_TASK_RLIM+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for pidhash_shift" >&5
+-echo $ECHO_N "checking kernel symbol table for pidhash_shift... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pidhash_shift" >&5
++$as_echo_n "checking kernel symbol table for pidhash_shift... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_pidhash_shift+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_RLIM+set}" = set; then :
++    if ${cr_cv_ksymtab_pidhash_shift+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -39302,11 +28731,7 @@
+     cr_cv_ksymtab_pidhash_shift=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidhash_shift$/ {s/ .*//p;q;}"`
+@@ -43525,11 +32852,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -83736,7 +89184,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -39324,42 +28749,18 @@
+@@ -43549,42 +32872,18 @@
    return 0;
  }
  _ACEOF
@@ -83766,7 +89214,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_RLIM=yes
+ 	 cr_cv_ksymtab_pidhash_shift="Y$cr_cv_ksymtab_pidhash_shift"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -83775,56 +89223,40 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_RLIM=no
+ 	 cr_cv_ksymtab_pidhash_shift="N$cr_cv_ksymtab_pidhash_shift"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -39367,33 +28768,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_RLIM
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_RLIM 1
--_ACEOF
-+    $as_echo "#define HAVE_TASK_RLIM 1" >>confdefs.h
- 
-      HAVE_TASK_RLIM=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_RLIM 0
--_ACEOF
-+    $as_echo "#define HAVE_TASK_RLIM 0" >>confdefs.h
+@@ -43614,19 +32913,18 @@
+ _ACEOF
  
-      HAVE_TASK_RLIM=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+   # Can't use true type because 'struct kmem_cache' is opaque by design
  
  
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pid_namespace.pid_cachep" >&5
++$as_echo_n "checking kernel for pid_namespace.pid_cachep... " >&6; }
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for signal.rlim" >&5
-+$as_echo_n "checking kernel for signal.rlim... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for signal.rlim" >&5
--echo $ECHO_N "checking kernel for signal.rlim... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for pid_namespace.pid_cachep" >&5
+-echo $ECHO_N "checking kernel for pid_namespace.pid_cachep... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_SIGNAL_RLIM+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_SIGNAL_RLIM+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -39404,11 +28800,7 @@
+@@ -43637,11 +32935,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -83837,7 +89269,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -39426,42 +28818,18 @@
+@@ -43662,42 +32956,18 @@
    return 0;
  }
  _ACEOF
@@ -83867,7 +89299,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SIGNAL_RLIM=yes
+ 	 cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -83876,41 +89308,125 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SIGNAL_RLIM=no
+ 	 cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -39469,22 +28837,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_SIGNAL_RLIM
+@@ -43705,32 +32975,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SIGNAL_RLIM 1
+-#define HAVE_PID_NAMESPACE_PID_CACHEP 1
 -_ACEOF
-+    $as_echo "#define HAVE_SIGNAL_RLIM 1" >>confdefs.h
++    $as_echo "#define HAVE_PID_NAMESPACE_PID_CACHEP 1" >>confdefs.h
  
-      HAVE_SIGNAL_RLIM=1
+      HAVE_PID_NAMESPACE_PID_CACHEP=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SIGNAL_RLIM 0
+-#define HAVE_PID_NAMESPACE_PID_CACHEP 0
 -_ACEOF
-+    $as_echo "#define HAVE_SIGNAL_RLIM 0" >>confdefs.h
++    $as_echo "#define HAVE_PID_NAMESPACE_PID_CACHEP 0" >>confdefs.h
+ 
+      HAVE_PID_NAMESPACE_PID_CACHEP=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for pid_cachep" >&5
+-echo $ECHO_N "checking kernel symbol table for pid_cachep... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pid_cachep" >&5
++$as_echo_n "checking kernel symbol table for pid_cachep... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_pid_cachep+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_pid_cachep+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+     cr_cv_ksymtab_pid_cachep=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pid_cachep$/ {s/ .*//p;q;}"`
+@@ -43746,11 +33012,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -43770,42 +33032,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_pid_cachep="Y$cr_cv_ksymtab_pid_cachep"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_pid_cachep="N$cr_cv_ksymtab_pid_cachep"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-      HAVE_SIGNAL_RLIM=''
-   fi
+     fi
  
+@@ -43841,8 +33079,8 @@
+ _ACEOF
  
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+   if test -z "${cr_addr}${HAVE_PID_NAMESPACE_PID_CACHEP}"; then
  
- # Allow exactly one match
-@@ -39508,39 +28872,59 @@
+@@ -43864,39 +33102,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -83973,14 +89489,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -83988,34 +89516,128 @@
    fi
  fi
  rm -f confcache
-@@ -39554,21 +28938,18 @@
+@@ -43910,20 +33179,18 @@
    echo "  Kernel running currently = `uname -r`"
    echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" >&2;}
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" "$LINENO" 5
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" "$LINENO" 5
  
+   fi
+   if test -n "${HAVE_LINUX_PSPACE_H}"; then
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for init_pspace" >&5
+-echo $ECHO_N "checking kernel symbol table for init_pspace... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for init_pspace" >&5
++$as_echo_n "checking kernel symbol table for init_pspace... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_init_pspace+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_init_pspace+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+     cr_cv_ksymtab_init_pspace=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}init_pspace$/ {s/ .*//p;q;}"`
+@@ -43939,11 +33206,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -43963,42 +33226,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_init_pspace="Y$cr_cv_ksymtab_init_pspace"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_init_pspace="N$cr_cv_ksymtab_init_pspace"
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+     fi
  
+@@ -44009,9 +33248,7 @@
+     cr_result='not found'
+   else
+     if expr "$cr_cv_ksymtab_init_pspace" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol init_pspace but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol init_pspace but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol init_pspace but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_init_pspace | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -44027,18 +33264,18 @@
+ _ACEOF
  
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
+   elif test -n "${HAVE_LINUX_PID_NAMESPACE_H}"; then
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.cred" >&5
-+$as_echo_n "checking kernel for task.cred... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for task.cred" >&5
--echo $ECHO_N "checking kernel for task.cred... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_TASK_CRED+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for init_pid_ns" >&5
+-echo $ECHO_N "checking kernel symbol table for init_pid_ns... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for init_pid_ns" >&5
++$as_echo_n "checking kernel symbol table for init_pid_ns... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_init_pid_ns+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_CRED+set}" = set; then :
++    if ${cr_cv_ksymtab_init_pid_ns+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -39579,11 +28960,7 @@
+     cr_cv_ksymtab_init_pid_ns=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}init_pid_ns$/ {s/ .*//p;q;}"`
+@@ -44054,11 +33291,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -84028,7 +89650,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -39601,42 +28978,18 @@
+@@ -44078,42 +33311,18 @@
    return 0;
  }
  _ACEOF
@@ -84058,7 +89680,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_CRED=yes
+ 	 cr_cv_ksymtab_init_pid_ns="Y$cr_cv_ksymtab_init_pid_ns"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -84067,57 +89689,53 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_CRED=no
+ 	 cr_cv_ksymtab_init_pid_ns="N$cr_cv_ksymtab_init_pid_ns"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -39644,34 +28997,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_CRED
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_CRED 1
--_ACEOF
-+    $as_echo "#define HAVE_TASK_CRED 1" >>confdefs.h
- 
-      HAVE_TASK_CRED=1
+@@ -44124,9 +33333,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_CRED 0
--_ACEOF
-+    $as_echo "#define HAVE_TASK_CRED 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_init_pid_ns" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol init_pid_ns but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol init_pid_ns but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol init_pid_ns but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_init_pid_ns | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -44142,8 +33349,8 @@
+ _ACEOF
  
-      HAVE_TASK_CRED=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+   fi
+ fi
+@@ -44151,12 +33358,11 @@
  
  
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.0 attach_pid" >&5
++$as_echo_n "checking kernel for 2.6.0 attach_pid... " >&6; }
  
- 
--  echo "$as_me:$LINENO: checking kernel for task.group_info" >&5
--echo $ECHO_N "checking kernel for task.group_info... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.group_info" >&5
-+$as_echo_n "checking kernel for task.group_info... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_TASK_GROUP_INFO+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for 2.6.0 attach_pid" >&5
+-echo $ECHO_N "checking kernel for 2.6.0 attach_pid... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_GROUP_INFO+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -39682,11 +29030,7 @@
+@@ -44167,11 +33373,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -84130,7 +89748,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -39704,42 +29048,18 @@
+@@ -44190,42 +33392,18 @@
    return 0;
  }
  _ACEOF
@@ -84160,7 +89778,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_GROUP_INFO=yes
+ 	 cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -84169,35 +89787,36 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_GROUP_INFO=no
+ 	 cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -39747,33 +29067,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_GROUP_INFO
+@@ -44233,33 +33411,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_GROUP_INFO 1
+-#define HAVE_2_6_0_ATTACH_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_GROUP_INFO 1" >>confdefs.h
++    $as_echo "#define HAVE_2_6_0_ATTACH_PID 1" >>confdefs.h
  
-      HAVE_TASK_GROUP_INFO=1
+      HAVE_2_6_0_ATTACH_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_GROUP_INFO 0
+-#define HAVE_2_6_0_ATTACH_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_GROUP_INFO 0" >>confdefs.h
++    $as_echo "#define HAVE_2_6_0_ATTACH_PID 0" >>confdefs.h
  
-      HAVE_TASK_GROUP_INFO=''
+      HAVE_2_6_0_ATTACH_PID=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -84205,20 +89824,19 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for suid_dumpable" >&5
-+$as_echo_n "checking kernel for suid_dumpable... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for 2.6.22 attach_pid" >&5
+-echo $ECHO_N "checking kernel for 2.6.22 attach_pid... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.22 attach_pid" >&5
++$as_echo_n "checking kernel for 2.6.22 attach_pid... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for suid_dumpable" >&5
--echo $ECHO_N "checking kernel for suid_dumpable... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_SUID_DUMPABLE+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_SUID_DUMPABLE+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -39784,11 +29099,7 @@
+@@ -44270,11 +33443,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -84231,7 +89849,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -39807,42 +29118,18 @@
+@@ -44293,42 +33462,18 @@
    return 0;
  }
  _ACEOF
@@ -84261,7 +89879,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SUID_DUMPABLE=yes
+ 	 cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -84270,30 +89888,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SUID_DUMPABLE=no
+ 	 cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -39850,33 +29137,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_SUID_DUMPABLE
+@@ -44336,33 +33481,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SUID_DUMPABLE 1
+-#define HAVE_2_6_22_ATTACH_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_SUID_DUMPABLE 1" >>confdefs.h
++    $as_echo "#define HAVE_2_6_22_ATTACH_PID 1" >>confdefs.h
  
-      HAVE_SUID_DUMPABLE=1
+      HAVE_2_6_22_ATTACH_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SUID_DUMPABLE 0
+-#define HAVE_2_6_22_ATTACH_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_SUID_DUMPABLE 0" >>confdefs.h
++    $as_echo "#define HAVE_2_6_22_ATTACH_PID 0" >>confdefs.h
  
-      HAVE_SUID_DUMPABLE=''
+      HAVE_2_6_22_ATTACH_PID=''
    fi
  
  
@@ -84303,23 +89921,23 @@
 +$as_echo "$cr_result" >&6; }
  
  
- if test -n "${HAVE_SUID_DUMPABLE}"; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for suid_dumpable" >&5
--echo $ECHO_N "checking kernel symbol table for suid_dumpable... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for suid_dumpable" >&5
-+$as_echo_n "checking kernel symbol table for suid_dumpable... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_suid_dumpable+set}" = set; then
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.26 attach_pid" >&5
++$as_echo_n "checking kernel for 2.6.26 attach_pid... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2.6.26 attach_pid" >&5
+-echo $ECHO_N "checking kernel for 2.6.26 attach_pid... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_suid_dumpable+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_suid_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}suid_dumpable$/ {s/ .*//p;q;}"`
-@@ -39892,11 +29175,7 @@
+ 
+@@ -44373,11 +33513,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -84332,7 +89950,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -39916,42 +29195,18 @@
+@@ -44396,42 +33532,18 @@
    return 0;
  }
  _ACEOF
@@ -84362,7 +89980,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_suid_dumpable="Y$cr_cv_ksymtab_suid_dumpable"
+ 	 cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -84371,51 +89989,158 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_suid_dumpable="N$cr_cv_ksymtab_suid_dumpable"
+ 	 cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -39962,9 +29217,7 @@
-     cr_result='not found'
+ fi
+@@ -44439,22 +33551,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_26_ATTACH_PID 1
+-_ACEOF
++    $as_echo "#define HAVE_2_6_26_ATTACH_PID 1" >>confdefs.h
+ 
+      HAVE_2_6_26_ATTACH_PID=1
    else
-     if expr "$cr_cv_ksymtab_suid_dumpable" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol suid_dumpable but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol suid_dumpable but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol suid_dumpable but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_suid_dumpable | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -39980,19 +29233,18 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_26_ATTACH_PID 0
+-_ACEOF
++    $as_echo "#define HAVE_2_6_26_ATTACH_PID 0" >>confdefs.h
  
+      HAVE_2_6_26_ATTACH_PID=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+ 
+ 
+@@ -44479,39 +33587,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -44525,21 +33664,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" "$LINENO" 5
+ 
  fi
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for set_dumpable" >&5
-+$as_echo_n "checking kernel for set_dumpable... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for set_dumpable" >&5
--echo $ECHO_N "checking kernel for set_dumpable... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for change_pid" >&5
++$as_echo_n "checking kernel for change_pid... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for change_pid" >&5
+-echo $ECHO_N "checking kernel for change_pid... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_SET_DUMPABLE+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_CHANGE_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_SET_DUMPABLE+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_CHANGE_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -40003,11 +29255,7 @@
+@@ -44550,11 +33686,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -84428,7 +90153,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -40031,42 +29279,18 @@
+@@ -44580,42 +33712,18 @@
    return 0;
  }
  _ACEOF
@@ -84458,7 +90183,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SET_DUMPABLE=yes
+ 	 cr_cv_kconfig_HAVE_CHANGE_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -84467,30 +90192,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SET_DUMPABLE=no
+ 	 cr_cv_kconfig_HAVE_CHANGE_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -40074,33 +29298,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_SET_DUMPABLE
+@@ -44623,22 +33731,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_CHANGE_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_DUMPABLE 1
+-#define HAVE_CHANGE_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_SET_DUMPABLE 1" >>confdefs.h
++    $as_echo "#define HAVE_CHANGE_PID 1" >>confdefs.h
  
-      HAVE_SET_DUMPABLE=1
+      HAVE_CHANGE_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_DUMPABLE 0
+-#define HAVE_CHANGE_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_SET_DUMPABLE 0" >>confdefs.h
++    $as_echo "#define HAVE_CHANGE_PID 0" >>confdefs.h
  
-      HAVE_SET_DUMPABLE=''
+      HAVE_CHANGE_PID=''
    fi
  
  
@@ -84500,23 +90225,25 @@
 +$as_echo "$cr_result" >&6; }
  
  
- if test -n "${HAVE_SET_DUMPABLE}"; then
+ # OK if missing
+@@ -44646,12 +33750,11 @@
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for set_dumpable" >&5
--echo $ECHO_N "checking kernel symbol table for set_dumpable... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for set_dumpable" >&5
-+$as_echo_n "checking kernel symbol table for set_dumpable... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_set_dumpable+set}" = set; then
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct pidmap" >&5
++$as_echo_n "checking kernel for struct pidmap... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for struct pidmap" >&5
+-echo $ECHO_N "checking kernel for struct pidmap... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_STRUCT_PIDMAP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_set_dumpable+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_STRUCT_PIDMAP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_set_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}set_dumpable$/ {s/ .*//p;q;}"`
-@@ -40116,11 +29336,7 @@
+ 
+@@ -44662,11 +33765,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -84529,7 +90256,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -40140,42 +29356,18 @@
+@@ -44693,42 +33792,18 @@
    return 0;
  }
  _ACEOF
@@ -84559,7 +90286,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_set_dumpable="Y$cr_cv_ksymtab_set_dumpable"
+ 	 cr_cv_kconfig_HAVE_STRUCT_PIDMAP=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -84568,50 +90295,55 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_set_dumpable="N$cr_cv_ksymtab_set_dumpable"
+ 	 cr_cv_kconfig_HAVE_STRUCT_PIDMAP=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -40186,9 +29378,7 @@
-     cr_result='not found'
+ fi
+@@ -44736,32 +33811,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_STRUCT_PIDMAP
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_PIDMAP 1
+-_ACEOF
++    $as_echo "#define HAVE_STRUCT_PIDMAP 1" >>confdefs.h
+ 
+      HAVE_STRUCT_PIDMAP=1
    else
-     if expr "$cr_cv_ksymtab_set_dumpable" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol set_dumpable but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol set_dumpable but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol set_dumpable but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_set_dumpable | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -40204,18 +29394,18 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_PIDMAP 0
+-_ACEOF
++    $as_echo "#define HAVE_STRUCT_PIDMAP 0" >>confdefs.h
  
+      HAVE_STRUCT_PIDMAP=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- fi
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for groups_search" >&5
--echo $ECHO_N "checking kernel symbol table for groups_search... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for groups_search" >&5
-+$as_echo_n "checking kernel symbol table for groups_search... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for pidmap_array" >&5
+-echo $ECHO_N "checking kernel symbol table for pidmap_array... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pidmap_array" >&5
++$as_echo_n "checking kernel symbol table for pidmap_array... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_groups_search+set}" = set; then
+-    if test "${cr_cv_ksymtab_pidmap_array+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_groups_search+set}" = set; then :
++    if ${cr_cv_ksymtab_pidmap_array+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_groups_search=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}groups_search$/ {s/ .*//p;q;}"`
-@@ -40231,11 +29421,7 @@
+     cr_cv_ksymtab_pidmap_array=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidmap_array$/ {s/ .*//p;q;}"`
+@@ -44777,11 +33848,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -84624,7 +90356,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -40255,42 +29441,18 @@
+@@ -44801,42 +33868,18 @@
    return 0;
  }
  _ACEOF
@@ -84654,7 +90386,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_groups_search="Y$cr_cv_ksymtab_groups_search"
+ 	 cr_cv_ksymtab_pidmap_array="Y$cr_cv_ksymtab_pidmap_array"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -84663,14 +90395,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_groups_search="N$cr_cv_ksymtab_groups_search"
+ 	 cr_cv_ksymtab_pidmap_array="N$cr_cv_ksymtab_pidmap_array"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -40320,17 +29482,17 @@
+@@ -44874,18 +33917,18 @@
  _ACEOF
  
    fi
@@ -84679,22 +90411,23 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+ if test x"$cr_kernel_smp" = xyes; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for supplemental_group_member" >&5
--echo $ECHO_N "checking kernel symbol table for supplemental_group_member... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for supplemental_group_member" >&5
-+$as_echo_n "checking kernel symbol table for supplemental_group_member... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for pidmap_lock" >&5
+-echo $ECHO_N "checking kernel symbol table for pidmap_lock... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pidmap_lock" >&5
++$as_echo_n "checking kernel symbol table for pidmap_lock... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_supplemental_group_member+set}" = set; then
+-    if test "${cr_cv_ksymtab_pidmap_lock+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_supplemental_group_member+set}" = set; then :
++    if ${cr_cv_ksymtab_pidmap_lock+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_supplemental_group_member=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}supplemental_group_member$/ {s/ .*//p;q;}"`
-@@ -40346,11 +29508,7 @@
+     cr_cv_ksymtab_pidmap_lock=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidmap_lock$/ {s/ .*//p;q;}"`
+@@ -44901,11 +33944,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -84707,7 +90440,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -40370,42 +29528,18 @@
+@@ -44925,42 +33964,18 @@
    return 0;
  }
  _ACEOF
@@ -84737,7 +90470,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_supplemental_group_member="Y$cr_cv_ksymtab_supplemental_group_member"
+ 	 cr_cv_ksymtab_pidmap_lock="Y$cr_cv_ksymtab_pidmap_lock"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -84746,14 +90479,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_supplemental_group_member="N$cr_cv_ksymtab_supplemental_group_member"
+ 	 cr_cv_ksymtab_pidmap_lock="N$cr_cv_ksymtab_pidmap_lock"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -40435,19 +29569,18 @@
+@@ -44990,25 +34005,22 @@
  _ACEOF
  
    fi
@@ -84762,24 +90495,31 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+   if test -z "$cr_addr"; then
+-    { { echo "$as_me:$LINENO: error: failed to find symbol pidmap_lock" >&5
+-echo "$as_me: error: failed to find symbol pidmap_lock" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "failed to find symbol pidmap_lock" "$LINENO" 5
+   fi
+ fi
  
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for PIDTYPE_TGID" >&5
-+$as_echo_n "checking kernel for PIDTYPE_TGID... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for PIDTYPE_TGID" >&5
--echo $ECHO_N "checking kernel for PIDTYPE_TGID... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kill_pid" >&5
++$as_echo_n "checking kernel for kill_pid... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for kill_pid" >&5
+-echo $ECHO_N "checking kernel for kill_pid... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_PIDTYPE_TGID+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_KILL_PID+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PIDTYPE_TGID+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_KILL_PID+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -40458,11 +29591,7 @@
+@@ -45019,11 +34031,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -84792,7 +90532,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -40482,42 +29611,18 @@
+@@ -45047,42 +34055,18 @@
    return 0;
  }
  _ACEOF
@@ -84822,7 +90562,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PIDTYPE_TGID=yes
+ 	 cr_cv_kconfig_HAVE_KILL_PID=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -84831,36 +90571,35 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PIDTYPE_TGID=no
+ 	 cr_cv_kconfig_HAVE_KILL_PID=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -40525,33 +29630,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_PIDTYPE_TGID
+@@ -45090,33 +34074,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_KILL_PID
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PIDTYPE_TGID 1
+-#define HAVE_KILL_PID 1
 -_ACEOF
-+    $as_echo "#define HAVE_PIDTYPE_TGID 1" >>confdefs.h
++    $as_echo "#define HAVE_KILL_PID 1" >>confdefs.h
  
-      HAVE_PIDTYPE_TGID=1
+      HAVE_KILL_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PIDTYPE_TGID 0
+-#define HAVE_KILL_PID 0
 -_ACEOF
-+    $as_echo "#define HAVE_PIDTYPE_TGID 0" >>confdefs.h
++    $as_echo "#define HAVE_KILL_PID 0" >>confdefs.h
  
-      HAVE_PIDTYPE_TGID=''
+      HAVE_KILL_PID=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
@@ -84868,19 +90607,20 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel for task.thread_group" >&5
--echo $ECHO_N "checking kernel for task.thread_group... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.thread_group" >&5
-+$as_echo_n "checking kernel for task.thread_group... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kill_proc" >&5
++$as_echo_n "checking kernel for kill_proc... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_TASK_THREAD_GROUP+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for kill_proc" >&5
+-echo $ECHO_N "checking kernel for kill_proc... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_KILL_PROC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_THREAD_GROUP+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_KILL_PROC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -40562,11 +29662,7 @@
+@@ -45127,11 +34106,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -84893,7 +90633,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -40584,42 +29680,18 @@
+@@ -45155,42 +34130,18 @@
    return 0;
  }
  _ACEOF
@@ -84923,7 +90663,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_THREAD_GROUP=yes
+ 	 cr_cv_kconfig_HAVE_KILL_PROC=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -84932,30 +90672,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_THREAD_GROUP=no
+ 	 cr_cv_kconfig_HAVE_KILL_PROC=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -40627,22 +29699,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_THREAD_GROUP
+@@ -45198,22 +34149,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_KILL_PROC
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_THREAD_GROUP 1
+-#define HAVE_KILL_PROC 1
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_THREAD_GROUP 1" >>confdefs.h
++    $as_echo "#define HAVE_KILL_PROC 1" >>confdefs.h
  
-      HAVE_TASK_THREAD_GROUP=1
+      HAVE_KILL_PROC=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_THREAD_GROUP 0
+-#define HAVE_KILL_PROC 0
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_THREAD_GROUP 0" >>confdefs.h
++    $as_echo "#define HAVE_KILL_PROC 0" >>confdefs.h
  
-      HAVE_TASK_THREAD_GROUP=''
+      HAVE_KILL_PROC=''
    fi
  
  
@@ -84965,8 +90705,8 @@
 +$as_echo "$cr_result" >&6; }
  
  
- if test "${HAVE_PIDTYPE_TGID}${HAVE_TASK_THREAD_GROUP}" != "1"; then
-@@ -40665,39 +29733,59 @@
+ # Require at least one
+@@ -45237,39 +34184,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -85029,14 +90769,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -85044,33 +90796,34 @@
    fi
  fi
  rm -f confcache
-@@ -40711,20 +29799,18 @@
+@@ -45283,21 +34261,18 @@
    echo "  Kernel running currently = `uname -r`"
    echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine thread group list" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine thread group list" >&2;}
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine thread group list" "$LINENO" 5
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" "$LINENO" 5
  
  fi
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for detach_pid" >&5
--echo $ECHO_N "checking kernel symbol table for detach_pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for detach_pid" >&5
-+$as_echo_n "checking kernel symbol table for detach_pid... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_detach_pid+set}" = set; then
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for child_reaper" >&5
++$as_echo_n "checking kernel for child_reaper... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for child_reaper" >&5
+-echo $ECHO_N "checking kernel for child_reaper... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_CHILD_REAPER+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_detach_pid+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_CHILD_REAPER+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_detach_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}detach_pid$/ {s/ .*//p;q;}"`
-@@ -40740,11 +29826,7 @@
+ 
+@@ -45308,11 +34283,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -85083,7 +90836,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -40764,42 +29846,18 @@
+@@ -45336,42 +34307,18 @@
    return 0;
  }
  _ACEOF
@@ -85113,7 +90866,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_detach_pid="Y$cr_cv_ksymtab_detach_pid"
+ 	 cr_cv_kconfig_HAVE_CHILD_REAPER=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -85122,49 +90875,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_detach_pid="N$cr_cv_ksymtab_detach_pid"
+ 	 cr_cv_kconfig_HAVE_CHILD_REAPER=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -40810,9 +29868,7 @@
-     cr_result='not found'
+ fi
+@@ -45379,33 +34326,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_CHILD_REAPER
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CHILD_REAPER 1
+-_ACEOF
++    $as_echo "#define HAVE_CHILD_REAPER 1" >>confdefs.h
+ 
+      HAVE_CHILD_REAPER=1
    else
-     if expr "$cr_cv_ksymtab_detach_pid" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol detach_pid but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol detach_pid but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol detach_pid but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_detach_pid | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -40828,17 +29884,17 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CHILD_REAPER 0
+-_ACEOF
++    $as_echo "#define HAVE_CHILD_REAPER 0" >>confdefs.h
  
+      HAVE_CHILD_REAPER=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for attach_pid" >&5
--echo $ECHO_N "checking kernel symbol table for attach_pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for attach_pid" >&5
-+$as_echo_n "checking kernel symbol table for attach_pid... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_attach_pid+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task_child_reaper" >&5
++$as_echo_n "checking kernel for task_child_reaper... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for task_child_reaper" >&5
+-echo $ECHO_N "checking kernel for task_child_reaper... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_TASK_CHILD_REAPER+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_attach_pid+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_CHILD_REAPER+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_attach_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}attach_pid$/ {s/ .*//p;q;}"`
-@@ -40854,11 +29910,7 @@
+ 
+@@ -45416,11 +34358,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -85177,7 +90937,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -40878,42 +29930,18 @@
+@@ -45444,42 +34382,18 @@
    return 0;
  }
  _ACEOF
@@ -85207,7 +90967,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_attach_pid="Y$cr_cv_ksymtab_attach_pid"
+ 	 cr_cv_kconfig_HAVE_TASK_CHILD_REAPER=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -85216,49 +90976,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_attach_pid="N$cr_cv_ksymtab_attach_pid"
+ 	 cr_cv_kconfig_HAVE_TASK_CHILD_REAPER=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -40924,9 +29952,7 @@
-     cr_result='not found'
+ fi
+@@ -45487,33 +34401,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_CHILD_REAPER
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TASK_CHILD_REAPER 1
+-_ACEOF
++    $as_echo "#define HAVE_TASK_CHILD_REAPER 1" >>confdefs.h
+ 
+      HAVE_TASK_CHILD_REAPER=1
    else
-     if expr "$cr_cv_ksymtab_attach_pid" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol attach_pid but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol attach_pid but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol attach_pid but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_attach_pid | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -40942,17 +29968,17 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TASK_CHILD_REAPER 0
+-_ACEOF
++    $as_echo "#define HAVE_TASK_CHILD_REAPER 0" >>confdefs.h
  
+      HAVE_TASK_CHILD_REAPER=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ if test -z "${HAVE_CHILD_REAPER}${HAVE_TASK_CHILD_REAPER}"; then
  
--  echo "$as_me:$LINENO: checking kernel symbol table for change_pid" >&5
--echo $ECHO_N "checking kernel symbol table for change_pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for change_pid" >&5
-+$as_echo_n "checking kernel symbol table for change_pid... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for child_reaper" >&5
+-echo $ECHO_N "checking kernel symbol table for child_reaper... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for child_reaper" >&5
++$as_echo_n "checking kernel symbol table for child_reaper... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_change_pid+set}" = set; then
+-    if test "${cr_cv_ksymtab_child_reaper+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_change_pid+set}" = set; then :
++    if ${cr_cv_ksymtab_child_reaper+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_change_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}change_pid$/ {s/ .*//p;q;}"`
-@@ -40968,11 +29994,7 @@
+     cr_cv_ksymtab_child_reaper=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}child_reaper$/ {s/ .*//p;q;}"`
+@@ -45529,11 +34439,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -85271,7 +91038,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -40992,42 +30014,18 @@
+@@ -45553,42 +34459,18 @@
    return 0;
  }
  _ACEOF
@@ -85301,7 +91068,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_change_pid="Y$cr_cv_ksymtab_change_pid"
+ 	 cr_cv_ksymtab_child_reaper="Y$cr_cv_ksymtab_child_reaper"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -85310,25 +91077,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_change_pid="N$cr_cv_ksymtab_change_pid"
+ 	 cr_cv_ksymtab_child_reaper="N$cr_cv_ksymtab_child_reaper"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -41038,9 +30036,7 @@
-     cr_result='not found'
-   else
-     if expr "$cr_cv_ksymtab_change_pid" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol change_pid but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol change_pid but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol change_pid but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_change_pid | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -41056,17 +30052,17 @@
+@@ -45618,20 +34500,19 @@
  _ACEOF
  
    fi
@@ -85337,22 +91093,25 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+ fi
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for find_pid" >&5
--echo $ECHO_N "checking kernel symbol table for find_pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for find_pid" >&5
-+$as_echo_n "checking kernel symbol table for find_pid... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_find_pid+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.parent" >&5
++$as_echo_n "checking kernel for task.parent... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for task.parent" >&5
+-echo $ECHO_N "checking kernel for task.parent... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_TASK_PARENT+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_find_pid+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_PARENT+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_find_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}find_pid$/ {s/ .*//p;q;}"`
-@@ -41082,11 +30078,7 @@
+ 
+@@ -45642,11 +34523,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -85365,7 +91124,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -41106,42 +30098,18 @@
+@@ -45664,42 +34541,18 @@
    return 0;
  }
  _ACEOF
@@ -85395,7 +91154,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_find_pid="Y$cr_cv_ksymtab_find_pid"
+ 	 cr_cv_kconfig_HAVE_TASK_PARENT=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -85404,49 +91163,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_find_pid="N$cr_cv_ksymtab_find_pid"
+ 	 cr_cv_kconfig_HAVE_TASK_PARENT=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -41152,9 +30120,7 @@
-     cr_result='not found'
+ fi
+@@ -45707,33 +34560,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_PARENT
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TASK_PARENT 1
+-_ACEOF
++    $as_echo "#define HAVE_TASK_PARENT 1" >>confdefs.h
+ 
+      HAVE_TASK_PARENT=1
    else
-     if expr "$cr_cv_ksymtab_find_pid" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol find_pid but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol find_pid but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol find_pid but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_find_pid | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -41170,17 +30136,17 @@
- _ACEOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TASK_PARENT 0
+-_ACEOF
++    $as_echo "#define HAVE_TASK_PARENT 0" >>confdefs.h
  
+      HAVE_TASK_PARENT=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for link_pid" >&5
--echo $ECHO_N "checking kernel symbol table for link_pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for link_pid" >&5
-+$as_echo_n "checking kernel symbol table for link_pid... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_link_pid+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.real_parent" >&5
++$as_echo_n "checking kernel for task.real_parent... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for task.real_parent" >&5
+-echo $ECHO_N "checking kernel for task.real_parent... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_TASK_REAL_PARENT+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_link_pid+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_REAL_PARENT+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_link_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}link_pid$/ {s/ .*//p;q;}"`
-@@ -41196,11 +30162,7 @@
+ 
+@@ -45744,11 +34592,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -85459,7 +91225,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -41220,42 +30182,18 @@
+@@ -45766,42 +34610,18 @@
    return 0;
  }
  _ACEOF
@@ -85489,7 +91255,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_link_pid="Y$cr_cv_ksymtab_link_pid"
+ 	 cr_cv_kconfig_HAVE_TASK_REAL_PARENT=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -85498,53 +91264,55 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_link_pid="N$cr_cv_ksymtab_link_pid"
+ 	 cr_cv_kconfig_HAVE_TASK_REAL_PARENT=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -41266,9 +30204,7 @@
-     cr_result='not found'
-   else
-     if expr "$cr_cv_ksymtab_link_pid" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol link_pid but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol link_pid but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol link_pid but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_link_pid | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -41284,9 +30220,8 @@
- _ACEOF
+ fi
+@@ -45809,32 +34629,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_REAL_PARENT
  
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
--
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TASK_REAL_PARENT 1
+-_ACEOF
++    $as_echo "#define HAVE_TASK_REAL_PARENT 1" >>confdefs.h
  
+      HAVE_TASK_REAL_PARENT=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TASK_REAL_PARENT 0
+-_ACEOF
++    $as_echo "#define HAVE_TASK_REAL_PARENT 0" >>confdefs.h
  
+      HAVE_TASK_REAL_PARENT=''
+   fi
  
-@@ -41295,11 +30230,11 @@
  
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
  
--  echo "$as_me:$LINENO: checking kernel for 1-arg find_pid" >&5
--echo $ECHO_N "checking kernel for 1-arg find_pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 1-arg find_pid" >&5
-+$as_echo_n "checking kernel for 1-arg find_pid... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_1_ARG_FIND_PID+set}" = set; then
+ # Look for non-deprecated "typedef struct SOMETHING kmem_cache_t".
+ # This is slightly complicated by the fact that this is an opaque type (with
+ # the struct itself forward-declared but not defined in the public headers).
+-echo "$as_me:$LINENO: checking kernel for kmem_cache_t" >&5
+-echo $ECHO_N "checking kernel for kmem_cache_t... $ECHO_C" >&6
+-if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_T+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_1_ARG_FIND_PID+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kmem_cache_t" >&5
++$as_echo_n "checking kernel for kmem_cache_t... " >&6; }
++if ${cr_cv_kconfig_HAVE_KMEM_CACHE_T+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -41310,11 +30245,7 @@
+@@ -45845,11 +34661,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -85557,7 +91325,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -41335,42 +30266,18 @@
+@@ -45866,28 +34678,7 @@
    return 0;
  }
  _ACEOF
@@ -85587,7 +91355,31 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_1_ARG_FIND_PID=yes
+@@ -45899,11 +34690,7 @@
+   SAVE_CPPFLAGS=$CPPFLAGS
+   CPP="$KCC -E"
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -45914,7 +34701,7 @@
+ 		 #include <linux/slab.h>
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "typedef.+[[:space:]]kmem_cache_t[[:space:]].+deprecated" >/dev/null 2>&1; then
++  $EGREP "typedef.+[[:space:]]kmem_cache_t[[:space:]].+deprecated" >/dev/null 2>&1; then :
+   CPP=$SAVE_CPP
+ 	CPPFLAGS=$SAVE_CPPFLAGS
+ 	cr_cv_kconfig_HAVE_KMEM_CACHE_T=no
+@@ -45929,46 +34716,37 @@
+  # Want *not* found
+ 
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -85596,58 +91388,53 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_1_ARG_FIND_PID=no
+ 	 cr_cv_kconfig_HAVE_KMEM_CACHE_T=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -41378,22 +30285,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_1_ARG_FIND_PID
+-echo "$as_me:$LINENO: result: $cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&5
+-echo "${ECHO_T}$cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&5
++$as_echo "$cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&6; }
  
-   if test $cr_result = yes; then
+   if test x$cr_cv_kconfig_HAVE_KMEM_CACHE_T = xyes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_1_ARG_FIND_PID 1
+-#define HAVE_KMEM_CACHE_T 1
 -_ACEOF
-+    $as_echo "#define HAVE_1_ARG_FIND_PID 1" >>confdefs.h
++    $as_echo "#define HAVE_KMEM_CACHE_T 1" >>confdefs.h
  
-      HAVE_1_ARG_FIND_PID=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_1_ARG_FIND_PID 0
+-#define HAVE_KMEM_CACHE_T 0
 -_ACEOF
-+    $as_echo "#define HAVE_1_ARG_FIND_PID 0" >>confdefs.h
++    $as_echo "#define HAVE_KMEM_CACHE_T 0" >>confdefs.h
  
-      HAVE_1_ARG_FIND_PID=''
    fi
  
  
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
  
-@@ -41403,12 +30306,11 @@
+-
+ # type of (struct fs_struct).lock
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg find_pid" >&5
-+$as_echo_n "checking kernel for 2-arg find_pid... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for fs_struct rwlock" >&5
++$as_echo_n "checking kernel for fs_struct rwlock... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 2-arg find_pid" >&5
--echo $ECHO_N "checking kernel for 2-arg find_pid... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for fs_struct rwlock" >&5
+-echo $ECHO_N "checking kernel for fs_struct rwlock... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_2_ARG_FIND_PID+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_FS_STRUCT_RWLOCK+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_ARG_FIND_PID+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FS_STRUCT_RWLOCK+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -41419,11 +30321,7 @@
+@@ -45979,11 +34757,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -85660,7 +91447,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -41444,42 +30342,18 @@
+@@ -46004,42 +34778,18 @@
    return 0;
  }
  _ACEOF
@@ -85690,7 +91477,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_ARG_FIND_PID=yes
+ 	 cr_cv_kconfig_HAVE_FS_STRUCT_RWLOCK=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -85699,58 +91486,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_ARG_FIND_PID=no
+ 	 cr_cv_kconfig_HAVE_FS_STRUCT_RWLOCK=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -41487,23 +30361,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_ARG_FIND_PID
+@@ -46047,33 +34797,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_FS_STRUCT_RWLOCK
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_ARG_FIND_PID 1
+-#define HAVE_FS_STRUCT_RWLOCK 1
 -_ACEOF
-+    $as_echo "#define HAVE_2_ARG_FIND_PID 1" >>confdefs.h
++    $as_echo "#define HAVE_FS_STRUCT_RWLOCK 1" >>confdefs.h
  
-      HAVE_2_ARG_FIND_PID=1
+      HAVE_FS_STRUCT_RWLOCK=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_ARG_FIND_PID 0
+-#define HAVE_FS_STRUCT_RWLOCK 0
 -_ACEOF
-+    $as_echo "#define HAVE_2_ARG_FIND_PID 0" >>confdefs.h
++    $as_echo "#define HAVE_FS_STRUCT_RWLOCK 0" >>confdefs.h
  
-      HAVE_2_ARG_FIND_PID=''
+      HAVE_FS_STRUCT_RWLOCK=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
-@@ -41511,11 +30380,11 @@
  
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for fs_struct spinlock" >&5
++$as_echo_n "checking kernel for fs_struct spinlock... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for find_pid_ns" >&5
--echo $ECHO_N "checking kernel for find_pid_ns... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_pid_ns" >&5
-+$as_echo_n "checking kernel for find_pid_ns... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_FIND_PID_NS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for fs_struct spinlock" >&5
+-echo $ECHO_N "checking kernel for fs_struct spinlock... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_FS_STRUCT_SPINLOCK+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FIND_PID_NS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FS_STRUCT_SPINLOCK+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -41526,11 +30395,7 @@
+@@ -46084,11 +34829,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -85763,7 +91548,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -41554,42 +30419,18 @@
+@@ -46109,42 +34850,18 @@
    return 0;
  }
  _ACEOF
@@ -85793,7 +91578,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FIND_PID_NS=yes
+ 	 cr_cv_kconfig_HAVE_FS_STRUCT_SPINLOCK=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -85802,30 +91587,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FIND_PID_NS=no
+ 	 cr_cv_kconfig_HAVE_FS_STRUCT_SPINLOCK=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -41597,22 +30438,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_FIND_PID_NS
+@@ -46152,22 +34869,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_FS_STRUCT_SPINLOCK
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FIND_PID_NS 1
+-#define HAVE_FS_STRUCT_SPINLOCK 1
 -_ACEOF
-+    $as_echo "#define HAVE_FIND_PID_NS 1" >>confdefs.h
++    $as_echo "#define HAVE_FS_STRUCT_SPINLOCK 1" >>confdefs.h
  
-      HAVE_FIND_PID_NS=1
+      HAVE_FS_STRUCT_SPINLOCK=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FIND_PID_NS 0
+-#define HAVE_FS_STRUCT_SPINLOCK 0
 -_ACEOF
-+    $as_echo "#define HAVE_FIND_PID_NS 0" >>confdefs.h
++    $as_echo "#define HAVE_FS_STRUCT_SPINLOCK 0" >>confdefs.h
  
-      HAVE_FIND_PID_NS=''
+      HAVE_FS_STRUCT_SPINLOCK=''
    fi
  
  
@@ -85835,8 +91620,8 @@
 +$as_echo "$cr_result" >&6; }
  
  
- if test -z "${HAVE_1_ARG_FIND_PID}${HAVE_2_ARG_FIND_PID}${HAVE_FIND_PID_NS}"; then
-@@ -41635,39 +30472,59 @@
+ if test "$HAVE_FS_STRUCT_RWLOCK$HAVE_FS_STRUCT_SPINLOCK" = "11" \
+@@ -46191,39 +34904,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -85899,14 +91684,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -85914,34 +91711,136 @@
    fi
  fi
  rm -f confcache
-@@ -41681,21 +30538,18 @@
+@@ -46237,21 +34981,18 @@
    echo "  Kernel running currently = `uname -r`"
    echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" >&2;}
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized type for fs_struct.lock" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized type for fs_struct.lock" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" "$LINENO" 5
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unrecognized type for fs_struct.lock" "$LINENO" 5
+ 
+ fi
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for gfp_t" >&5
++$as_echo_n "checking kernel for gfp_t... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for gfp_t" >&5
+-echo $ECHO_N "checking kernel for gfp_t... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_GFP_T+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_GFP_T+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ 
+@@ -46262,11 +35003,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -46286,42 +35023,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_GFP_T=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_GFP_T=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+@@ -46329,34 +35042,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_GFP_T
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GFP_T 1
+-_ACEOF
++    $as_echo "#define HAVE_GFP_T 1" >>confdefs.h
+ 
+      HAVE_GFP_T=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GFP_T 0
+-_ACEOF
++    $as_echo "#define HAVE_GFP_T 0" >>confdefs.h
+ 
+      HAVE_GFP_T=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
- fi
  
+ # OK if missing
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid" >&5
-+$as_echo_n "checking kernel for find_task_by_pid... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kzalloc" >&5
++$as_echo_n "checking kernel for kzalloc... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for find_task_by_pid" >&5
--echo $ECHO_N "checking kernel for find_task_by_pid... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for kzalloc" >&5
+-echo $ECHO_N "checking kernel for kzalloc... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_KZALLOC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_KZALLOC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -41706,11 +30560,7 @@
+@@ -46367,11 +35075,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -85954,7 +91853,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -41734,42 +30584,18 @@
+@@ -46395,42 +35099,18 @@
    return 0;
  }
  _ACEOF
@@ -85984,7 +91883,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID=yes
+ 	 cr_cv_kconfig_HAVE_KZALLOC=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -85993,30 +91892,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID=no
+ 	 cr_cv_kconfig_HAVE_KZALLOC=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -41777,33 +30603,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID
+@@ -46438,34 +35118,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_KZALLOC
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FIND_TASK_BY_PID 1
+-#define HAVE_KZALLOC 1
 -_ACEOF
-+    $as_echo "#define HAVE_FIND_TASK_BY_PID 1" >>confdefs.h
++    $as_echo "#define HAVE_KZALLOC 1" >>confdefs.h
  
-      HAVE_FIND_TASK_BY_PID=1
+      HAVE_KZALLOC=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FIND_TASK_BY_PID 0
+-#define HAVE_KZALLOC 0
 -_ACEOF
-+    $as_echo "#define HAVE_FIND_TASK_BY_PID 0" >>confdefs.h
++    $as_echo "#define HAVE_KZALLOC 0" >>confdefs.h
  
-      HAVE_FIND_TASK_BY_PID=''
+      HAVE_KZALLOC=''
    fi
  
  
@@ -86026,23 +91925,24 @@
 +$as_echo "$cr_result" >&6; }
  
  
+ # OK if missing
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid_ns" >&5
-+$as_echo_n "checking kernel for find_task_by_pid_ns... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kmem_cache_zalloc" >&5
++$as_echo_n "checking kernel for kmem_cache_zalloc... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_ns" >&5
--echo $ECHO_N "checking kernel for find_task_by_pid_ns... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for kmem_cache_zalloc" >&5
+-echo $ECHO_N "checking kernel for kmem_cache_zalloc... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -41814,11 +30635,7 @@
+@@ -46476,11 +35151,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -86055,7 +91955,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -41842,42 +30659,18 @@
+@@ -46504,42 +35175,18 @@
    return 0;
  }
  _ACEOF
@@ -86085,7 +91985,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS=yes
+ 	 cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -86094,30 +91994,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS=no
+ 	 cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -41885,22 +30678,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS
+@@ -46547,34 +35194,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FIND_TASK_BY_PID_NS 1
+-#define HAVE_KMEM_CACHE_ZALLOC 1
 -_ACEOF
-+    $as_echo "#define HAVE_FIND_TASK_BY_PID_NS 1" >>confdefs.h
++    $as_echo "#define HAVE_KMEM_CACHE_ZALLOC 1" >>confdefs.h
  
-      HAVE_FIND_TASK_BY_PID_NS=1
+      HAVE_KMEM_CACHE_ZALLOC=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FIND_TASK_BY_PID_NS 0
+-#define HAVE_KMEM_CACHE_ZALLOC 0
 -_ACEOF
-+    $as_echo "#define HAVE_FIND_TASK_BY_PID_NS 0" >>confdefs.h
++    $as_echo "#define HAVE_KMEM_CACHE_ZALLOC 0" >>confdefs.h
  
-      HAVE_FIND_TASK_BY_PID_NS=''
+      HAVE_KMEM_CACHE_ZALLOC=''
    fi
  
  
@@ -86127,113 +92027,24 @@
 +$as_echo "$cr_result" >&6; }
  
  
- if test -z "${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
-@@ -41923,39 +30712,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -41969,21 +30778,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" "$LINENO" 5
- 
- fi
- 
+ # OK if missing
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid_type" >&5
-+$as_echo_n "checking kernel for find_task_by_pid_type... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kmemdup" >&5
++$as_echo_n "checking kernel for kmemdup... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_type" >&5
--echo $ECHO_N "checking kernel for find_task_by_pid_type... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for kmemdup" >&5
+-echo $ECHO_N "checking kernel for kmemdup... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_KMEMDUP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_KMEMDUP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -41994,11 +30800,7 @@
+@@ -46585,11 +35227,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -86246,7 +92057,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -42022,42 +30824,18 @@
+@@ -46613,42 +35251,18 @@
    return 0;
  }
  _ACEOF
@@ -86276,7 +92087,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE=yes
+ 	 cr_cv_kconfig_HAVE_KMEMDUP=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -86285,56 +92096,58 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE=no
+ 	 cr_cv_kconfig_HAVE_KMEMDUP=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -42065,33 +30843,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE
+@@ -46656,22 +35270,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_KMEMDUP
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FIND_TASK_BY_PID_TYPE 1
+-#define HAVE_KMEMDUP 1
 -_ACEOF
-+    $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE 1" >>confdefs.h
++    $as_echo "#define HAVE_KMEMDUP 1" >>confdefs.h
  
-      HAVE_FIND_TASK_BY_PID_TYPE=1
+      HAVE_KMEMDUP=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FIND_TASK_BY_PID_TYPE 0
+-#define HAVE_KMEMDUP 0
 -_ACEOF
-+    $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE 0" >>confdefs.h
++    $as_echo "#define HAVE_KMEMDUP 0" >>confdefs.h
  
-      HAVE_FIND_TASK_BY_PID_TYPE=''
+      HAVE_KMEMDUP=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ # OK if missing
+@@ -46679,12 +35289,11 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel for find_task_by_pid_type_ns" >&5
--echo $ECHO_N "checking kernel for find_task_by_pid_type_ns... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid_type_ns" >&5
-+$as_echo_n "checking kernel for find_task_by_pid_type_ns... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pipe_inode_info.base" >&5
++$as_echo_n "checking kernel for pipe_inode_info.base... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for pipe_inode_info.base" >&5
+-echo $ECHO_N "checking kernel for pipe_inode_info.base... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -42102,11 +30875,7 @@
+@@ -46695,11 +35304,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -86347,7 +92160,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -42130,42 +30899,18 @@
+@@ -46720,42 +35325,18 @@
    return 0;
  }
  _ACEOF
@@ -86377,7 +92190,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS=yes
+ 	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -86386,30 +92199,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS=no
+ 	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -42173,22 +30918,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS
+@@ -46763,34 +35344,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FIND_TASK_BY_PID_TYPE_NS 1
+-#define HAVE_PIPE_INODE_INFO_BASE 1
 -_ACEOF
-+    $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE_NS 1" >>confdefs.h
++    $as_echo "#define HAVE_PIPE_INODE_INFO_BASE 1" >>confdefs.h
  
-      HAVE_FIND_TASK_BY_PID_TYPE_NS=1
+      HAVE_PIPE_INODE_INFO_BASE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FIND_TASK_BY_PID_TYPE_NS 0
+-#define HAVE_PIPE_INODE_INFO_BASE 0
 -_ACEOF
-+    $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE_NS 0" >>confdefs.h
++    $as_echo "#define HAVE_PIPE_INODE_INFO_BASE 0" >>confdefs.h
  
-      HAVE_FIND_TASK_BY_PID_TYPE_NS=''
+      HAVE_PIPE_INODE_INFO_BASE=''
    fi
  
  
@@ -86419,196 +92232,126 @@
 +$as_echo "$cr_result" >&6; }
  
  
- if test -z "${HAVE_2_ARG_FIND_PID}${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then
-@@ -42211,39 +30952,59 @@
+ # OK if missing.
  
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -42257,21 +31018,102 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" "$LINENO" 5
-+
-+fi
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for find_task_by_pid_ns" >&5
-+$as_echo_n "checking kernel symbol table for find_task_by_pid_ns... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_find_task_by_pid_ns+set}" = set; then :
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pipe_inode_info.buffers" >&5
++$as_echo_n "checking kernel for pipe_inode_info.buffers... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for pipe_inode_info.buffers" >&5
+-echo $ECHO_N "checking kernel for pipe_inode_info.buffers... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BUFFERS+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BUFFERS+:} false; then :
 +  $as_echo_n "(cached) " >&6
-+else
-+
-+    cr_cv_ksymtab_find_task_by_pid_ns=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}find_task_by_pid_ns$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_find_task_by_pid_ns"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_find_task_by_pid_ns\$" >/dev/null ; then
-+        cr_cv_ksymtab_find_task_by_pid_ns=0
-+      fi
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
+ else
+ 
+ 
+@@ -46801,11 +35377,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
-+int
-+main ()
-+{
-+int x = sizeof(&find_task_by_pid_ns);
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -46826,42 +35398,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
 +if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BUFFERS=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
 +  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_find_task_by_pid_ns="Y$cr_cv_ksymtab_find_task_by_pid_ns"
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_find_task_by_pid_ns="N$cr_cv_ksymtab_find_task_by_pid_ns"
-+fi
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BUFFERS=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+    fi
+ 
  
  fi
+@@ -46869,34 +35417,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BUFFERS
  
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_find_task_by_pid_ns"; then
-+    cr_result='not found'
-+  else
-+    if expr "$cr_cv_ksymtab_find_task_by_pid_ns" : N >/dev/null; then
-+      as_fn_error $? "Found symbol find_task_by_pid_ns but no declaration -- please file a bug report." "$LINENO" 5
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_find_task_by_pid_ns | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KCODE(find_task_by_pid_ns, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KCODE_find_task_by_pid_ns $cr_addr
-+_ACEOF
-+
-+  fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PIPE_INODE_INFO_BUFFERS 1
+-_ACEOF
++    $as_echo "#define HAVE_PIPE_INODE_INFO_BUFFERS 1" >>confdefs.h
+ 
+      HAVE_PIPE_INODE_INFO_BUFFERS=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PIPE_INODE_INFO_BUFFERS 0
+-_ACEOF
++    $as_echo "#define HAVE_PIPE_INODE_INFO_BUFFERS 0" >>confdefs.h
+ 
+      HAVE_PIPE_INODE_INFO_BUFFERS=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-+
  
  
+ # OK if missing.
+ 
  
  
--  echo "$as_me:$LINENO: checking kernel for alloc_pid" >&5
--echo $ECHO_N "checking kernel for alloc_pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for alloc_pid" >&5
-+$as_echo_n "checking kernel for alloc_pid... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pipe_buf_operations.pin" >&5
++$as_echo_n "checking kernel for pipe_buf_operations.pin... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_ALLOC_PID+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for pipe_buf_operations.pin" >&5
+-echo $ECHO_N "checking kernel for pipe_buf_operations.pin... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_ALLOC_PID+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -42282,11 +31124,7 @@
+@@ -46907,11 +35450,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -86621,7 +92364,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -42310,42 +31148,18 @@
+@@ -46932,42 +35471,18 @@
    return 0;
  }
  _ACEOF
@@ -86651,7 +92394,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_ALLOC_PID=yes
+ 	 cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -86660,30 +92403,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_ALLOC_PID=no
+ 	 cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -42353,22 +31167,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_ALLOC_PID
+@@ -46975,33 +35490,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_ALLOC_PID 1
+-#define HAVE_PIPE_BUF_OPERATIONS_PIN 1
 -_ACEOF
-+    $as_echo "#define HAVE_ALLOC_PID 1" >>confdefs.h
++    $as_echo "#define HAVE_PIPE_BUF_OPERATIONS_PIN 1" >>confdefs.h
  
-      HAVE_ALLOC_PID=1
+      HAVE_PIPE_BUF_OPERATIONS_PIN=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_ALLOC_PID 0
+-#define HAVE_PIPE_BUF_OPERATIONS_PIN 0
 -_ACEOF
-+    $as_echo "#define HAVE_ALLOC_PID 0" >>confdefs.h
++    $as_echo "#define HAVE_PIPE_BUF_OPERATIONS_PIN 0" >>confdefs.h
  
-      HAVE_ALLOC_PID=''
+      HAVE_PIPE_BUF_OPERATIONS_PIN=''
    fi
  
  
@@ -86693,25 +92436,23 @@
 +$as_echo "$cr_result" >&6; }
  
  
- if test -n "${HAVE_ALLOC_PID}"; then
-@@ -42378,12 +31188,11 @@
- 
+ if test -z "${HAVE_PIPE_BUF_OPERATIONS_PIN}"; then
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 0-arg alloc_pid" >&5
-+$as_echo_n "checking kernel for 0-arg alloc_pid... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg pipe_ops.unmap" >&5
++$as_echo_n "checking kernel for 2-arg pipe_ops.unmap... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 0-arg alloc_pid" >&5
--echo $ECHO_N "checking kernel for 0-arg alloc_pid... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for 2-arg pipe_ops.unmap" >&5
+-echo $ECHO_N "checking kernel for 2-arg pipe_ops.unmap... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -42394,11 +31203,7 @@
+@@ -47012,11 +35522,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -86724,7 +92465,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -42419,42 +31224,18 @@
+@@ -47039,42 +35545,18 @@
    return 0;
  }
  _ACEOF
@@ -86754,7 +92495,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID=yes
+ 	 cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -86763,30 +92504,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID=no
+ 	 cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -42462,23 +31243,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID
+@@ -47082,31 +35564,26 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_0_ARG_ALLOC_PID 1
+-#define HAVE_2_ARG_PIPE_OPS_UNMAP 1
 -_ACEOF
-+    $as_echo "#define HAVE_0_ARG_ALLOC_PID 1" >>confdefs.h
++    $as_echo "#define HAVE_2_ARG_PIPE_OPS_UNMAP 1" >>confdefs.h
  
-      HAVE_0_ARG_ALLOC_PID=1
+      HAVE_2_ARG_PIPE_OPS_UNMAP=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_0_ARG_ALLOC_PID 0
+-#define HAVE_2_ARG_PIPE_OPS_UNMAP 0
 -_ACEOF
-+    $as_echo "#define HAVE_0_ARG_ALLOC_PID 0" >>confdefs.h
++    $as_echo "#define HAVE_2_ARG_PIPE_OPS_UNMAP 0" >>confdefs.h
  
-      HAVE_0_ARG_ALLOC_PID=''
+      HAVE_2_ARG_PIPE_OPS_UNMAP=''
    fi
  
  
@@ -86798,23 +92539,19 @@
  
  
  
-@@ -42488,11 +31264,11 @@
- 
- 
- 
--  echo "$as_me:$LINENO: checking kernel for 1-arg alloc_pid" >&5
--echo $ECHO_N "checking kernel for 1-arg alloc_pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 1-arg alloc_pid" >&5
-+$as_echo_n "checking kernel for 1-arg alloc_pid... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for 3-arg pipe_ops.unmap" >&5
+-echo $ECHO_N "checking kernel for 3-arg pipe_ops.unmap... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg pipe_ops.unmap" >&5
++$as_echo_n "checking kernel for 3-arg pipe_ops.unmap... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -42503,11 +31279,7 @@
+@@ -47117,11 +35594,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -86827,7 +92564,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -42528,42 +31300,18 @@
+@@ -47144,42 +35617,18 @@
    return 0;
  }
  _ACEOF
@@ -86857,7 +92594,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID=yes
+ 	 cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -86866,30 +92603,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID=no
+ 	 cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -42571,22 +31319,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID
+@@ -47187,22 +35636,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_1_ARG_ALLOC_PID 1
+-#define HAVE_3_ARG_PIPE_OPS_UNMAP 1
 -_ACEOF
-+    $as_echo "#define HAVE_1_ARG_ALLOC_PID 1" >>confdefs.h
++    $as_echo "#define HAVE_3_ARG_PIPE_OPS_UNMAP 1" >>confdefs.h
  
-      HAVE_1_ARG_ALLOC_PID=1
+      HAVE_3_ARG_PIPE_OPS_UNMAP=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_1_ARG_ALLOC_PID 0
+-#define HAVE_3_ARG_PIPE_OPS_UNMAP 0
 -_ACEOF
-+    $as_echo "#define HAVE_1_ARG_ALLOC_PID 0" >>confdefs.h
++    $as_echo "#define HAVE_3_ARG_PIPE_OPS_UNMAP 0" >>confdefs.h
  
-      HAVE_1_ARG_ALLOC_PID=''
+      HAVE_3_ARG_PIPE_OPS_UNMAP=''
    fi
  
  
@@ -86898,9 +92635,9 @@
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- 
- 
-@@ -42611,39 +31355,59 @@
+ fi
+ # Require exactly one match
+@@ -47226,39 +35671,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -86963,14 +92700,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -86978,32 +92727,32 @@
    fi
  fi
  rm -f confcache
-@@ -42657,19 +31421,17 @@
+@@ -47272,19 +35748,17 @@
    echo "  Kernel running currently = `uname -r`"
    echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" >&2;}
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" "$LINENO" 5
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" "$LINENO" 5
  
-   fi
+ fi
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for free_pid" >&5
--echo $ECHO_N "checking kernel symbol table for free_pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for free_pid" >&5
-+$as_echo_n "checking kernel symbol table for free_pid... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for anon_pipe_buf_ops" >&5
+-echo $ECHO_N "checking kernel symbol table for anon_pipe_buf_ops... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for anon_pipe_buf_ops" >&5
++$as_echo_n "checking kernel symbol table for anon_pipe_buf_ops... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_free_pid+set}" = set; then
+-    if test "${cr_cv_ksymtab_anon_pipe_buf_ops+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_free_pid+set}" = set; then :
++    if ${cr_cv_ksymtab_anon_pipe_buf_ops+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_free_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_pid$/ {s/ .*//p;q;}"`
-@@ -42685,11 +31447,7 @@
+     cr_cv_ksymtab_anon_pipe_buf_ops=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}anon_pipe_buf_ops$/ {s/ .*//p;q;}"`
+@@ -47300,11 +35774,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -87016,7 +92765,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -42709,42 +31467,18 @@
+@@ -47324,42 +35794,18 @@
    return 0;
  }
  _ACEOF
@@ -87046,7 +92795,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_free_pid="Y$cr_cv_ksymtab_free_pid"
+ 	 cr_cv_ksymtab_anon_pipe_buf_ops="Y$cr_cv_ksymtab_anon_pipe_buf_ops"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -87055,25 +92804,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_free_pid="N$cr_cv_ksymtab_free_pid"
+ 	 cr_cv_ksymtab_anon_pipe_buf_ops="N$cr_cv_ksymtab_anon_pipe_buf_ops"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -42755,9 +31489,7 @@
-     cr_result='not found'
-   else
-     if expr "$cr_cv_ksymtab_free_pid" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol free_pid but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol free_pid but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol free_pid but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_free_pid | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -42773,17 +31505,17 @@
+@@ -47389,18 +35835,17 @@
  _ACEOF
  
    fi
@@ -87084,20 +92822,21 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for pid_hash" >&5
--echo $ECHO_N "checking kernel symbol table for pid_hash... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pid_hash" >&5
-+$as_echo_n "checking kernel symbol table for pid_hash... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_pid_hash+set}" = set; then
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pipe_fcntl" >&5
++$as_echo_n "checking kernel for pipe_fcntl... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for pipe_fcntl" >&5
+-echo $ECHO_N "checking kernel for pipe_fcntl... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_PIPE_FCNTL+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_pid_hash+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PIPE_FCNTL+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_pid_hash=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pid_hash$/ {s/ .*//p;q;}"`
-@@ -42799,11 +31531,7 @@
+ 
+@@ -47411,11 +35856,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -87110,7 +92849,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -42823,42 +31551,18 @@
+@@ -47442,42 +35883,18 @@
    return 0;
  }
  _ACEOF
@@ -87140,7 +92879,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pid_hash="Y$cr_cv_ksymtab_pid_hash"
+ 	 cr_cv_kconfig_HAVE_PIPE_FCNTL=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -87149,38 +92888,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pid_hash="N$cr_cv_ksymtab_pid_hash"
+ 	 cr_cv_kconfig_HAVE_PIPE_FCNTL=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -42888,17 +31592,17 @@
- _ACEOF
+ fi
+@@ -47485,33 +35902,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_PIPE_FCNTL
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PIPE_FCNTL 1
+-_ACEOF
++    $as_echo "#define HAVE_PIPE_FCNTL 1" >>confdefs.h
+ 
+      HAVE_PIPE_FCNTL=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PIPE_FCNTL 0
+-_ACEOF
++    $as_echo "#define HAVE_PIPE_FCNTL 0" >>confdefs.h
  
+      HAVE_PIPE_FCNTL=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ if test "${HAVE_PIPE_FCNTL}" = "1"; then
  
--  echo "$as_me:$LINENO: checking kernel symbol table for pidhash_shift" >&5
--echo $ECHO_N "checking kernel symbol table for pidhash_shift... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pidhash_shift" >&5
-+$as_echo_n "checking kernel symbol table for pidhash_shift... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for pipe_fcntl" >&5
+-echo $ECHO_N "checking kernel symbol table for pipe_fcntl... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pipe_fcntl" >&5
++$as_echo_n "checking kernel symbol table for pipe_fcntl... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_pidhash_shift+set}" = set; then
+-    if test "${cr_cv_ksymtab_pipe_fcntl+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_pidhash_shift+set}" = set; then :
++    if ${cr_cv_ksymtab_pipe_fcntl+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_pidhash_shift=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidhash_shift$/ {s/ .*//p;q;}"`
-@@ -42914,11 +31618,7 @@
+     cr_cv_ksymtab_pipe_fcntl=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}pipe_fcntl$/ {s/ .*//p;q;}"`
+@@ -47527,11 +35940,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -87193,7 +92950,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -42938,42 +31638,18 @@
+@@ -47551,42 +35960,18 @@
    return 0;
  }
  _ACEOF
@@ -87223,7 +92980,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pidhash_shift="Y$cr_cv_ksymtab_pidhash_shift"
+ 	 cr_cv_ksymtab_pipe_fcntl="Y$cr_cv_ksymtab_pipe_fcntl"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -87232,14 +92989,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pidhash_shift="N$cr_cv_ksymtab_pidhash_shift"
+ 	 cr_cv_ksymtab_pipe_fcntl="N$cr_cv_ksymtab_pipe_fcntl"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -43003,19 +31679,18 @@
+@@ -47616,8 +36001,8 @@
  _ACEOF
  
    fi
@@ -87248,24 +93005,131 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
-   # Can't use true type because 'struct kmem_cache' is opaque by design
+ fi
+ # Now try to define CR_F_SETPIPE_SZ and CR_F_GETPIPE_SZ, for the pipe test.
+@@ -47631,117 +36016,11 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pid_namespace.pid_cachep" >&5
-+$as_echo_n "checking kernel for pid_namespace.pid_cachep... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for F_SETPIPE_SZ" >&5
++$as_echo_n "checking kernel for F_SETPIPE_SZ... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for pid_namespace.pid_cachep" >&5
--echo $ECHO_N "checking kernel for pid_namespace.pid_cachep... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for F_SETPIPE_SZ" >&5
+-echo $ECHO_N "checking kernel for F_SETPIPE_SZ... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_F_SETPIPE_SZ+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-
+-
+-  SAVE_CC=$CC
+-  SAVE_CFLAGS=$CFLAGS
+-  SAVE_CPPFLAGS=$CPPFLAGS
+-  CC=$KCC
+-  CFLAGS=""
+-  CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-		 #include <linux/kernel.h>
+-		 #ifndef FASTCALL
+-		   #define FASTCALL(_decl) _decl
+-		 #endif
+-		 #include <linux/types.h>
+-		 #include <linux/fcntl.h>
+-int
+-main ()
+-{
+-
+-   #ifndef F_SETPIPE_SZ
+-     choke me
+-   #endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  CC=$SAVE_CC
+-	 CFLAGS=$SAVE_CFLAGS
+-	 CPPFLAGS=$SAVE_CPPFLAGS
+-	 cr_cv_kconfig_HAVE_F_SETPIPE_SZ=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
+-	 CFLAGS=$SAVE_CFLAGS
+-	 CPPFLAGS=$SAVE_CPPFLAGS
+-	 cr_cv_kconfig_HAVE_F_SETPIPE_SZ=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-
+-fi
+-
+-  cr_result=$cr_cv_kconfig_HAVE_F_SETPIPE_SZ
+-
+-  if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_F_SETPIPE_SZ 1
+-_ACEOF
+-
+-     HAVE_F_SETPIPE_SZ=1
+-  else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_F_SETPIPE_SZ 0
+-_ACEOF
+-
+-     HAVE_F_SETPIPE_SZ=''
+-  fi
+-
+-
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
+-
+-
+-
+-
+-
+-  echo "$as_me:$LINENO: checking kernel for F_GETPIPE_SZ" >&5
+-echo $ECHO_N "checking kernel for F_GETPIPE_SZ... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_F_GETPIPE_SZ+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_F_SETPIPE_SZ+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -43026,11 +31701,7 @@
+@@ -47752,1167 +36031,166 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -87278,10 +93142,318 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -43051,42 +31722,18 @@
-   return 0;
- }
- _ACEOF
+ 		 #ifndef FASTCALL
+ 		   #define FASTCALL(_decl) _decl
+ 		 #endif
+-		 #include <linux/types.h>
+-		 #include <linux/fcntl.h>
+-int
+-main ()
+-{
+-
+-   #ifndef F_GETPIPE_SZ
+-     choke me
+-   #endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  CC=$SAVE_CC
+-	 CFLAGS=$SAVE_CFLAGS
+-	 CPPFLAGS=$SAVE_CPPFLAGS
+-	 cr_cv_kconfig_HAVE_F_GETPIPE_SZ=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
+-	 CFLAGS=$SAVE_CFLAGS
+-	 CPPFLAGS=$SAVE_CPPFLAGS
+-	 cr_cv_kconfig_HAVE_F_GETPIPE_SZ=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-
+-fi
+-
+-  cr_result=$cr_cv_kconfig_HAVE_F_GETPIPE_SZ
+-
+-  if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_F_GETPIPE_SZ 1
+-_ACEOF
+-
+-     HAVE_F_GETPIPE_SZ=1
+-  else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_F_GETPIPE_SZ 0
+-_ACEOF
+-
+-     HAVE_F_GETPIPE_SZ=''
+-  fi
+-
+-
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
+-
+-if test "${HAVE_F_SETPIPE_SZ}${HAVE_F_GETPIPE_SZ}" = "11"; then
+-
+-    CR_F_SETPIPE_SZ=""
+-
+-    echo "$as_me:$LINENO: checking for value for CR_F_SETPIPE_SZ" >&5
+-echo $ECHO_N "checking for value for CR_F_SETPIPE_SZ... $ECHO_C" >&6
+-if test "${cr_cv_compute_int_CR_F_SETPIPE_SZ+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-    cr_cv_compute_int_CR_F_SETPIPE_SZ="not found"
+-    if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_SETPIPE_SZ) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_SETPIPE_SZ) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_SETPIPE_SZ) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_SETPIPE_SZ) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_lo=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_SETPIPE_SZ) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -87297,91 +93469,148 @@
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
+-  (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
+-  ac_hi=$ac_mid
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) cr_cv_compute_int_CR_F_SETPIPE_SZ=$ac_lo;;
+-'')  ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-long longval () { return F_SETPIPE_SZ; }
+-unsigned long ulongval () { return F_SETPIPE_SZ; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if ((F_SETPIPE_SZ) < 0)
+-    {
+-      long i = longval ();
+-      if (i != (F_SETPIPE_SZ))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != (F_SETPIPE_SZ))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP=yes
- else
--  echo "$as_me: failed program was:" >&5
+-  cr_cv_compute_int_CR_F_SETPIPE_SZ=`cat conftest.val`
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
- fi
-@@ -43094,32 +31741,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PID_NAMESPACE_PID_CACHEP 1
--_ACEOF
-+    $as_echo "#define HAVE_PID_NAMESPACE_PID_CACHEP 1" >>confdefs.h
- 
-      HAVE_PID_NAMESPACE_PID_CACHEP=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PID_NAMESPACE_PID_CACHEP 0
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.val
+-
+-fi
+-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_F_SETPIPE_SZ" >&5
+-echo "${ECHO_T}$cr_cv_compute_int_CR_F_SETPIPE_SZ" >&6
+-  if test "$cr_cv_compute_int_CR_F_SETPIPE_SZ" != "not found"; then
+-    CR_F_SETPIPE_SZ="$cr_cv_compute_int_CR_F_SETPIPE_SZ"
+-  fi
+-
+-  if test -n "$CR_F_SETPIPE_SZ"; then
+-    cat >>confdefs.h <<_ACEOF
+-#define CR_F_SETPIPE_SZ $CR_F_SETPIPE_SZ
 -_ACEOF
-+    $as_echo "#define HAVE_PID_NAMESPACE_PID_CACHEP 0" >>confdefs.h
- 
-      HAVE_PID_NAMESPACE_PID_CACHEP=''
-   fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
- 
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for pid_cachep" >&5
--echo $ECHO_N "checking kernel symbol table for pid_cachep... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pid_cachep" >&5
-+$as_echo_n "checking kernel symbol table for pid_cachep... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_pid_cachep+set}" = set; then
+-
+-
+-
+-  fi
+-
+-    if test -z "${CR_F_SETPIPE_SZ}"; then
+-
+-    CR_F_SETPIPE_SZ=""
+-
+-
+-    SAVE_CPP=$CPP
+-  SAVE_CPPFLAGS=$CPPFLAGS
+-  SAVE_cross_compiling="$cross_compiling"
+-  CPP="$KCC -E"
+-  CPPFLAGS="$KCFLAGS"
+-  cross_compiling="yes"
+-  echo "$as_me:$LINENO: checking kernel for value for CR_F_SETPIPE_SZ" >&5
+-echo $ECHO_N "checking kernel for value for CR_F_SETPIPE_SZ... $ECHO_C" >&6
+-if test "${cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_pid_cachep+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
-     cr_cv_ksymtab_pid_cachep=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pid_cachep$/ {s/ .*//p;q;}"`
-@@ -43135,11 +31778,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-else
+-
+-    cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ="not found"
+-    if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 		 #include <linux/kernel.h>
-@@ -43159,42 +31798,18 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_SETPIPE_SZ) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -87404,158 +93633,25 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pid_cachep="Y$cr_cv_ksymtab_pid_cachep"
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pid_cachep="N$cr_cv_ksymtab_pid_cachep"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
-     fi
- 
-@@ -43230,8 +31845,8 @@
- _ACEOF
- 
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
-   if test -z "${cr_addr}${HAVE_PID_NAMESPACE_PID_CACHEP}"; then
- 
-@@ -43253,39 +31868,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -43299,20 +31934,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" "$LINENO" 5
- 
-   fi
-   if test -n "${HAVE_LINUX_PSPACE_H}"; then
- 
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for init_pspace" >&5
--echo $ECHO_N "checking kernel symbol table for init_pspace... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for init_pspace" >&5
-+$as_echo_n "checking kernel symbol table for init_pspace... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_init_pspace+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_init_pspace+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
-     cr_cv_ksymtab_init_pspace=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}init_pspace$/ {s/ .*//p;q;}"`
-@@ -43328,11 +31961,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 		 #include <linux/kernel.h>
-@@ -43352,42 +31981,18 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_SETPIPE_SZ) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -87578,79 +93674,41 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_init_pspace="Y$cr_cv_ksymtab_init_pspace"
- else
+-  ac_hi=$ac_mid; break
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_init_pspace="N$cr_cv_ksymtab_init_pspace"
- fi
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
-     fi
- 
-@@ -43398,9 +32003,7 @@
-     cr_result='not found'
-   else
-     if expr "$cr_cv_ksymtab_init_pspace" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol init_pspace but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol init_pspace but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol init_pspace but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_init_pspace | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -43416,18 +32019,18 @@
- _ACEOF
- 
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
-   elif test -n "${HAVE_LINUX_PID_NAMESPACE_H}"; then
- 
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for init_pid_ns" >&5
--echo $ECHO_N "checking kernel symbol table for init_pid_ns... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for init_pid_ns" >&5
-+$as_echo_n "checking kernel symbol table for init_pid_ns... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_init_pid_ns+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_init_pid_ns+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
-     cr_cv_ksymtab_init_pid_ns=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}init_pid_ns$/ {s/ .*//p;q;}"`
-@@ -43443,11 +32046,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 		 #include <linux/kernel.h>
-@@ -43467,42 +32066,18 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_SETPIPE_SZ) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -87673,82 +93731,25 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_init_pid_ns="Y$cr_cv_ksymtab_init_pid_ns"
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_init_pid_ns="N$cr_cv_ksymtab_init_pid_ns"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
-     fi
- 
-@@ -43513,9 +32088,7 @@
-     cr_result='not found'
-   else
-     if expr "$cr_cv_ksymtab_init_pid_ns" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol init_pid_ns but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol init_pid_ns but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error $? "Found symbol init_pid_ns but no declaration -- please file a bug report." "$LINENO" 5
-     fi
-     cr_result=`echo $cr_cv_ksymtab_init_pid_ns | tr -d 'YN'`
-     if test $cr_result = 0; then
-@@ -43531,8 +32104,8 @@
- _ACEOF
- 
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
-   fi
- fi
-@@ -43540,12 +32113,11 @@
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.0 attach_pid" >&5
-+$as_echo_n "checking kernel for 2.6.0 attach_pid... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for 2.6.0 attach_pid" >&5
--echo $ECHO_N "checking kernel for 2.6.0 attach_pid... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
- 
-@@ -43556,11 +32128,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 		 #include <linux/kernel.h>
-@@ -43579,42 +32147,18 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_SETPIPE_SZ) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -87771,85 +93772,49 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID=yes
- else
+-  ac_lo=$ac_mid; break
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID=no
- fi
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
- fi
-@@ -43622,33 +32166,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_0_ATTACH_PID 1
--_ACEOF
-+    $as_echo "#define HAVE_2_6_0_ATTACH_PID 1" >>confdefs.h
- 
-      HAVE_2_6_0_ATTACH_PID=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_0_ATTACH_PID 0
--_ACEOF
-+    $as_echo "#define HAVE_2_6_0_ATTACH_PID 0" >>confdefs.h
- 
-      HAVE_2_6_0_ATTACH_PID=''
-   fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.22 attach_pid" >&5
-+$as_echo_n "checking kernel for 2.6.22 attach_pid... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for 2.6.22 attach_pid" >&5
--echo $ECHO_N "checking kernel for 2.6.22 attach_pid... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
- 
-@@ -43659,11 +32198,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 		 #include <linux/kernel.h>
-@@ -43682,42 +32217,18 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_SETPIPE_SZ) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -87872,85 +93837,166 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
+-  ac_hi=$ac_mid
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ=$ac_lo;;
+-'')  ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-long longval () { return F_SETPIPE_SZ; }
+-unsigned long ulongval () { return F_SETPIPE_SZ; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if ((F_SETPIPE_SZ) < 0)
+-    {
+-      long i = longval ();
+-      if (i != (F_SETPIPE_SZ))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != (F_SETPIPE_SZ))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
++		 #include <linux/types.h>
++		 #include <linux/fcntl.h>
++int
++main ()
++{
++
++   #ifndef F_SETPIPE_SZ
++     choke me
++   #endif
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ=`cat conftest.val`
 +if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID=yes
++  CC=$SAVE_CC
++	 CFLAGS=$SAVE_CFLAGS
++	 CPPFLAGS=$SAVE_CPPFLAGS
++	 cr_cv_kconfig_HAVE_F_SETPIPE_SZ=yes
  else
--  echo "$as_me: failed program was:" >&5
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--CC=$SAVE_CC
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
 +  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID=no
++	 CFLAGS=$SAVE_CFLAGS
++	 CPPFLAGS=$SAVE_CPPFLAGS
++	 cr_cv_kconfig_HAVE_F_SETPIPE_SZ=no
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.val
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
++
  
  fi
-@@ -43725,33 +32236,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID
+-echo "$as_me:$LINENO: result: $cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ" >&5
+-echo "${ECHO_T}$cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ" >&6
+-  CPP=$SAVE_CPP
+-  CPPFLAGS=$SAVE_CPPFLAGS
+-  cross_compiling="$SAVE_cross_compiling"
+-  if test "$cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ" != "not found"; then
+-    CR_F_SETPIPE_SZ="$cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ"
+-  fi
  
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_22_ATTACH_PID 1
+-  if test -n "$CR_F_SETPIPE_SZ"; then
+-    cat >>confdefs.h <<_ACEOF
+-#define CR_F_SETPIPE_SZ $CR_F_SETPIPE_SZ
 -_ACEOF
-+    $as_echo "#define HAVE_2_6_22_ATTACH_PID 1" >>confdefs.h
++  cr_result=$cr_cv_kconfig_HAVE_F_SETPIPE_SZ
  
-      HAVE_2_6_22_ATTACH_PID=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_22_ATTACH_PID 0
--_ACEOF
-+    $as_echo "#define HAVE_2_6_22_ATTACH_PID 0" >>confdefs.h
++  if test $cr_result = yes; then
++    $as_echo "#define HAVE_F_SETPIPE_SZ 1" >>confdefs.h
  
-      HAVE_2_6_22_ATTACH_PID=''
++     HAVE_F_SETPIPE_SZ=1
++  else
++    $as_echo "#define HAVE_F_SETPIPE_SZ 0" >>confdefs.h
+ 
++     HAVE_F_SETPIPE_SZ=''
    fi
  
+-    fi
  
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
--
+-    CR_F_GETPIPE_SZ=""
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- 
- 
- 
- 
--  echo "$as_me:$LINENO: checking kernel for 2.6.26 attach_pid" >&5
--echo $ECHO_N "checking kernel for 2.6.26 attach_pid... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.26 attach_pid" >&5
-+$as_echo_n "checking kernel for 2.6.26 attach_pid... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID+set}" = set; then
+-    echo "$as_me:$LINENO: checking for value for CR_F_GETPIPE_SZ" >&5
+-echo $ECHO_N "checking for value for CR_F_GETPIPE_SZ... $ECHO_C" >&6
+-if test "${cr_cv_compute_int_CR_F_GETPIPE_SZ+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
+-else
  
-@@ -43762,11 +32268,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-    cr_cv_compute_int_CR_F_GETPIPE_SZ="not found"
+-    if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_GETPIPE_SZ) >= 0)];
+-test_array [0] = 0
  
- 		 #include <linux/kernel.h>
-@@ -43785,42 +32287,18 @@
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -87973,175 +94019,25 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID=yes
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
- fi
-@@ -43828,22 +32306,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_26_ATTACH_PID 1
--_ACEOF
-+    $as_echo "#define HAVE_2_6_26_ATTACH_PID 1" >>confdefs.h
- 
-      HAVE_2_6_26_ATTACH_PID=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_6_26_ATTACH_PID 0
--_ACEOF
-+    $as_echo "#define HAVE_2_6_26_ATTACH_PID 0" >>confdefs.h
- 
-      HAVE_2_6_26_ATTACH_PID=''
-   fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
- 
-@@ -43868,39 +32342,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -43914,21 +32408,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" "$LINENO" 5
- 
- fi
- 
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for change_pid" >&5
-+$as_echo_n "checking kernel for change_pid... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for change_pid" >&5
--echo $ECHO_N "checking kernel for change_pid... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_CHANGE_PID+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_CHANGE_PID+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
- 
-@@ -43939,11 +32430,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_GETPIPE_SZ) <= $ac_mid)];
+-test_array [0] = 0
  
- 		 #include <linux/kernel.h>
-@@ -43969,42 +32456,18 @@
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -88164,87 +94060,46 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_CHANGE_PID=yes
- else
+-  ac_hi=$ac_mid; break
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_CHANGE_PID=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
- fi
-@@ -44012,22 +32475,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_CHANGE_PID
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_CHANGE_PID 1
--_ACEOF
-+    $as_echo "#define HAVE_CHANGE_PID 1" >>confdefs.h
- 
-      HAVE_CHANGE_PID=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_CHANGE_PID 0
--_ACEOF
-+    $as_echo "#define HAVE_CHANGE_PID 0" >>confdefs.h
- 
-      HAVE_CHANGE_PID=''
-   fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
- # OK if missing
-@@ -44035,12 +32494,11 @@
- 
  
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct pidmap" >&5
-+$as_echo_n "checking kernel for struct pidmap... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for struct pidmap" >&5
--echo $ECHO_N "checking kernel for struct pidmap... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_STRUCT_PIDMAP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_STRUCT_PIDMAP+set}" = set; then :
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for F_GETPIPE_SZ" >&5
++$as_echo_n "checking kernel for F_GETPIPE_SZ... " >&6; }
++
++    if ${cr_cv_kconfig_HAVE_F_GETPIPE_SZ+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
- 
-@@ -44051,11 +32509,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_GETPIPE_SZ) < 0)];
+-test_array [0] = 0
  
- 		 #include <linux/kernel.h>
-@@ -44082,42 +32536,18 @@
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -88267,81 +94122,41 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_STRUCT_PIDMAP=yes
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_STRUCT_PIDMAP=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
- fi
-@@ -44125,32 +32555,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_STRUCT_PIDMAP
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_PIDMAP 1
--_ACEOF
-+    $as_echo "#define HAVE_STRUCT_PIDMAP 1" >>confdefs.h
- 
-      HAVE_STRUCT_PIDMAP=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_PIDMAP 0
--_ACEOF
-+    $as_echo "#define HAVE_STRUCT_PIDMAP 0" >>confdefs.h
- 
-      HAVE_STRUCT_PIDMAP=''
-   fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
- 
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for pidmap_array" >&5
--echo $ECHO_N "checking kernel symbol table for pidmap_array... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pidmap_array" >&5
-+$as_echo_n "checking kernel symbol table for pidmap_array... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_pidmap_array+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_pidmap_array+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
-     cr_cv_ksymtab_pidmap_array=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidmap_array$/ {s/ .*//p;q;}"`
-@@ -44166,11 +32592,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
++
++  SAVE_CC=$CC
++  SAVE_CFLAGS=$CFLAGS
++  SAVE_CPPFLAGS=$CPPFLAGS
++  CC=$KCC
++  CFLAGS=""
++  CPPFLAGS="$KCFLAGS"
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
+-#include <fcntl.h>
++
++		 #include <linux/kernel.h>
++		 #ifndef FASTCALL
++		   #define FASTCALL(_decl) _decl
++		 #endif
++		 #include <linux/types.h>
++		 #include <linux/fcntl.h>
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !((F_GETPIPE_SZ) >= $ac_mid)];
+-test_array [0] = 0
++
++   #ifndef F_GETPIPE_SZ
++     choke me
++   #endif
  
- 		 #include <linux/kernel.h>
-@@ -44190,42 +32612,18 @@
+   ;
    return 0;
  }
  _ACEOF
@@ -88367,68 +94182,60 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
+-  ac_lo=$ac_mid; break
 +if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pidmap_array="Y$cr_cv_ksymtab_pidmap_array"
++  CC=$SAVE_CC
++	 CFLAGS=$SAVE_CFLAGS
++	 CPPFLAGS=$SAVE_CPPFLAGS
++	 cr_cv_kconfig_HAVE_F_GETPIPE_SZ=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--CC=$SAVE_CC
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
 +  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pidmap_array="N$cr_cv_ksymtab_pidmap_array"
++	 CFLAGS=$SAVE_CFLAGS
++	 CPPFLAGS=$SAVE_CPPFLAGS
++	 cr_cv_kconfig_HAVE_F_GETPIPE_SZ=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
  
-     fi
- 
-@@ -44263,18 +32661,18 @@
- _ACEOF
- 
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- if test x"$cr_kernel_smp" = xyes; then
- 
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for pidmap_lock" >&5
--echo $ECHO_N "checking kernel symbol table for pidmap_lock... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pidmap_lock" >&5
-+$as_echo_n "checking kernel symbol table for pidmap_lock... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_pidmap_lock+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_pidmap_lock+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
-     cr_cv_ksymtab_pidmap_lock=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidmap_lock$/ {s/ .*//p;q;}"`
-@@ -44290,11 +32688,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_GETPIPE_SZ) <= $ac_mid)];
+-test_array [0] = 0
  
- 		 #include <linux/kernel.h>
-@@ -44314,42 +32708,18 @@
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -88451,76 +94258,179 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pidmap_lock="Y$cr_cv_ksymtab_pidmap_lock"
- else
+-  ac_hi=$ac_mid
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_pidmap_lock="N$cr_cv_ksymtab_pidmap_lock"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  cr_result=$cr_cv_kconfig_HAVE_F_GETPIPE_SZ
  
-     fi
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) cr_cv_compute_int_CR_F_GETPIPE_SZ=$ac_lo;;
+-'')  ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-long longval () { return F_GETPIPE_SZ; }
+-unsigned long ulongval () { return F_GETPIPE_SZ; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
++  if test $cr_result = yes; then
++    $as_echo "#define HAVE_F_GETPIPE_SZ 1" >>confdefs.h
  
-@@ -44379,25 +32749,22 @@
- _ACEOF
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if ((F_GETPIPE_SZ) < 0)
+-    {
+-      long i = longval ();
+-      if (i != (F_GETPIPE_SZ))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
++     HAVE_F_GETPIPE_SZ=1
+   else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != (F_GETPIPE_SZ))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
++    $as_echo "#define HAVE_F_GETPIPE_SZ 0" >>confdefs.h
  
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_compute_int_CR_F_GETPIPE_SZ=`cat conftest.val`
++     HAVE_F_GETPIPE_SZ=''
++  fi
++
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
++
++
++if test "${HAVE_F_SETPIPE_SZ}${HAVE_F_GETPIPE_SZ}" = "11"; then
++
++    CR_F_SETPIPE_SZ=""
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value for CR_F_SETPIPE_SZ" >&5
++$as_echo_n "checking for value for CR_F_SETPIPE_SZ... " >&6; }
++if ${cr_cv_compute_int_CR_F_SETPIPE_SZ+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++
++    cr_cv_compute_int_CR_F_SETPIPE_SZ="not found"
++    if ac_fn_c_compute_int "$LINENO" "F_SETPIPE_SZ" "cr_cv_compute_int_CR_F_SETPIPE_SZ"        "#include <fcntl.h>"; then :
  
-   if test -z "$cr_addr"; then
--    { { echo "$as_me:$LINENO: error: failed to find symbol pidmap_lock" >&5
--echo "$as_me: error: failed to find symbol pidmap_lock" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "failed to find symbol pidmap_lock" "$LINENO" 5
-   fi
  fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.val
++
  
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_F_GETPIPE_SZ" >&5
+-echo "${ECHO_T}$cr_cv_compute_int_CR_F_GETPIPE_SZ" >&6
+-  if test "$cr_cv_compute_int_CR_F_GETPIPE_SZ" != "not found"; then
+-    CR_F_GETPIPE_SZ="$cr_cv_compute_int_CR_F_GETPIPE_SZ"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_F_SETPIPE_SZ" >&5
++$as_echo "$cr_cv_compute_int_CR_F_SETPIPE_SZ" >&6; }
++  if test "$cr_cv_compute_int_CR_F_SETPIPE_SZ" != "not found"; then
++    CR_F_SETPIPE_SZ="$cr_cv_compute_int_CR_F_SETPIPE_SZ"
+   fi
  
+-  if test -n "$CR_F_GETPIPE_SZ"; then
++  if test -n "$CR_F_SETPIPE_SZ"; then
+     cat >>confdefs.h <<_ACEOF
+-#define CR_F_GETPIPE_SZ $CR_F_GETPIPE_SZ
++#define CR_F_SETPIPE_SZ $CR_F_SETPIPE_SZ
+ _ACEOF
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kill_pid" >&5
-+$as_echo_n "checking kernel for kill_pid... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for kill_pid" >&5
--echo $ECHO_N "checking kernel for kill_pid... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_KILL_PID+set}" = set; then
+   fi
+ 
+-    if test -z "${CR_F_GETPIPE_SZ}"; then
++    if test -z "${CR_F_SETPIPE_SZ}"; then
+ 
+-    CR_F_GETPIPE_SZ=""
++    CR_F_SETPIPE_SZ=""
+ 
+ 
+     SAVE_CPP=$CPP
+@@ -48921,343 +36199,93 @@
+   CPP="$KCC -E"
+   CPPFLAGS="$KCFLAGS"
+   cross_compiling="yes"
+-  echo "$as_me:$LINENO: checking kernel for value for CR_F_GETPIPE_SZ" >&5
+-echo $ECHO_N "checking kernel for value for CR_F_GETPIPE_SZ... $ECHO_C" >&6
+-if test "${cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_KILL_PID+set}" = set; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for value for CR_F_SETPIPE_SZ" >&5
++$as_echo_n "checking kernel for value for CR_F_SETPIPE_SZ... " >&6; }
++if ${cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -44408,11 +32775,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-    cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ="not found"
+-    if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_GETPIPE_SZ) >= 0)];
+-test_array [0] = 0
++    cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ="not found"
++    if ac_fn_c_compute_int "$LINENO" "F_SETPIPE_SZ" "cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ"        "#include <linux/fcntl.h>"; then :
  
- 		 #include <linux/kernel.h>
-@@ -44436,42 +32799,18 @@
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -88543,85 +94453,26 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KILL_PID=yes
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KILL_PID=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
- fi
-@@ -44479,33 +32818,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_KILL_PID
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KILL_PID 1
--_ACEOF
-+    $as_echo "#define HAVE_KILL_PID 1" >>confdefs.h
- 
-      HAVE_KILL_PID=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KILL_PID 0
--_ACEOF
-+    $as_echo "#define HAVE_KILL_PID 0" >>confdefs.h
- 
-      HAVE_KILL_PID=''
-   fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kill_proc" >&5
-+$as_echo_n "checking kernel for kill_proc... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for kill_proc" >&5
--echo $ECHO_N "checking kernel for kill_proc... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_KILL_PROC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_KILL_PROC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
- 
-@@ -44516,11 +32850,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_GETPIPE_SZ) <= $ac_mid)];
+-test_array [0] = 0
++fi
  
- 		 #include <linux/kernel.h>
-@@ -44544,42 +32874,18 @@
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -88644,175 +94495,93 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KILL_PROC=yes
- else
+-  ac_hi=$ac_mid; break
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KILL_PROC=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
  
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
-@@ -44587,22 +32893,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_KILL_PROC
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KILL_PROC 1
--_ACEOF
-+    $as_echo "#define HAVE_KILL_PROC 1" >>confdefs.h
- 
-      HAVE_KILL_PROC=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KILL_PROC 0
--_ACEOF
-+    $as_echo "#define HAVE_KILL_PROC 0" >>confdefs.h
- 
-      HAVE_KILL_PROC=''
-   fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
- # Require at least one
-@@ -44626,39 +32928,59 @@
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ" >&5
++$as_echo "$cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ" >&6; }
++  CPP=$SAVE_CPP
++  CPPFLAGS=$SAVE_CPPFLAGS
++  cross_compiling="$SAVE_cross_compiling"
++  if test "$cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ" != "not found"; then
++    CR_F_SETPIPE_SZ="$cr_cv_compute_kernel_int_CR_F_SETPIPE_SZ"
++  fi
  
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++  if test -n "$CR_F_SETPIPE_SZ"; then
++    cat >>confdefs.h <<_ACEOF
++#define CR_F_SETPIPE_SZ $CR_F_SETPIPE_SZ
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-int
+-main ()
 -{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -44672,21 +32994,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" "$LINENO" 5
- 
- fi
- 
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for child_reaper" >&5
-+$as_echo_n "checking kernel for child_reaper... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for child_reaper" >&5
--echo $ECHO_N "checking kernel for child_reaper... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_CHILD_REAPER+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_CHILD_REAPER+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
+-static int test_array [1 - 2 * !((F_GETPIPE_SZ) < 0)];
+-test_array [0] = 0
  
-@@ -44697,11 +33016,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_GETPIPE_SZ) >= $ac_mid)];
+-test_array [0] = 0
  
- 		 #include <linux/kernel.h>
-@@ -44725,42 +33040,18 @@
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -88835,84 +94604,70 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_CHILD_REAPER=yes
- else
+-  ac_lo=$ac_mid; break
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_CHILD_REAPER=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
- fi
-@@ -44768,33 +33059,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_CHILD_REAPER
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_CHILD_REAPER 1
--_ACEOF
-+    $as_echo "#define HAVE_CHILD_REAPER 1" >>confdefs.h
- 
-      HAVE_CHILD_REAPER=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_CHILD_REAPER 0
--_ACEOF
-+    $as_echo "#define HAVE_CHILD_REAPER 0" >>confdefs.h
- 
-      HAVE_CHILD_REAPER=''
-   fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
- 
- 
- 
- 
- 
--  echo "$as_me:$LINENO: checking kernel for task_child_reaper" >&5
--echo $ECHO_N "checking kernel for task_child_reaper... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task_child_reaper" >&5
-+$as_echo_n "checking kernel for task_child_reaper... " >&6; }
++  fi
  
--    if test "${cr_cv_kconfig_HAVE_TASK_CHILD_REAPER+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_CHILD_REAPER+set}" = set; then :
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
++    fi
++
++    CR_F_GETPIPE_SZ=""
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value for CR_F_GETPIPE_SZ" >&5
++$as_echo_n "checking for value for CR_F_GETPIPE_SZ... " >&6; }
++if ${cr_cv_compute_int_CR_F_GETPIPE_SZ+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
- 
-@@ -44805,11 +33091,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
+-ac_lo= ac_hi=
++    cr_cv_compute_int_CR_F_GETPIPE_SZ="not found"
++    if ac_fn_c_compute_int "$LINENO" "F_GETPIPE_SZ" "cr_cv_compute_int_CR_F_GETPIPE_SZ"        "#include <fcntl.h>"; then :
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((F_GETPIPE_SZ) <= $ac_mid)];
+-test_array [0] = 0
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_F_GETPIPE_SZ" >&5
++$as_echo "$cr_cv_compute_int_CR_F_GETPIPE_SZ" >&6; }
++  if test "$cr_cv_compute_int_CR_F_GETPIPE_SZ" != "not found"; then
++    CR_F_GETPIPE_SZ="$cr_cv_compute_int_CR_F_GETPIPE_SZ"
++  fi
  
- 		 #include <linux/kernel.h>
-@@ -44833,42 +33115,18 @@
-   return 0;
- }
+-  ;
+-  return 0;
+-}
++  if test -n "$CR_F_GETPIPE_SZ"; then
++    cat >>confdefs.h <<_ACEOF
++#define CR_F_GETPIPE_SZ $CR_F_GETPIPE_SZ
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -88936,69 +94691,142 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_CHILD_REAPER=yes
- else
+-  ac_hi=$ac_mid
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
-+  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_CHILD_REAPER=no
- fi
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ=$ac_lo;;
+-'')  ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <linux/fcntl.h>
+-long longval () { return F_GETPIPE_SZ; }
+-unsigned long ulongval () { return F_GETPIPE_SZ; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+ 
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if ((F_GETPIPE_SZ) < 0)
+-    {
+-      long i = longval ();
+-      if (i != (F_GETPIPE_SZ))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != (F_GETPIPE_SZ))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
++  fi
  
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./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
+-  cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ=`cat conftest.val`
++    if test -z "${CR_F_GETPIPE_SZ}"; then
++
++    CR_F_GETPIPE_SZ=""
++
++
++    SAVE_CPP=$CPP
++  SAVE_CPPFLAGS=$CPPFLAGS
++  SAVE_cross_compiling="$cross_compiling"
++  CPP="$KCC -E"
++  CPPFLAGS="$KCFLAGS"
++  cross_compiling="yes"
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for value for CR_F_GETPIPE_SZ" >&5
++$as_echo_n "checking kernel for value for CR_F_GETPIPE_SZ... " >&6; }
++if ${cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++
++    cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ="not found"
++    if ac_fn_c_compute_int "$LINENO" "F_GETPIPE_SZ" "cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ"        "#include <linux/fcntl.h>"; then :
  
  fi
-@@ -44876,33 +33134,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_CHILD_REAPER
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.val
++
  
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_CHILD_REAPER 1
--_ACEOF
-+    $as_echo "#define HAVE_TASK_CHILD_REAPER 1" >>confdefs.h
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ" >&5
+-echo "${ECHO_T}$cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ" >&5
++$as_echo "$cr_cv_compute_kernel_int_CR_F_GETPIPE_SZ" >&6; }
+   CPP=$SAVE_CPP
+   CPPFLAGS=$SAVE_CPPFLAGS
+   cross_compiling="$SAVE_cross_compiling"
+@@ -49271,7 +36299,6 @@
+ _ACEOF
  
-      HAVE_TASK_CHILD_REAPER=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_CHILD_REAPER 0
--_ACEOF
-+    $as_echo "#define HAVE_TASK_CHILD_REAPER 0" >>confdefs.h
  
-      HAVE_TASK_CHILD_REAPER=''
+-
    fi
  
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
+     fi
+@@ -49285,12 +36312,11 @@
  
  
- if test -z "${HAVE_CHILD_REAPER}${HAVE_TASK_CHILD_REAPER}"; then
  
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for file_operations.check_flags" >&5
++$as_echo_n "checking kernel for file_operations.check_flags... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel symbol table for child_reaper" >&5
--echo $ECHO_N "checking kernel symbol table for child_reaper... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for child_reaper" >&5
-+$as_echo_n "checking kernel symbol table for child_reaper... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_child_reaper+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for file_operations.check_flags" >&5
+-echo $ECHO_N "checking kernel for file_operations.check_flags... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_child_reaper+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_child_reaper=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}child_reaper$/ {s/ .*//p;q;}"`
-@@ -44918,11 +33172,7 @@
+ 
+@@ -49301,11 +36327,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -89011,7 +94839,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -44942,42 +33192,18 @@
+@@ -49323,42 +36345,18 @@
    return 0;
  }
  _ACEOF
@@ -89041,7 +94869,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_child_reaper="Y$cr_cv_ksymtab_child_reaper"
+ 	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -89050,41 +94878,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_child_reaper="N$cr_cv_ksymtab_child_reaper"
+ 	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -45007,20 +33233,19 @@
- _ACEOF
+ fi
+@@ -49366,33 +36364,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 1
+-_ACEOF
++    $as_echo "#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 1" >>confdefs.h
+ 
+      HAVE_FILE_OPERATIONS_CHECK_FLAGS=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 0
+-_ACEOF
++    $as_echo "#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 0" >>confdefs.h
  
+      HAVE_FILE_OPERATIONS_CHECK_FLAGS=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- fi
  
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.parent" >&5
-+$as_echo_n "checking kernel for task.parent... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for file.f_lock" >&5
++$as_echo_n "checking kernel for file.f_lock... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for task.parent" >&5
--echo $ECHO_N "checking kernel for task.parent... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for file.f_lock" >&5
+-echo $ECHO_N "checking kernel for file.f_lock... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_TASK_PARENT+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_FILE_F_LOCK+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_PARENT+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FILE_F_LOCK+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -45031,11 +33256,7 @@
+@@ -49403,11 +36396,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -89097,7 +94940,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -45053,42 +33274,18 @@
+@@ -49425,42 +36414,18 @@
    return 0;
  }
  _ACEOF
@@ -89127,7 +94970,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PARENT=yes
+ 	 cr_cv_kconfig_HAVE_FILE_F_LOCK=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -89136,30 +94979,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PARENT=no
+ 	 cr_cv_kconfig_HAVE_FILE_F_LOCK=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -45096,33 +33293,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_PARENT
+@@ -49468,33 +36433,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_FILE_F_LOCK
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PARENT 1
+-#define HAVE_FILE_F_LOCK 1
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_PARENT 1" >>confdefs.h
++    $as_echo "#define HAVE_FILE_F_LOCK 1" >>confdefs.h
  
-      HAVE_TASK_PARENT=1
+      HAVE_FILE_F_LOCK=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PARENT 0
+-#define HAVE_FILE_F_LOCK 0
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_PARENT 0" >>confdefs.h
++    $as_echo "#define HAVE_FILE_F_LOCK 0" >>confdefs.h
  
-      HAVE_TASK_PARENT=''
+      HAVE_FILE_F_LOCK=''
    fi
  
  
@@ -89173,19 +95016,19 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel for task.real_parent" >&5
--echo $ECHO_N "checking kernel for task.real_parent... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.real_parent" >&5
-+$as_echo_n "checking kernel for task.real_parent... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for inode.i_mapping" >&5
+-echo $ECHO_N "checking kernel for inode.i_mapping... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode.i_mapping" >&5
++$as_echo_n "checking kernel for inode.i_mapping... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_TASK_REAL_PARENT+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_INODE_I_MAPPING+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_REAL_PARENT+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_INODE_I_MAPPING+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -45133,11 +33325,7 @@
+@@ -49505,11 +36465,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -89198,7 +95041,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -45155,42 +33343,18 @@
+@@ -49527,42 +36483,18 @@
    return 0;
  }
  _ACEOF
@@ -89228,7 +95071,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_REAL_PARENT=yes
+ 	 cr_cv_kconfig_HAVE_INODE_I_MAPPING=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -89237,30 +95080,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_REAL_PARENT=no
+ 	 cr_cv_kconfig_HAVE_INODE_I_MAPPING=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -45198,32 +33362,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_REAL_PARENT
+@@ -49570,33 +36502,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_INODE_I_MAPPING
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_REAL_PARENT 1
+-#define HAVE_INODE_I_MAPPING 1
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_REAL_PARENT 1" >>confdefs.h
++    $as_echo "#define HAVE_INODE_I_MAPPING 1" >>confdefs.h
  
-      HAVE_TASK_REAL_PARENT=1
+      HAVE_INODE_I_MAPPING=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_REAL_PARENT 0
+-#define HAVE_INODE_I_MAPPING 0
 -_ACEOF
-+    $as_echo "#define HAVE_TASK_REAL_PARENT 0" >>confdefs.h
++    $as_echo "#define HAVE_INODE_I_MAPPING 0" >>confdefs.h
  
-      HAVE_TASK_REAL_PARENT=''
+      HAVE_INODE_I_MAPPING=''
    fi
  
  
@@ -89271,21 +95114,22 @@
  
  
  
- # Look for non-deprecated "typedef struct SOMETHING kmem_cache_t".
- # This is slightly complicated by the fact that this is an opaque type (with
- # the struct itself forward-declared but not defined in the public headers).
--echo "$as_me:$LINENO: checking kernel for kmem_cache_t" >&5
--echo $ECHO_N "checking kernel for kmem_cache_t... $ECHO_C" >&6
--if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_T+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for file.f_mapping" >&5
++$as_echo_n "checking kernel for file.f_mapping... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for file.f_mapping" >&5
+-echo $ECHO_N "checking kernel for file.f_mapping... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_FILE_F_MAPPING+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kmem_cache_t" >&5
-+$as_echo_n "checking kernel for kmem_cache_t... " >&6; }
-+if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_T+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FILE_F_MAPPING+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -45234,11 +33394,7 @@
+@@ -49607,11 +36534,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -89298,7 +95142,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -45255,28 +33411,7 @@
+@@ -49629,42 +36552,18 @@
    return 0;
  }
  _ACEOF
@@ -89328,31 +95172,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
-@@ -45288,11 +33423,7 @@
-   SAVE_CPPFLAGS=$CPPFLAGS
-   CPP="$KCC -E"
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 		 #include <linux/kernel.h>
-@@ -45303,7 +33434,7 @@
- 		 #include <linux/slab.h>
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "typedef.+[[:space:]]kmem_cache_t[[:space:]].+deprecated" >/dev/null 2>&1; then
-+  $EGREP "typedef.+[[:space:]]kmem_cache_t[[:space:]].+deprecated" >/dev/null 2>&1; then :
-   CPP=$SAVE_CPP
- 	CPPFLAGS=$SAVE_CPPFLAGS
- 	cr_cv_kconfig_HAVE_KMEM_CACHE_T=no
-@@ -45318,30 +33449,23 @@
-  # Want *not* found
- 
+ 	 cr_cv_kconfig_HAVE_FILE_F_MAPPING=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -89361,51 +95181,158 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KMEM_CACHE_T=no
+ 	 cr_cv_kconfig_HAVE_FILE_F_MAPPING=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
--echo "$as_me:$LINENO: result: $cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&5
--echo "${ECHO_T}$cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&5
-+$as_echo "$cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&6; }
+@@ -49672,22 +36571,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_FILE_F_MAPPING
  
-   if test x$cr_cv_kconfig_HAVE_KMEM_CACHE_T = xyes; then
+   if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KMEM_CACHE_T 1
+-#define HAVE_FILE_F_MAPPING 1
 -_ACEOF
-+    $as_echo "#define HAVE_KMEM_CACHE_T 1" >>confdefs.h
++    $as_echo "#define HAVE_FILE_F_MAPPING 1" >>confdefs.h
  
+      HAVE_FILE_F_MAPPING=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KMEM_CACHE_T 0
+-#define HAVE_FILE_F_MAPPING 0
 -_ACEOF
-+    $as_echo "#define HAVE_KMEM_CACHE_T 0" >>confdefs.h
++    $as_echo "#define HAVE_FILE_F_MAPPING 0" >>confdefs.h
  
+      HAVE_FILE_F_MAPPING=''
    fi
  
-@@ -45350,13 +33474,11 @@
  
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for gfp_t" >&5
-+$as_echo_n "checking kernel for gfp_t... " >&6; }
+ # Require one or more match on mapping
+@@ -49711,39 +36606,70 @@
  
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -49757,21 +36683,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" "$LINENO" 5
+ 
+ fi
+ 
+ 
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for file_operations.unlocked_ioctl" >&5
++$as_echo_n "checking kernel for file_operations.unlocked_ioctl... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for file_operations.unlocked_ioctl" >&5
+-echo $ECHO_N "checking kernel for file_operations.unlocked_ioctl... $ECHO_C" >&6
 -
--  echo "$as_me:$LINENO: checking kernel for gfp_t" >&5
--echo $ECHO_N "checking kernel for gfp_t... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_GFP_T+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_GFP_T+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -45367,11 +33489,7 @@
+@@ -49782,11 +36705,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -89418,7 +95345,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -45391,42 +33509,18 @@
+@@ -49804,42 +36723,18 @@
    return 0;
  }
  _ACEOF
@@ -89448,7 +95375,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_GFP_T=yes
+ 	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -89457,30 +95384,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_GFP_T=no
+ 	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -45434,34 +33528,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_GFP_T
+@@ -49847,22 +36742,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_GFP_T 1
+-#define HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL 1
 -_ACEOF
-+    $as_echo "#define HAVE_GFP_T 1" >>confdefs.h
++    $as_echo "#define HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL 1" >>confdefs.h
  
-      HAVE_GFP_T=1
+      HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_GFP_T 0
+-#define HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL 0
 -_ACEOF
-+    $as_echo "#define HAVE_GFP_T 0" >>confdefs.h
++    $as_echo "#define HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL 0" >>confdefs.h
  
-      HAVE_GFP_T=''
+      HAVE_FILE_OPERATIONS_UNLOCKED_IOCTL=''
    fi
  
  
@@ -89490,24 +95417,25 @@
 +$as_echo "$cr_result" >&6; }
  
  
- # OK if missing
  
+@@ -49872,12 +36763,11 @@
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kzalloc" >&5
-+$as_echo_n "checking kernel for kzalloc... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for kzalloc" >&5
--echo $ECHO_N "checking kernel for kzalloc... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg do_generic_file_read" >&5
++$as_echo_n "checking kernel for 4-arg do_generic_file_read... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 4-arg do_generic_file_read" >&5
+-echo $ECHO_N "checking kernel for 4-arg do_generic_file_read... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_KZALLOC+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_KZALLOC+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -45472,11 +33561,7 @@
+@@ -49888,11 +36778,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -89520,7 +95448,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -45500,42 +33585,18 @@
+@@ -49913,42 +36799,18 @@
    return 0;
  }
  _ACEOF
@@ -89550,7 +95478,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KZALLOC=yes
+ 	 cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -89559,57 +95487,58 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KZALLOC=no
+ 	 cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -45543,34 +33604,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_KZALLOC
+@@ -49956,23 +36818,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KZALLOC 1
+-#define HAVE_4_ARG_DO_GENERIC_FILE_READ 1
 -_ACEOF
-+    $as_echo "#define HAVE_KZALLOC 1" >>confdefs.h
++    $as_echo "#define HAVE_4_ARG_DO_GENERIC_FILE_READ 1" >>confdefs.h
  
-      HAVE_KZALLOC=1
+      HAVE_4_ARG_DO_GENERIC_FILE_READ=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KZALLOC 0
+-#define HAVE_4_ARG_DO_GENERIC_FILE_READ 0
 -_ACEOF
-+    $as_echo "#define HAVE_KZALLOC 0" >>confdefs.h
++    $as_echo "#define HAVE_4_ARG_DO_GENERIC_FILE_READ 0" >>confdefs.h
  
-      HAVE_KZALLOC=''
+      HAVE_4_ARG_DO_GENERIC_FILE_READ=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
- # OK if missing
  
+@@ -49982,11 +36839,11 @@
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kmem_cache_zalloc" >&5
-+$as_echo_n "checking kernel for kmem_cache_zalloc... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for kmem_cache_zalloc" >&5
--echo $ECHO_N "checking kernel for kmem_cache_zalloc... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel for 5-arg do_generic_file_read" >&5
+-echo $ECHO_N "checking kernel for 5-arg do_generic_file_read... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 5-arg do_generic_file_read" >&5
++$as_echo_n "checking kernel for 5-arg do_generic_file_read... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -45581,11 +33637,7 @@
+@@ -49997,11 +36854,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -89622,7 +95551,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -45609,42 +33661,18 @@
+@@ -50022,42 +36875,18 @@
    return 0;
  }
  _ACEOF
@@ -89652,7 +95581,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC=yes
+ 	 cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -89661,30 +95590,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC=no
+ 	 cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -45652,34 +33680,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC
+@@ -50065,22 +36894,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KMEM_CACHE_ZALLOC 1
+-#define HAVE_5_ARG_DO_GENERIC_FILE_READ 1
 -_ACEOF
-+    $as_echo "#define HAVE_KMEM_CACHE_ZALLOC 1" >>confdefs.h
++    $as_echo "#define HAVE_5_ARG_DO_GENERIC_FILE_READ 1" >>confdefs.h
  
-      HAVE_KMEM_CACHE_ZALLOC=1
+      HAVE_5_ARG_DO_GENERIC_FILE_READ=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KMEM_CACHE_ZALLOC 0
+-#define HAVE_5_ARG_DO_GENERIC_FILE_READ 0
 -_ACEOF
-+    $as_echo "#define HAVE_KMEM_CACHE_ZALLOC 0" >>confdefs.h
++    $as_echo "#define HAVE_5_ARG_DO_GENERIC_FILE_READ 0" >>confdefs.h
  
-      HAVE_KMEM_CACHE_ZALLOC=''
+      HAVE_5_ARG_DO_GENERIC_FILE_READ=''
    fi
  
  
@@ -89694,24 +95623,25 @@
 +$as_echo "$cr_result" >&6; }
  
  
- # OK if missing
  
+@@ -50088,12 +36913,11 @@
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kmemdup" >&5
-+$as_echo_n "checking kernel for kmemdup... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for kmemdup" >&5
--echo $ECHO_N "checking kernel for kmemdup... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for read_descriptor_t.arg.data" >&5
++$as_echo_n "checking kernel for read_descriptor_t.arg.data... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for read_descriptor_t.arg.data" >&5
+-echo $ECHO_N "checking kernel for read_descriptor_t.arg.data... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_KMEMDUP+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_KMEMDUP+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -45690,11 +33713,7 @@
+@@ -50104,11 +36928,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -89724,7 +95654,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -45718,42 +33737,18 @@
+@@ -50126,42 +36946,18 @@
    return 0;
  }
  _ACEOF
@@ -89754,7 +95684,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KMEMDUP=yes
+ 	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -89763,58 +95693,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_KMEMDUP=no
+ 	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -45761,22 +33756,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_KMEMDUP
+@@ -50169,33 +36965,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KMEMDUP 1
+-#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 1
 -_ACEOF
-+    $as_echo "#define HAVE_KMEMDUP 1" >>confdefs.h
++    $as_echo "#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 1" >>confdefs.h
  
-      HAVE_KMEMDUP=1
+      HAVE_READ_DESCRIPTOR_T_ARG_DATA=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_KMEMDUP 0
+-#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 0
 -_ACEOF
-+    $as_echo "#define HAVE_KMEMDUP 0" >>confdefs.h
++    $as_echo "#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 0" >>confdefs.h
  
-      HAVE_KMEMDUP=''
+      HAVE_READ_DESCRIPTOR_T_ARG_DATA=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
- # OK if missing
-@@ -45784,12 +33775,11 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pipe_inode_info.base" >&5
-+$as_echo_n "checking kernel for pipe_inode_info.base... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel for read_descriptor_t.buf" >&5
+-echo $ECHO_N "checking kernel for read_descriptor_t.buf... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for read_descriptor_t.buf" >&5
++$as_echo_n "checking kernel for read_descriptor_t.buf... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for pipe_inode_info.base" >&5
--echo $ECHO_N "checking kernel for pipe_inode_info.base... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -45800,11 +33790,7 @@
+@@ -50206,11 +36997,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -89827,7 +95755,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -45825,42 +33811,18 @@
+@@ -50228,42 +37015,18 @@
    return 0;
  }
  _ACEOF
@@ -89857,7 +95785,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE=yes
+ 	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -89866,30 +95794,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE=no
+ 	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -45868,34 +33830,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE
+@@ -50271,22 +37034,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PIPE_INODE_INFO_BASE 1
+-#define HAVE_READ_DESCRIPTOR_T_BUF 1
 -_ACEOF
-+    $as_echo "#define HAVE_PIPE_INODE_INFO_BASE 1" >>confdefs.h
++    $as_echo "#define HAVE_READ_DESCRIPTOR_T_BUF 1" >>confdefs.h
  
-      HAVE_PIPE_INODE_INFO_BASE=1
+      HAVE_READ_DESCRIPTOR_T_BUF=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PIPE_INODE_INFO_BASE 0
+-#define HAVE_READ_DESCRIPTOR_T_BUF 0
 -_ACEOF
-+    $as_echo "#define HAVE_PIPE_INODE_INFO_BASE 0" >>confdefs.h
++    $as_echo "#define HAVE_READ_DESCRIPTOR_T_BUF 0" >>confdefs.h
  
-      HAVE_PIPE_INODE_INFO_BASE=''
+      HAVE_READ_DESCRIPTOR_T_BUF=''
    fi
  
  
@@ -89899,24 +95827,125 @@
 +$as_echo "$cr_result" >&6; }
  
  
- # OK if missing.
+ if test "${HAVE_READ_DESCRIPTOR_T_ARG_DATA}${HAVE_READ_DESCRIPTOR_T_BUF}" != "1"; then
+@@ -50309,39 +37068,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -50355,21 +37145,18 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" "$LINENO" 5
  
+ fi
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pipe_buf_operations.pin" >&5
-+$as_echo_n "checking kernel for pipe_buf_operations.pin... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for pipe_buf_operations.pin" >&5
--echo $ECHO_N "checking kernel for pipe_buf_operations.pin... $ECHO_C" >&6
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for splice_direct_to_actor" >&5
++$as_echo_n "checking kernel for splice_direct_to_actor... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for splice_direct_to_actor" >&5
+-echo $ECHO_N "checking kernel for splice_direct_to_actor... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -45906,11 +33863,7 @@
+@@ -50380,11 +37167,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -89929,7 +95958,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -45931,42 +33884,18 @@
+@@ -50410,42 +37193,18 @@
    return 0;
  }
  _ACEOF
@@ -89959,7 +95988,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN=yes
+ 	 cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -89968,56 +95997,58 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN=no
+ 	 cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -45974,33 +33903,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN
+@@ -50453,23 +37212,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PIPE_BUF_OPERATIONS_PIN 1
+-#define HAVE_SPLICE_DIRECT_TO_ACTOR 1
 -_ACEOF
-+    $as_echo "#define HAVE_PIPE_BUF_OPERATIONS_PIN 1" >>confdefs.h
++    $as_echo "#define HAVE_SPLICE_DIRECT_TO_ACTOR 1" >>confdefs.h
  
-      HAVE_PIPE_BUF_OPERATIONS_PIN=1
+      HAVE_SPLICE_DIRECT_TO_ACTOR=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PIPE_BUF_OPERATIONS_PIN 0
+-#define HAVE_SPLICE_DIRECT_TO_ACTOR 0
 -_ACEOF
-+    $as_echo "#define HAVE_PIPE_BUF_OPERATIONS_PIN 0" >>confdefs.h
++    $as_echo "#define HAVE_SPLICE_DIRECT_TO_ACTOR 0" >>confdefs.h
  
-      HAVE_PIPE_BUF_OPERATIONS_PIN=''
+      HAVE_SPLICE_DIRECT_TO_ACTOR=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
- if test -z "${HAVE_PIPE_BUF_OPERATIONS_PIN}"; then
  
+@@ -50479,11 +37233,11 @@
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg pipe_ops.unmap" >&5
-+$as_echo_n "checking kernel for 2-arg pipe_ops.unmap... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 2-arg pipe_ops.unmap" >&5
--echo $ECHO_N "checking kernel for 2-arg pipe_ops.unmap... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP+set}" = set; then
+ 
+-  echo "$as_me:$LINENO: checking kernel for 4-arg vfs_mknod" >&5
+-echo $ECHO_N "checking kernel for 4-arg vfs_mknod... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg vfs_mknod" >&5
++$as_echo_n "checking kernel for 4-arg vfs_mknod... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -46011,11 +33935,7 @@
+@@ -50494,11 +37248,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -90030,10 +96061,13 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -46038,42 +33958,18 @@
-   return 0;
- }
- _ACEOF
+@@ -50516,45 +37266,21 @@
+ 	#endif
+ 	    vfs_mknod(NULL,NULL,0,0);
+   ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -90056,11 +96090,14 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP=yes
+ 	 cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -90069,54 +96106,58 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP=no
+ 	 cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -46081,31 +33977,26 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP
+@@ -50562,22 +37288,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_ARG_PIPE_OPS_UNMAP 1
+-#define HAVE_4_ARG_VFS_MKNOD 1
 -_ACEOF
-+    $as_echo "#define HAVE_2_ARG_PIPE_OPS_UNMAP 1" >>confdefs.h
++    $as_echo "#define HAVE_4_ARG_VFS_MKNOD 1" >>confdefs.h
  
-      HAVE_2_ARG_PIPE_OPS_UNMAP=1
+      HAVE_4_ARG_VFS_MKNOD=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_ARG_PIPE_OPS_UNMAP 0
+-#define HAVE_4_ARG_VFS_MKNOD 0
 -_ACEOF
-+    $as_echo "#define HAVE_2_ARG_PIPE_OPS_UNMAP 0" >>confdefs.h
++    $as_echo "#define HAVE_4_ARG_VFS_MKNOD 0" >>confdefs.h
  
-      HAVE_2_ARG_PIPE_OPS_UNMAP=''
+      HAVE_4_ARG_VFS_MKNOD=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel for 3-arg pipe_ops.unmap" >&5
--echo $ECHO_N "checking kernel for 3-arg pipe_ops.unmap... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg pipe_ops.unmap" >&5
-+$as_echo_n "checking kernel for 3-arg pipe_ops.unmap... " >&6; }
+@@ -50587,12 +37309,11 @@
  
--    if test "${cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 5-arg vfs_mknod" >&5
++$as_echo_n "checking kernel for 5-arg vfs_mknod... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 5-arg vfs_mknod" >&5
+-echo $ECHO_N "checking kernel for 5-arg vfs_mknod... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -46116,11 +34007,7 @@
+@@ -50603,11 +37324,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -90129,7 +96170,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -46143,42 +34030,18 @@
+@@ -50628,42 +37345,18 @@
    return 0;
  }
  _ACEOF
@@ -90159,7 +96200,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP=yes
+ 	 cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -90168,30 +96209,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP=no
+ 	 cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -46186,22 +34049,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP
+@@ -50671,22 +37364,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_3_ARG_PIPE_OPS_UNMAP 1
+-#define HAVE_5_ARG_VFS_MKNOD 1
 -_ACEOF
-+    $as_echo "#define HAVE_3_ARG_PIPE_OPS_UNMAP 1" >>confdefs.h
++    $as_echo "#define HAVE_5_ARG_VFS_MKNOD 1" >>confdefs.h
  
-      HAVE_3_ARG_PIPE_OPS_UNMAP=1
+      HAVE_5_ARG_VFS_MKNOD=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_3_ARG_PIPE_OPS_UNMAP 0
+-#define HAVE_5_ARG_VFS_MKNOD 0
 -_ACEOF
-+    $as_echo "#define HAVE_3_ARG_PIPE_OPS_UNMAP 0" >>confdefs.h
++    $as_echo "#define HAVE_5_ARG_VFS_MKNOD 0" >>confdefs.h
  
-      HAVE_3_ARG_PIPE_OPS_UNMAP=''
+      HAVE_5_ARG_VFS_MKNOD=''
    fi
  
  
@@ -90200,9 +96241,9 @@
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- fi
- # Require exactly one match
-@@ -46225,39 +34084,59 @@
+ 
+ 
+@@ -50711,39 +37400,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -90265,14 +96306,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -90280,32 +96333,35 @@
    fi
  fi
  rm -f confcache
-@@ -46271,19 +34150,17 @@
+@@ -50757,9 +37477,7 @@
    echo "  Kernel running currently = `uname -r`"
    echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" >&2;}
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" "$LINENO" 5
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" "$LINENO" 5
  
  fi
  
+@@ -50769,12 +37487,11 @@
  
--  echo "$as_me:$LINENO: checking kernel symbol table for anon_pipe_buf_ops" >&5
--echo $ECHO_N "checking kernel symbol table for anon_pipe_buf_ops... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for anon_pipe_buf_ops" >&5
-+$as_echo_n "checking kernel symbol table for anon_pipe_buf_ops... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_anon_pipe_buf_ops+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg vfs_unlink" >&5
++$as_echo_n "checking kernel for 2-arg vfs_unlink... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2-arg vfs_unlink" >&5
+-echo $ECHO_N "checking kernel for 2-arg vfs_unlink... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_anon_pipe_buf_ops+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_anon_pipe_buf_ops=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}anon_pipe_buf_ops$/ {s/ .*//p;q;}"`
-@@ -46299,11 +34176,7 @@
+ 
+@@ -50785,11 +37502,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -90318,7 +96374,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -46323,42 +34196,18 @@
+@@ -50810,42 +37523,18 @@
    return 0;
  }
  _ACEOF
@@ -90348,7 +96404,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_anon_pipe_buf_ops="Y$cr_cv_ksymtab_anon_pipe_buf_ops"
+ 	 cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -90357,41 +96413,58 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_anon_pipe_buf_ops="N$cr_cv_ksymtab_anon_pipe_buf_ops"
+ 	 cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
-@@ -46388,20 +34237,19 @@
- _ACEOF
+ fi
+@@ -50853,22 +37542,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK
+ 
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_ARG_VFS_UNLINK 1
+-_ACEOF
++    $as_echo "#define HAVE_2_ARG_VFS_UNLINK 1" >>confdefs.h
+ 
+      HAVE_2_ARG_VFS_UNLINK=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_ARG_VFS_UNLINK 0
+-_ACEOF
++    $as_echo "#define HAVE_2_ARG_VFS_UNLINK 0" >>confdefs.h
  
+      HAVE_2_ARG_VFS_UNLINK=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
- # For O_DIRECT support
  
+@@ -50878,12 +37563,11 @@
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for file_operations.check_flags" >&5
-+$as_echo_n "checking kernel for file_operations.check_flags... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for file_operations.check_flags" >&5
--echo $ECHO_N "checking kernel for file_operations.check_flags... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg vfs_unlink" >&5
++$as_echo_n "checking kernel for 3-arg vfs_unlink... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 3-arg vfs_unlink" >&5
+-echo $ECHO_N "checking kernel for 3-arg vfs_unlink... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -46412,11 +34260,7 @@
+@@ -50894,11 +37578,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -90404,7 +96477,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -46434,42 +34278,18 @@
+@@ -50919,42 +37599,18 @@
    return 0;
  }
  _ACEOF
@@ -90434,7 +96507,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS=yes
+ 	 cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -90443,30 +96516,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS=no
+ 	 cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -46477,33 +34297,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS
+@@ -50962,22 +37618,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 1
+-#define HAVE_3_ARG_VFS_UNLINK 1
 -_ACEOF
-+    $as_echo "#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 1" >>confdefs.h
++    $as_echo "#define HAVE_3_ARG_VFS_UNLINK 1" >>confdefs.h
  
-      HAVE_FILE_OPERATIONS_CHECK_FLAGS=1
+      HAVE_3_ARG_VFS_UNLINK=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 0
+-#define HAVE_3_ARG_VFS_UNLINK 0
 -_ACEOF
-+    $as_echo "#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 0" >>confdefs.h
++    $as_echo "#define HAVE_3_ARG_VFS_UNLINK 0" >>confdefs.h
  
-      HAVE_FILE_OPERATIONS_CHECK_FLAGS=''
+      HAVE_3_ARG_VFS_UNLINK=''
    fi
  
  
@@ -90477,22 +96550,125 @@
  
  
  
+@@ -51002,39 +37654,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    if test "x$cache_file" != "x/dev/null"; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -51048,9 +37731,7 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" "$LINENO" 5
  
+ fi
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode.i_mapping" >&5
-+$as_echo_n "checking kernel for inode.i_mapping... " >&6; }
+@@ -51060,12 +37741,11 @@
  
--  echo "$as_me:$LINENO: checking kernel for inode.i_mapping" >&5
--echo $ECHO_N "checking kernel for inode.i_mapping... $ECHO_C" >&6
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg notify_change" >&5
++$as_echo_n "checking kernel for 2-arg notify_change... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2-arg notify_change" >&5
+-echo $ECHO_N "checking kernel for 2-arg notify_change... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_INODE_I_MAPPING+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_INODE_I_MAPPING+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -46514,11 +34329,7 @@
+@@ -51076,11 +37756,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -90505,7 +96681,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -46536,42 +34347,18 @@
+@@ -51101,42 +37777,18 @@
    return 0;
  }
  _ACEOF
@@ -90535,7 +96711,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_INODE_I_MAPPING=yes
+ 	 cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -90544,56 +96720,58 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_INODE_I_MAPPING=no
+ 	 cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -46579,33 +34366,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_INODE_I_MAPPING
+@@ -51144,22 +37796,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_INODE_I_MAPPING 1
+-#define HAVE_2_ARG_NOTIFY_CHANGE 1
 -_ACEOF
-+    $as_echo "#define HAVE_INODE_I_MAPPING 1" >>confdefs.h
++    $as_echo "#define HAVE_2_ARG_NOTIFY_CHANGE 1" >>confdefs.h
  
-      HAVE_INODE_I_MAPPING=1
+      HAVE_2_ARG_NOTIFY_CHANGE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_INODE_I_MAPPING 0
+-#define HAVE_2_ARG_NOTIFY_CHANGE 0
 -_ACEOF
-+    $as_echo "#define HAVE_INODE_I_MAPPING 0" >>confdefs.h
++    $as_echo "#define HAVE_2_ARG_NOTIFY_CHANGE 0" >>confdefs.h
  
-      HAVE_INODE_I_MAPPING=''
+      HAVE_2_ARG_NOTIFY_CHANGE=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
+@@ -51169,12 +37817,11 @@
  
  
--  echo "$as_me:$LINENO: checking kernel for file.f_mapping" >&5
--echo $ECHO_N "checking kernel for file.f_mapping... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for file.f_mapping" >&5
-+$as_echo_n "checking kernel for file.f_mapping... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_FILE_F_MAPPING+set}" = set; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg notify_change" >&5
++$as_echo_n "checking kernel for 3-arg notify_change... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 3-arg notify_change" >&5
+-echo $ECHO_N "checking kernel for 3-arg notify_change... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_FILE_F_MAPPING+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -46616,11 +34398,7 @@
+@@ -51185,11 +37832,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -90606,7 +96784,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -46638,42 +34416,18 @@
+@@ -51210,42 +37853,18 @@
    return 0;
  }
  _ACEOF
@@ -90636,7 +96814,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FILE_F_MAPPING=yes
+ 	 cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -90645,30 +96823,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_FILE_F_MAPPING=no
+ 	 cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -46681,22 +34435,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_FILE_F_MAPPING
+@@ -51253,22 +37872,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FILE_F_MAPPING 1
+-#define HAVE_3_ARG_NOTIFY_CHANGE 1
 -_ACEOF
-+    $as_echo "#define HAVE_FILE_F_MAPPING 1" >>confdefs.h
++    $as_echo "#define HAVE_3_ARG_NOTIFY_CHANGE 1" >>confdefs.h
  
-      HAVE_FILE_F_MAPPING=1
+      HAVE_3_ARG_NOTIFY_CHANGE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_FILE_F_MAPPING 0
+-#define HAVE_3_ARG_NOTIFY_CHANGE 0
 -_ACEOF
-+    $as_echo "#define HAVE_FILE_F_MAPPING 0" >>confdefs.h
++    $as_echo "#define HAVE_3_ARG_NOTIFY_CHANGE 0" >>confdefs.h
  
-      HAVE_FILE_F_MAPPING=''
+      HAVE_3_ARG_NOTIFY_CHANGE=''
    fi
  
  
@@ -90678,8 +96856,8 @@
 +$as_echo "$cr_result" >&6; }
  
  
- # Require one or more match on mapping
-@@ -46720,39 +34470,59 @@
+ 
+@@ -51293,39 +37908,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -90742,14 +96920,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -90757,35 +96947,34 @@
    fi
  fi
  rm -f confcache
-@@ -46766,9 +34536,7 @@
+@@ -51339,21 +37985,18 @@
    echo "  Kernel running currently = `uname -r`"
    echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" >&2;}
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" "$LINENO" 5
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" "$LINENO" 5
  
  fi
  
-@@ -46778,12 +34546,11 @@
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg do_generic_file_read" >&5
-+$as_echo_n "checking kernel for 4-arg do_generic_file_read... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.ptrace" >&5
++$as_echo_n "checking kernel for task.ptrace... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 4-arg do_generic_file_read" >&5
--echo $ECHO_N "checking kernel for 4-arg do_generic_file_read... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for task.ptrace" >&5
+-echo $ECHO_N "checking kernel for task.ptrace... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_TASK_PTRACE+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_PTRACE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -46794,11 +34561,7 @@
+@@ -51364,11 +38007,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -90798,7 +96987,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -46819,42 +34582,18 @@
+@@ -51386,42 +38025,18 @@
    return 0;
  }
  _ACEOF
@@ -90828,7 +97017,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ=yes
+ 	 cr_cv_kconfig_HAVE_TASK_PTRACE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -90837,30 +97026,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ=no
+ 	 cr_cv_kconfig_HAVE_TASK_PTRACE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -46862,22 +34601,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ
+@@ -51429,33 +38044,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACE
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_4_ARG_DO_GENERIC_FILE_READ 1
+-#define HAVE_TASK_PTRACE 1
 -_ACEOF
-+    $as_echo "#define HAVE_4_ARG_DO_GENERIC_FILE_READ 1" >>confdefs.h
++    $as_echo "#define HAVE_TASK_PTRACE 1" >>confdefs.h
  
-      HAVE_4_ARG_DO_GENERIC_FILE_READ=1
+      HAVE_TASK_PTRACE=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_4_ARG_DO_GENERIC_FILE_READ 0
+-#define HAVE_TASK_PTRACE 0
 -_ACEOF
-+    $as_echo "#define HAVE_4_ARG_DO_GENERIC_FILE_READ 0" >>confdefs.h
++    $as_echo "#define HAVE_TASK_PTRACE 0" >>confdefs.h
  
-      HAVE_4_ARG_DO_GENERIC_FILE_READ=''
+      HAVE_TASK_PTRACE=''
    fi
  
  
@@ -90871,24 +97060,22 @@
  
  
  
-@@ -46887,12 +34622,11 @@
- 
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 5-arg do_generic_file_read" >&5
-+$as_echo_n "checking kernel for 5-arg do_generic_file_read... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.ptracees" >&5
++$as_echo_n "checking kernel for task.ptracees... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 5-arg do_generic_file_read" >&5
--echo $ECHO_N "checking kernel for 5-arg do_generic_file_read... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for task.ptracees" >&5
+-echo $ECHO_N "checking kernel for task.ptracees... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_TASK_PTRACEES+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_PTRACEES+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -46903,11 +34637,7 @@
+@@ -51466,11 +38076,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -90901,7 +97088,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -46928,42 +34658,18 @@
+@@ -51488,42 +38094,18 @@
    return 0;
  }
  _ACEOF
@@ -90931,7 +97118,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ=yes
+ 	 cr_cv_kconfig_HAVE_TASK_PTRACEES=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -90940,30 +97127,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ=no
+ 	 cr_cv_kconfig_HAVE_TASK_PTRACEES=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -46971,23 +34677,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ
+@@ -51531,33 +38113,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACEES
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_5_ARG_DO_GENERIC_FILE_READ 1
+-#define HAVE_TASK_PTRACEES 1
 -_ACEOF
-+    $as_echo "#define HAVE_5_ARG_DO_GENERIC_FILE_READ 1" >>confdefs.h
++    $as_echo "#define HAVE_TASK_PTRACEES 1" >>confdefs.h
  
-      HAVE_5_ARG_DO_GENERIC_FILE_READ=1
+      HAVE_TASK_PTRACEES=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_5_ARG_DO_GENERIC_FILE_READ 0
+-#define HAVE_TASK_PTRACEES 0
 -_ACEOF
-+    $as_echo "#define HAVE_5_ARG_DO_GENERIC_FILE_READ 0" >>confdefs.h
++    $as_echo "#define HAVE_TASK_PTRACEES 0" >>confdefs.h
  
-      HAVE_5_ARG_DO_GENERIC_FILE_READ=''
+      HAVE_TASK_PTRACEES=''
    fi
  
  
@@ -90975,23 +97162,21 @@
  
  
  
-@@ -46995,11 +34696,11 @@
  
  
+-  echo "$as_me:$LINENO: checking kernel for task.ptraced" >&5
+-echo $ECHO_N "checking kernel for task.ptraced... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.ptraced" >&5
++$as_echo_n "checking kernel for task.ptraced... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for read_descriptor_t.arg.data" >&5
--echo $ECHO_N "checking kernel for read_descriptor_t.arg.data... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for read_descriptor_t.arg.data" >&5
-+$as_echo_n "checking kernel for read_descriptor_t.arg.data... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_TASK_PTRACED+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_TASK_PTRACED+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -47010,11 +34711,7 @@
+@@ -51568,11 +38145,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -91004,7 +97189,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -47032,42 +34729,18 @@
+@@ -51590,42 +38163,18 @@
    return 0;
  }
  _ACEOF
@@ -91034,7 +97219,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA=yes
+ 	 cr_cv_kconfig_HAVE_TASK_PTRACED=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -91043,30 +97228,30 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA=no
+ 	 cr_cv_kconfig_HAVE_TASK_PTRACED=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -47075,33 +34748,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA
+@@ -51633,33 +38182,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACED
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 1
+-#define HAVE_TASK_PTRACED 1
 -_ACEOF
-+    $as_echo "#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 1" >>confdefs.h
++    $as_echo "#define HAVE_TASK_PTRACED 1" >>confdefs.h
  
-      HAVE_READ_DESCRIPTOR_T_ARG_DATA=1
+      HAVE_TASK_PTRACED=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 0
+-#define HAVE_TASK_PTRACED 0
 -_ACEOF
-+    $as_echo "#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 0" >>confdefs.h
++    $as_echo "#define HAVE_TASK_PTRACED 0" >>confdefs.h
  
-      HAVE_READ_DESCRIPTOR_T_ARG_DATA=''
+      HAVE_TASK_PTRACED=''
    fi
  
  
@@ -91076,23 +97261,23 @@
 +$as_echo "$cr_result" >&6; }
  
  
+ if test -n "${HAVE_TASK_PTRACEES}"; then
  
  
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for read_descriptor_t.buf" >&5
-+$as_echo_n "checking kernel for read_descriptor_t.buf... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for read_descriptor_t.buf" >&5
--echo $ECHO_N "checking kernel for read_descriptor_t.buf... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for ptrace_utrace_ops" >&5
+-echo $ECHO_N "checking kernel symbol table for ptrace_utrace_ops... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for ptrace_utrace_ops" >&5
++$as_echo_n "checking kernel symbol table for ptrace_utrace_ops... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_ptrace_utrace_ops+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF+set}" = set; then :
++    if ${cr_cv_ksymtab_ptrace_utrace_ops+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -47112,11 +34780,7 @@
+     cr_cv_ksymtab_ptrace_utrace_ops=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ptrace_utrace_ops$/ {s/ .*//p;q;}"`
+@@ -51675,11 +38220,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -91105,7 +97290,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -47134,42 +34798,18 @@
+@@ -51699,42 +38240,18 @@
    return 0;
  }
  _ACEOF
@@ -91135,7 +97320,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF=yes
+ 	 cr_cv_ksymtab_ptrace_utrace_ops="Y$cr_cv_ksymtab_ptrace_utrace_ops"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -91144,41 +97329,31 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF=no
+ 	 cr_cv_ksymtab_ptrace_utrace_ops="N$cr_cv_ksymtab_ptrace_utrace_ops"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -47177,22 +34817,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_READ_DESCRIPTOR_T_BUF 1
--_ACEOF
-+    $as_echo "#define HAVE_READ_DESCRIPTOR_T_BUF 1" >>confdefs.h
- 
-      HAVE_READ_DESCRIPTOR_T_BUF=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_READ_DESCRIPTOR_T_BUF 0
--_ACEOF
-+    $as_echo "#define HAVE_READ_DESCRIPTOR_T_BUF 0" >>confdefs.h
+@@ -51764,13 +38281,11 @@
+ _ACEOF
  
-      HAVE_READ_DESCRIPTOR_T_BUF=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
- 
- if test "${HAVE_READ_DESCRIPTOR_T_ARG_DATA}${HAVE_READ_DESCRIPTOR_T_BUF}" != "1"; then
-@@ -47215,39 +34851,59 @@
+   if test -z "$cr_addr"; then
+-    { { echo "$as_me:$LINENO: error: failed to find symbol ptrace_utrace_ops" >&5
+-echo "$as_me: error: failed to find symbol ptrace_utrace_ops" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "failed to find symbol ptrace_utrace_ops" "$LINENO" 5
+   fi
+ fi
+ if test "${HAVE_TASK_PTRACE}${HAVE_TASK_PTRACEES}" != "1"; then
+@@ -51793,39 +38308,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -91241,14 +97416,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -91256,34 +97443,34 @@
    fi
  fi
  rm -f confcache
-@@ -47261,21 +34917,18 @@
+@@ -51839,21 +38385,18 @@
    echo "  Kernel running currently = `uname -r`"
    echo "======================================================================"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" >&2;}
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" "$LINENO" 5
++   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" "$LINENO" 5
  
  fi
  
  
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for splice_direct_to_actor" >&5
-+$as_echo_n "checking kernel for splice_direct_to_actor... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for proc_root" >&5
++$as_echo_n "checking kernel for proc_root... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for splice_direct_to_actor" >&5
--echo $ECHO_N "checking kernel for splice_direct_to_actor... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel for proc_root" >&5
+-echo $ECHO_N "checking kernel for proc_root... $ECHO_C" >&6
 -
--    if test "${cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR+set}" = set; then
+-    if test "${cr_cv_kconfig_HAVE_PROC_ROOT+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_PROC_ROOT+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
  
-@@ -47286,11 +34939,7 @@
+@@ -51864,11 +38407,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -91296,7 +97483,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -47316,42 +34965,18 @@
+@@ -51887,42 +38426,18 @@
    return 0;
  }
  _ACEOF
@@ -91326,7 +97513,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR=yes
+ 	 cr_cv_kconfig_HAVE_PROC_ROOT=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -91335,58 +97522,82 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR=no
+ 	 cr_cv_kconfig_HAVE_PROC_ROOT=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  fi
-@@ -47359,23 +34984,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR
+@@ -51930,31 +38445,27 @@
+   cr_result=$cr_cv_kconfig_HAVE_PROC_ROOT
  
    if test $cr_result = yes; then
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SPLICE_DIRECT_TO_ACTOR 1
+-#define HAVE_PROC_ROOT 1
 -_ACEOF
-+    $as_echo "#define HAVE_SPLICE_DIRECT_TO_ACTOR 1" >>confdefs.h
++    $as_echo "#define HAVE_PROC_ROOT 1" >>confdefs.h
  
-      HAVE_SPLICE_DIRECT_TO_ACTOR=1
+      HAVE_PROC_ROOT=1
    else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SPLICE_DIRECT_TO_ACTOR 0
+-#define HAVE_PROC_ROOT 0
 -_ACEOF
-+    $as_echo "#define HAVE_SPLICE_DIRECT_TO_ACTOR 0" >>confdefs.h
++    $as_echo "#define HAVE_PROC_ROOT 0" >>confdefs.h
  
-      HAVE_SPLICE_DIRECT_TO_ACTOR=''
+      HAVE_PROC_ROOT=''
    fi
  
  
 -  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
-@@ -47385,11 +35005,11 @@
+ # check kmalloc max size
+ 
+-    echo "$as_me:$LINENO: checking kernel for maximum kmalloc() allocation" >&5
+-echo $ECHO_N "checking kernel for maximum kmalloc() allocation... $ECHO_C" >&6
+-if test "${cr_cv_kconfig_kmalloc_max+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for maximum kmalloc() allocation" >&5
++$as_echo_n "checking kernel for maximum kmalloc() allocation... " >&6; }
++if ${cr_cv_kconfig_kmalloc_max+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+     cr_kmalloc_default="131072 (default)"
+@@ -51973,8 +38484,8 @@
+     fi
  
+ fi
+-echo "$as_me:$LINENO: result: $cr_cv_kconfig_kmalloc_max" >&5
+-echo "${ECHO_T}$cr_cv_kconfig_kmalloc_max" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_kconfig_kmalloc_max" >&5
++$as_echo "$cr_cv_kconfig_kmalloc_max" >&6; }
+   cr_kmalloc_max=`echo $cr_cv_kconfig_kmalloc_max | cut -d' ' -f1`
  
+ cat >>confdefs.h <<_ACEOF
+@@ -51988,12 +38499,12 @@
+ # DATA
  
--  echo "$as_me:$LINENO: checking kernel for 4-arg vfs_mknod" >&5
--echo $ECHO_N "checking kernel for 4-arg vfs_mknod... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg vfs_mknod" >&5
-+$as_echo_n "checking kernel for 4-arg vfs_mknod... " >&6; }
  
--    if test "${cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for tasklist_lock" >&5
+-echo $ECHO_N "checking kernel symbol table for tasklist_lock... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for tasklist_lock" >&5
++$as_echo_n "checking kernel symbol table for tasklist_lock... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_tasklist_lock+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD+set}" = set; then :
++    if ${cr_cv_ksymtab_tasklist_lock+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -47400,11 +35020,7 @@
+     cr_cv_ksymtab_tasklist_lock=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}tasklist_lock$/ {s/ .*//p;q;}"`
+@@ -52009,11 +38520,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -91399,7 +97610,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -47425,42 +35041,18 @@
+@@ -52033,42 +38540,18 @@
    return 0;
  }
  _ACEOF
@@ -91429,7 +97640,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD=yes
+ 	 cr_cv_ksymtab_tasklist_lock="Y$cr_cv_ksymtab_tasklist_lock"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -91438,58 +97649,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD=no
+ 	 cr_cv_ksymtab_tasklist_lock="N$cr_cv_ksymtab_tasklist_lock"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -47468,22 +35060,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_4_ARG_VFS_MKNOD 1
--_ACEOF
-+    $as_echo "#define HAVE_4_ARG_VFS_MKNOD 1" >>confdefs.h
- 
-      HAVE_4_ARG_VFS_MKNOD=1
+@@ -52079,9 +38562,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_4_ARG_VFS_MKNOD 0
--_ACEOF
-+    $as_echo "#define HAVE_4_ARG_VFS_MKNOD 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_tasklist_lock" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol tasklist_lock but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol tasklist_lock but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol tasklist_lock but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_tasklist_lock | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -52097,17 +38578,17 @@
+ _ACEOF
  
-      HAVE_4_ARG_VFS_MKNOD=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
-@@ -47493,12 +35081,11 @@
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 5-arg vfs_mknod" >&5
-+$as_echo_n "checking kernel for 5-arg vfs_mknod... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for 5-arg vfs_mknod" >&5
--echo $ECHO_N "checking kernel for 5-arg vfs_mknod... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for shmem_file_operations" >&5
+-echo $ECHO_N "checking kernel symbol table for shmem_file_operations... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for shmem_file_operations" >&5
++$as_echo_n "checking kernel symbol table for shmem_file_operations... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_shmem_file_operations+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD+set}" = set; then :
++    if ${cr_cv_ksymtab_shmem_file_operations+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -47509,11 +35096,7 @@
+     cr_cv_ksymtab_shmem_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}shmem_file_operations$/ {s/ .*//p;q;}"`
+@@ -52123,11 +38604,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -91502,7 +97704,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -47534,42 +35117,18 @@
+@@ -52147,42 +38624,18 @@
    return 0;
  }
  _ACEOF
@@ -91532,7 +97734,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD=yes
+ 	 cr_cv_ksymtab_shmem_file_operations="Y$cr_cv_ksymtab_shmem_file_operations"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -91541,147 +97743,204 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD=no
+ 	 cr_cv_ksymtab_shmem_file_operations="N$cr_cv_ksymtab_shmem_file_operations"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -47577,22 +35136,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD
+@@ -52212,17 +38665,17 @@
+ _ACEOF
  
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_5_ARG_VFS_MKNOD 1
--_ACEOF
-+    $as_echo "#define HAVE_5_ARG_VFS_MKNOD 1" >>confdefs.h
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
-      HAVE_5_ARG_VFS_MKNOD=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_5_ARG_VFS_MKNOD 0
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for ramfs_file_operations" >&5
+-echo $ECHO_N "checking kernel symbol table for ramfs_file_operations... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for ramfs_file_operations" >&5
++$as_echo_n "checking kernel symbol table for ramfs_file_operations... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_ramfs_file_operations+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_ramfs_file_operations+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+     cr_cv_ksymtab_ramfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ramfs_file_operations$/ {s/ .*//p;q;}"`
+@@ -52238,11 +38691,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 -_ACEOF
-+    $as_echo "#define HAVE_5_ARG_VFS_MKNOD 0" >>confdefs.h
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
-      HAVE_5_ARG_VFS_MKNOD=''
-   fi
+ 		 #include <linux/kernel.h>
+@@ -52262,42 +38711,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_ramfs_file_operations="Y$cr_cv_ksymtab_ramfs_file_operations"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_ramfs_file_operations="N$cr_cv_ksymtab_ramfs_file_operations"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+@@ -52327,17 +38752,17 @@
+ _ACEOF
+ 
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
-@@ -47617,39 +35172,59 @@
+-  echo "$as_me:$LINENO: checking kernel symbol table for HPAGE_SHIFT" >&5
+-echo $ECHO_N "checking kernel symbol table for HPAGE_SHIFT... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for HPAGE_SHIFT" >&5
++$as_echo_n "checking kernel symbol table for HPAGE_SHIFT... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_HPAGE_SHIFT+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_HPAGE_SHIFT+:} false; then :
++  $as_echo_n "(cached) " >&6
+ else
  
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
+     cr_cv_ksymtab_HPAGE_SHIFT=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}HPAGE_SHIFT$/ {s/ .*//p;q;}"`
+@@ -52353,11 +38778,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -52377,42 +38798,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
++if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_HPAGE_SHIFT="Y$cr_cv_ksymtab_HPAGE_SHIFT"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
++  CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_HPAGE_SHIFT="N$cr_cv_ksymtab_HPAGE_SHIFT"
  fi
- rm -f confcache
-@@ -47663,9 +35238,7 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" "$LINENO" 5
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
- fi
+     fi
  
-@@ -47675,12 +35248,11 @@
+@@ -52442,17 +38839,17 @@
+ _ACEOF
  
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++$as_echo "$cr_result" >&6; }
  
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg vfs_unlink" >&5
-+$as_echo_n "checking kernel for 2-arg vfs_unlink... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for 2-arg vfs_unlink" >&5
--echo $ECHO_N "checking kernel for 2-arg vfs_unlink... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for phys_base" >&5
+-echo $ECHO_N "checking kernel symbol table for phys_base... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for phys_base" >&5
++$as_echo_n "checking kernel symbol table for phys_base... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_phys_base+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK+set}" = set; then :
++    if ${cr_cv_ksymtab_phys_base+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -47691,11 +35263,7 @@
+     cr_cv_ksymtab_phys_base=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}phys_base$/ {s/ .*//p;q;}"`
+@@ -52468,11 +38865,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -91694,7 +97953,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -47716,42 +35284,18 @@
+@@ -52492,42 +38885,18 @@
    return 0;
  }
  _ACEOF
@@ -91724,7 +97983,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK=yes
+ 	 cr_cv_ksymtab_phys_base="Y$cr_cv_ksymtab_phys_base"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -91733,58 +97992,40 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK=no
+ 	 cr_cv_ksymtab_phys_base="N$cr_cv_ksymtab_phys_base"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -47759,23 +35303,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_ARG_VFS_UNLINK 1
--_ACEOF
-+    $as_echo "#define HAVE_2_ARG_VFS_UNLINK 1" >>confdefs.h
- 
-      HAVE_2_ARG_VFS_UNLINK=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_ARG_VFS_UNLINK 0
--_ACEOF
-+    $as_echo "#define HAVE_2_ARG_VFS_UNLINK 0" >>confdefs.h
+@@ -52557,19 +38926,19 @@
+ _ACEOF
  
-      HAVE_2_ARG_VFS_UNLINK=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ # CODE
  
-@@ -47785,11 +35324,11 @@
  
- 
- 
--  echo "$as_me:$LINENO: checking kernel for 3-arg vfs_unlink" >&5
--echo $ECHO_N "checking kernel for 3-arg vfs_unlink... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg vfs_unlink" >&5
-+$as_echo_n "checking kernel for 3-arg vfs_unlink... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for do_pipe" >&5
+-echo $ECHO_N "checking kernel symbol table for do_pipe... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_pipe" >&5
++$as_echo_n "checking kernel symbol table for do_pipe... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_do_pipe+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK+set}" = set; then :
++    if ${cr_cv_ksymtab_do_pipe+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -47800,11 +35339,7 @@
+     cr_cv_ksymtab_do_pipe=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe$/ {s/ .*//p;q;}"`
+@@ -52585,11 +38954,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -91797,7 +98038,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -47825,42 +35360,18 @@
+@@ -52609,42 +38974,18 @@
    return 0;
  }
  _ACEOF
@@ -91827,7 +98068,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK=yes
+ 	 cr_cv_ksymtab_do_pipe="Y$cr_cv_ksymtab_do_pipe"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -91836,147 +98077,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK=no
+ 	 cr_cv_ksymtab_do_pipe="N$cr_cv_ksymtab_do_pipe"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -47868,22 +35379,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_3_ARG_VFS_UNLINK 1
--_ACEOF
-+    $as_echo "#define HAVE_3_ARG_VFS_UNLINK 1" >>confdefs.h
- 
-      HAVE_3_ARG_VFS_UNLINK=1
+@@ -52655,9 +38996,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_3_ARG_VFS_UNLINK 0
--_ACEOF
-+    $as_echo "#define HAVE_3_ARG_VFS_UNLINK 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_do_pipe" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol do_pipe but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol do_pipe but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol do_pipe but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_do_pipe | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -52673,17 +39012,17 @@
+ _ACEOF
  
-      HAVE_3_ARG_VFS_UNLINK=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
-@@ -47908,39 +35415,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -47954,9 +35481,7 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" "$LINENO" 5
- 
- fi
- 
-@@ -47966,12 +35491,11 @@
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg notify_change" >&5
-+$as_echo_n "checking kernel for 2-arg notify_change... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for 2-arg notify_change" >&5
--echo $ECHO_N "checking kernel for 2-arg notify_change... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for do_pipe_flags" >&5
+-echo $ECHO_N "checking kernel symbol table for do_pipe_flags... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_pipe_flags" >&5
++$as_echo_n "checking kernel symbol table for do_pipe_flags... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_do_pipe_flags+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE+set}" = set; then :
++    if ${cr_cv_ksymtab_do_pipe_flags+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -47982,11 +35506,7 @@
+     cr_cv_ksymtab_do_pipe_flags=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe_flags$/ {s/ .*//p;q;}"`
+@@ -52699,11 +39038,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -91989,7 +98132,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -48007,42 +35527,18 @@
+@@ -52723,42 +39058,18 @@
    return 0;
  }
  _ACEOF
@@ -92019,7 +98162,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE=yes
+ 	 cr_cv_ksymtab_do_pipe_flags="Y$cr_cv_ksymtab_do_pipe_flags"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -92028,58 +98171,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE=no
+ 	 cr_cv_ksymtab_do_pipe_flags="N$cr_cv_ksymtab_do_pipe_flags"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -48050,22 +35546,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_ARG_NOTIFY_CHANGE 1
--_ACEOF
-+    $as_echo "#define HAVE_2_ARG_NOTIFY_CHANGE 1" >>confdefs.h
- 
-      HAVE_2_ARG_NOTIFY_CHANGE=1
+@@ -52769,9 +39080,7 @@
+     cr_result='not found'
    else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_2_ARG_NOTIFY_CHANGE 0
--_ACEOF
-+    $as_echo "#define HAVE_2_ARG_NOTIFY_CHANGE 0" >>confdefs.h
+     if expr "$cr_cv_ksymtab_do_pipe_flags" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol do_pipe_flags but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol do_pipe_flags but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol do_pipe_flags but no declaration -- please file a bug report." "$LINENO" 5
+     fi
+     cr_result=`echo $cr_cv_ksymtab_do_pipe_flags | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -52787,17 +39096,17 @@
+ _ACEOF
  
-      HAVE_2_ARG_NOTIFY_CHANGE=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
-@@ -48075,12 +35567,11 @@
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg notify_change" >&5
-+$as_echo_n "checking kernel for 3-arg notify_change... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for 3-arg notify_change" >&5
--echo $ECHO_N "checking kernel for 3-arg notify_change... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_munmap" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_munmap... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_munmap" >&5
++$as_echo_n "checking kernel symbol table for sys_munmap... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_sys_munmap+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE+set}" = set; then :
++    if ${cr_cv_ksymtab_sys_munmap+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -48091,11 +35582,7 @@
+     cr_cv_ksymtab_sys_munmap=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_munmap$/ {s/ .*//p;q;}"`
+@@ -52813,11 +39122,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -92092,7 +98226,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -48116,42 +35603,18 @@
+@@ -52837,42 +39142,18 @@
    return 0;
  }
  _ACEOF
@@ -92122,7 +98256,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE=yes
+ 	 cr_cv_ksymtab_sys_munmap="Y$cr_cv_ksymtab_sys_munmap"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -92131,146 +98265,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE=no
+ 	 cr_cv_ksymtab_sys_munmap="N$cr_cv_ksymtab_sys_munmap"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -48159,22 +35622,18 @@
-   cr_result=$cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_3_ARG_NOTIFY_CHANGE 1
--_ACEOF
-+    $as_echo "#define HAVE_3_ARG_NOTIFY_CHANGE 1" >>confdefs.h
- 
-      HAVE_3_ARG_NOTIFY_CHANGE=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_3_ARG_NOTIFY_CHANGE 0
--_ACEOF
-+    $as_echo "#define HAVE_3_ARG_NOTIFY_CHANGE 0" >>confdefs.h
+@@ -52902,17 +39183,17 @@
+ _ACEOF
  
-      HAVE_3_ARG_NOTIFY_CHANGE=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
-@@ -48199,39 +35658,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -48245,21 +35724,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" "$LINENO" 5
- 
- fi
- 
- 
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.ptrace" >&5
-+$as_echo_n "checking kernel for task.ptrace... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for task.ptrace" >&5
--echo $ECHO_N "checking kernel for task.ptrace... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_TASK_PTRACE+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_dup2" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_dup2... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_dup2" >&5
++$as_echo_n "checking kernel symbol table for sys_dup2... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_sys_dup2+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_PTRACE+set}" = set; then :
++    if ${cr_cv_ksymtab_sys_dup2+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -48270,11 +35746,7 @@
+     cr_cv_ksymtab_sys_dup2=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_dup2$/ {s/ .*//p;q;}"`
+@@ -52928,11 +39209,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -92283,7 +98309,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -48292,42 +35764,18 @@
+@@ -52952,42 +39229,18 @@
    return 0;
  }
  _ACEOF
@@ -92313,7 +98339,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PTRACE=yes
+ 	 cr_cv_ksymtab_sys_dup2="Y$cr_cv_ksymtab_sys_dup2"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -92322,56 +98348,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PTRACE=no
+ 	 cr_cv_ksymtab_sys_dup2="N$cr_cv_ksymtab_sys_dup2"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -48335,33 +35783,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACE
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PTRACE 1
--_ACEOF
-+    $as_echo "#define HAVE_TASK_PTRACE 1" >>confdefs.h
- 
-      HAVE_TASK_PTRACE=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PTRACE 0
--_ACEOF
-+    $as_echo "#define HAVE_TASK_PTRACE 0" >>confdefs.h
+@@ -53017,17 +39270,17 @@
+ _ACEOF
  
-      HAVE_TASK_PTRACE=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
--  echo "$as_me:$LINENO: checking kernel for task.ptracees" >&5
--echo $ECHO_N "checking kernel for task.ptracees... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.ptracees" >&5
-+$as_echo_n "checking kernel for task.ptracees... " >&6; }
- 
--    if test "${cr_cv_kconfig_HAVE_TASK_PTRACEES+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_lseek" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_lseek... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_lseek" >&5
++$as_echo_n "checking kernel symbol table for sys_lseek... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_sys_lseek+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_PTRACEES+set}" = set; then :
++    if ${cr_cv_ksymtab_sys_lseek+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -48372,11 +35815,7 @@
+     cr_cv_ksymtab_sys_lseek=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_lseek$/ {s/ .*//p;q;}"`
+@@ -53043,11 +39296,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -92384,7 +98392,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -48394,42 +35833,18 @@
+@@ -53067,42 +39316,18 @@
    return 0;
  }
  _ACEOF
@@ -92414,7 +98422,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PTRACEES=yes
+ 	 cr_cv_ksymtab_sys_lseek="Y$cr_cv_ksymtab_sys_lseek"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -92423,56 +98431,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PTRACEES=no
+ 	 cr_cv_ksymtab_sys_lseek="N$cr_cv_ksymtab_sys_lseek"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -48437,33 +35852,28 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACEES
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PTRACEES 1
--_ACEOF
-+    $as_echo "#define HAVE_TASK_PTRACEES 1" >>confdefs.h
- 
-      HAVE_TASK_PTRACEES=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PTRACEES 0
--_ACEOF
-+    $as_echo "#define HAVE_TASK_PTRACEES 0" >>confdefs.h
+@@ -53132,17 +39357,17 @@
+ _ACEOF
  
-      HAVE_TASK_PTRACEES=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- 
- 
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.ptraced" >&5
-+$as_echo_n "checking kernel for task.ptraced... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel for task.ptraced" >&5
--echo $ECHO_N "checking kernel for task.ptraced... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_TASK_PTRACED+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_ftruncate" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_ftruncate... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_ftruncate" >&5
++$as_echo_n "checking kernel symbol table for sys_ftruncate... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_sys_ftruncate+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_TASK_PTRACED+set}" = set; then :
++    if ${cr_cv_ksymtab_sys_ftruncate+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -48474,11 +35884,7 @@
+     cr_cv_ksymtab_sys_ftruncate=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_ftruncate$/ {s/ .*//p;q;}"`
+@@ -53158,11 +39383,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -92485,7 +98475,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -48496,42 +35902,18 @@
+@@ -53182,42 +39403,18 @@
    return 0;
  }
  _ACEOF
@@ -92515,65 +98505,47 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PTRACED=yes
+ 	 cr_cv_ksymtab_sys_ftruncate="Y$cr_cv_ksymtab_sys_ftruncate"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -CC=$SAVE_CC
 +  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_TASK_PTRACED=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
- fi
-@@ -48539,33 +35921,29 @@
-   cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACED
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PTRACED 1
--_ACEOF
-+    $as_echo "#define HAVE_TASK_PTRACED 1" >>confdefs.h
- 
-      HAVE_TASK_PTRACED=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_TASK_PTRACED 0
--_ACEOF
-+    $as_echo "#define HAVE_TASK_PTRACED 0" >>confdefs.h
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_sys_ftruncate="N$cr_cv_ksymtab_sys_ftruncate"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-      HAVE_TASK_PTRACED=''
-   fi
+     fi
  
+@@ -53247,17 +39444,17 @@
+ _ACEOF
  
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
- if test -n "${HAVE_TASK_PTRACEES}"; then
- 
  
--  echo "$as_me:$LINENO: checking kernel symbol table for ptrace_utrace_ops" >&5
--echo $ECHO_N "checking kernel symbol table for ptrace_utrace_ops... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for ptrace_utrace_ops" >&5
-+$as_echo_n "checking kernel symbol table for ptrace_utrace_ops... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_mprotect" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_mprotect... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_mprotect" >&5
++$as_echo_n "checking kernel symbol table for sys_mprotect... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_ptrace_utrace_ops+set}" = set; then
+-    if test "${cr_cv_ksymtab_sys_mprotect+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_ptrace_utrace_ops+set}" = set; then :
++    if ${cr_cv_ksymtab_sys_mprotect+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_ptrace_utrace_ops=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ptrace_utrace_ops$/ {s/ .*//p;q;}"`
-@@ -48581,11 +35959,7 @@
+     cr_cv_ksymtab_sys_mprotect=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_mprotect$/ {s/ .*//p;q;}"`
+@@ -53273,11 +39470,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -92586,7 +98558,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -48605,42 +35979,18 @@
+@@ -53297,42 +39490,18 @@
    return 0;
  }
  _ACEOF
@@ -92616,7 +98588,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_ptrace_utrace_ops="Y$cr_cv_ksymtab_ptrace_utrace_ops"
+ 	 cr_cv_ksymtab_sys_mprotect="Y$cr_cv_ksymtab_sys_mprotect"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -92625,14 +98597,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_ksymtab_ptrace_utrace_ops="N$cr_cv_ksymtab_ptrace_utrace_ops"
+ 	 cr_cv_ksymtab_sys_mprotect="N$cr_cv_ksymtab_sys_mprotect"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
-@@ -48670,13 +36020,11 @@
+@@ -53362,17 +39531,17 @@
  _ACEOF
  
    fi
@@ -92641,120 +98613,22 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
-   if test -z "$cr_addr"; then
--    { { echo "$as_me:$LINENO: error: failed to find symbol ptrace_utrace_ops" >&5
--echo "$as_me: error: failed to find symbol ptrace_utrace_ops" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error $? "failed to find symbol ptrace_utrace_ops" "$LINENO" 5
-   fi
- fi
- if test "${HAVE_TASK_PTRACE}${HAVE_TASK_PTRACEES}" != "1"; then
-@@ -48699,39 +36047,59 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -48745,21 +36113,18 @@
-   echo "  Kernel running currently = `uname -r`"
-   echo "======================================================================"
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" "$LINENO" 5
- 
- fi
- 
- 
- 
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for proc_root" >&5
-+$as_echo_n "checking kernel for proc_root... " >&6; }
  
--  echo "$as_me:$LINENO: checking kernel for proc_root" >&5
--echo $ECHO_N "checking kernel for proc_root... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_PROC_ROOT+set}" = set; then
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_setitimer" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_setitimer... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_setitimer" >&5
++$as_echo_n "checking kernel symbol table for sys_setitimer... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_sys_setitimer+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_PROC_ROOT+set}" = set; then :
++    if ${cr_cv_ksymtab_sys_setitimer+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
- 
-@@ -48770,11 +36135,7 @@
+     cr_cv_ksymtab_sys_setitimer=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setitimer$/ {s/ .*//p;q;}"`
+@@ -53388,11 +39557,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -92767,7 +98641,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -48793,42 +36154,18 @@
+@@ -53412,42 +39577,18 @@
    return 0;
  }
  _ACEOF
@@ -92797,7 +98671,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PROC_ROOT=yes
+ 	 cr_cv_ksymtab_sys_setitimer="Y$cr_cv_ksymtab_sys_setitimer"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -92806,90 +98680,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
- 	 cr_cv_kconfig_HAVE_PROC_ROOT=no
+ 	 cr_cv_ksymtab_sys_setitimer="N$cr_cv_ksymtab_sys_setitimer"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+     fi
  
- fi
-@@ -48836,36 +36173,34 @@
-   cr_result=$cr_cv_kconfig_HAVE_PROC_ROOT
- 
-   if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PROC_ROOT 1
--_ACEOF
-+    $as_echo "#define HAVE_PROC_ROOT 1" >>confdefs.h
- 
-      HAVE_PROC_ROOT=1
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PROC_ROOT 0
--_ACEOF
-+    $as_echo "#define HAVE_PROC_ROOT 0" >>confdefs.h
+@@ -53477,17 +39618,17 @@
+ _ACEOF
  
-      HAVE_PROC_ROOT=''
    fi
- 
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
- # check kmalloc max size
- 
--    echo "$as_me:$LINENO: checking kernel for maximum kmalloc() allocation" >&5
--echo $ECHO_N "checking kernel for maximum kmalloc() allocation... $ECHO_C" >&6
--if test "${cr_cv_kconfig_kmalloc_max+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for maximum kmalloc() allocation" >&5
-+$as_echo_n "checking kernel for maximum kmalloc() allocation... " >&6; }
-+if test "${cr_cv_kconfig_kmalloc_max+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
- 
-     cr_kmalloc_default="131072 (default)"
-+    cr_header="${LINUX_OBJ}/include/generated/autoconf.h"
-+    test -e "$cr_header" || cr_header="${LINUX_OBJ}/include/linux/autoconf.h"
-     cr_cv_kconfig_kmalloc_max=`eval "$CPP $CPPFLAGS -I${LINUX_OBJ}/include \
--			-include ${LINUX_OBJ}/include/linux/autoconf.h\
-+			-include ${cr_header} \
- 			${LINUX_OBJ}/include/linux/kmalloc_sizes.h" 2>/dev/null | \
- 		$PERL -n -e 'BEGIN {$max=0;}' \
- 			 -e 'if (/CACHE\s*\(\s*([0-9]+)\s*\)/ && ($1 > $max)) { $max = $1; }' \
-@@ -48877,8 +36212,8 @@
-     fi
- 
- fi
--echo "$as_me:$LINENO: result: $cr_cv_kconfig_kmalloc_max" >&5
--echo "${ECHO_T}$cr_cv_kconfig_kmalloc_max" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_kconfig_kmalloc_max" >&5
-+$as_echo "$cr_cv_kconfig_kmalloc_max" >&6; }
-   cr_kmalloc_max=`echo $cr_cv_kconfig_kmalloc_max | cut -d' ' -f1`
- 
- cat >>confdefs.h <<_ACEOF
-@@ -48892,12 +36227,12 @@
- # DATA
- 
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for tasklist_lock" >&5
--echo $ECHO_N "checking kernel symbol table for tasklist_lock... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for tasklist_lock" >&5
-+$as_echo_n "checking kernel symbol table for tasklist_lock... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_prctl" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_prctl... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_prctl" >&5
++$as_echo_n "checking kernel symbol table for sys_prctl... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_tasklist_lock+set}" = set; then
+-    if test "${cr_cv_ksymtab_sys_prctl+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_tasklist_lock+set}" = set; then :
++    if ${cr_cv_ksymtab_sys_prctl+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-     cr_cv_ksymtab_tasklist_lock=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}tasklist_lock$/ {s/ .*//p;q;}"`
-@@ -48913,11 +36248,525 @@
+     cr_cv_ksymtab_sys_prctl=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_prctl$/ {s/ .*//p;q;}"`
+@@ -53503,11 +39644,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -92897,536 +98719,96 @@
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
-+int
-+main ()
-+{
-+int x = sizeof(&tasklist_lock);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_tasklist_lock="Y$cr_cv_ksymtab_tasklist_lock"
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_tasklist_lock="N$cr_cv_ksymtab_tasklist_lock"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+    fi
-+
-+fi
-+
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_tasklist_lock"; then
-+    cr_result='not found'
-+  else
-+    if expr "$cr_cv_ksymtab_tasklist_lock" : N >/dev/null; then
-+      as_fn_error $? "Found symbol tasklist_lock but no declaration -- please file a bug report." "$LINENO" 5
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_tasklist_lock | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KDATA(tasklist_lock, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KDATA_tasklist_lock $cr_addr
-+_ACEOF
-+
-+  fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for shmem_file_operations" >&5
-+$as_echo_n "checking kernel symbol table for shmem_file_operations... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_shmem_file_operations+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    cr_cv_ksymtab_shmem_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}shmem_file_operations$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_shmem_file_operations"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_shmem_file_operations\$" >/dev/null ; then
-+        cr_cv_ksymtab_shmem_file_operations=0
-+      fi
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
-+int
-+main ()
-+{
-+int x = sizeof(&shmem_file_operations);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_shmem_file_operations="Y$cr_cv_ksymtab_shmem_file_operations"
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_shmem_file_operations="N$cr_cv_ksymtab_shmem_file_operations"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+    fi
-+
-+fi
-+
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_shmem_file_operations"; then
-+    cr_result='not found'
-+  else
-+    if expr "$cr_cv_ksymtab_shmem_file_operations" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern const struct file_operations shmem_file_operations;
-+_EOF
-+
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_shmem_file_operations | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KDATA(shmem_file_operations, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KDATA_shmem_file_operations $cr_addr
-+_ACEOF
-+
-+  fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for ramfs_file_operations" >&5
-+$as_echo_n "checking kernel symbol table for ramfs_file_operations... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_ramfs_file_operations+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    cr_cv_ksymtab_ramfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ramfs_file_operations$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_ramfs_file_operations"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_ramfs_file_operations\$" >/dev/null ; then
-+        cr_cv_ksymtab_ramfs_file_operations=0
-+      fi
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
-+int
-+main ()
-+{
-+int x = sizeof(&ramfs_file_operations);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_ramfs_file_operations="Y$cr_cv_ksymtab_ramfs_file_operations"
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_ramfs_file_operations="N$cr_cv_ksymtab_ramfs_file_operations"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+    fi
-+
-+fi
-+
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_ramfs_file_operations"; then
-+    cr_result='not found'
-+  else
-+    if expr "$cr_cv_ksymtab_ramfs_file_operations" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern const struct file_operations ramfs_file_operations;
-+_EOF
-+
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_ramfs_file_operations | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KDATA(ramfs_file_operations, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KDATA_ramfs_file_operations $cr_addr
-+_ACEOF
-+
-+  fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for HPAGE_SHIFT" >&5
-+$as_echo_n "checking kernel symbol table for HPAGE_SHIFT... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_HPAGE_SHIFT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    cr_cv_ksymtab_HPAGE_SHIFT=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}HPAGE_SHIFT$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_HPAGE_SHIFT"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_HPAGE_SHIFT\$" >/dev/null ; then
-+        cr_cv_ksymtab_HPAGE_SHIFT=0
-+      fi
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
-+int
-+main ()
-+{
-+int x = sizeof(&HPAGE_SHIFT);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_HPAGE_SHIFT="Y$cr_cv_ksymtab_HPAGE_SHIFT"
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_HPAGE_SHIFT="N$cr_cv_ksymtab_HPAGE_SHIFT"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+    fi
-+
-+fi
-+
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_HPAGE_SHIFT"; then
-+    cr_result='not found'
-+  else
-+    if expr "$cr_cv_ksymtab_HPAGE_SHIFT" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern unsigned int HPAGE_SHIFT;
-+_EOF
-+
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_HPAGE_SHIFT | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KDATA(HPAGE_SHIFT, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KDATA_HPAGE_SHIFT $cr_addr
-+_ACEOF
-+
-+  fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for phys_base" >&5
-+$as_echo_n "checking kernel symbol table for phys_base... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_phys_base+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    cr_cv_ksymtab_phys_base=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}phys_base$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_phys_base"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_phys_base\$" >/dev/null ; then
-+        cr_cv_ksymtab_phys_base=0
-+      fi
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
-+int
-+main ()
-+{
-+int x = sizeof(&phys_base);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_phys_base="Y$cr_cv_ksymtab_phys_base"
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_phys_base="N$cr_cv_ksymtab_phys_base"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+    fi
-+
-+fi
-+
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_phys_base"; then
-+    cr_result='not found'
-+  else
-+    if expr "$cr_cv_ksymtab_phys_base" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern unsigned long phys_base;
-+_EOF
-+
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_phys_base | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KDATA(phys_base, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KDATA_phys_base $cr_addr
-+_ACEOF
-+
-+  fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
-+$as_echo "$cr_result" >&6; }
-+
-+
-+# CODE
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_pipe" >&5
-+$as_echo_n "checking kernel symbol table for do_pipe... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_do_pipe+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    cr_cv_ksymtab_do_pipe=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_do_pipe"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_pipe\$" >/dev/null ; then
-+        cr_cv_ksymtab_do_pipe=0
-+      fi
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		 #include <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
-+int
-+main ()
-+{
-+int x = sizeof(&do_pipe);
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 		 #include <linux/kernel.h>
+@@ -53527,42 +39664,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
 +if ac_fn_c_try_compile "$LINENO"; then :
+   CC=$SAVE_CC
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_sys_prctl="Y$cr_cv_ksymtab_sys_prctl"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CC=$SAVE_CC
 +  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_do_pipe="Y$cr_cv_ksymtab_do_pipe"
-+else
-+  CC=$SAVE_CC
-+	 CFLAGS=$SAVE_CFLAGS
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_do_pipe="N$cr_cv_ksymtab_do_pipe"
-+fi
+ 	 CFLAGS=$SAVE_CFLAGS
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_sys_prctl="N$cr_cv_ksymtab_sys_prctl"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+    fi
-+
-+fi
-+
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_do_pipe"; then
-+    cr_result='not found'
-+  else
-+    if expr "$cr_cv_ksymtab_do_pipe" : N >/dev/null; then
-+      as_fn_error $? "Found symbol do_pipe but no declaration -- please file a bug report." "$LINENO" 5
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_do_pipe | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KCODE(do_pipe, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KCODE_do_pipe $cr_addr
-+_ACEOF
-+
-+  fi
+ 
+     fi
+ 
+@@ -53592,18 +39705,18 @@
+ _ACEOF
+ 
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_pipe_flags" >&5
-+$as_echo_n "checking kernel symbol table for do_pipe_flags... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_do_pipe_flags+set}" = set; then :
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for copy_fs_struct" >&5
+-echo $ECHO_N "checking kernel symbol table for copy_fs_struct... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for copy_fs_struct" >&5
++$as_echo_n "checking kernel symbol table for copy_fs_struct... " >&6; }
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_copy_fs_struct+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_copy_fs_struct+:} false; then :
 +  $as_echo_n "(cached) " >&6
-+else
-+
-+    cr_cv_ksymtab_do_pipe_flags=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe_flags$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_do_pipe_flags"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_pipe_flags\$" >/dev/null ; then
-+        cr_cv_ksymtab_do_pipe_flags=0
-+      fi
-+
-+
-+  SAVE_CC=$CC
-+  SAVE_CFLAGS=$CFLAGS
-+  SAVE_CPPFLAGS=$CPPFLAGS
-+  CC=$KCC
-+  CFLAGS=""
-+  CPPFLAGS="$KCFLAGS"
+ else
+ 
+     cr_cv_ksymtab_copy_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_fs_struct$/ {s/ .*//p;q;}"`
+@@ -53619,11 +39732,7 @@
+   CC=$KCC
+   CFLAGS=""
+   CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -48932,92 +36781,66 @@
- int
- main ()
- {
--int x = sizeof(&tasklist_lock);
-+int x = sizeof(&do_pipe_flags);
-   ;
+@@ -53643,42 +39752,18 @@
    return 0;
  }
  _ACEOF
@@ -93456,8 +98838,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_tasklist_lock="Y$cr_cv_ksymtab_tasklist_lock"
-+	 cr_cv_ksymtab_do_pipe_flags="Y$cr_cv_ksymtab_do_pipe_flags"
+ 	 cr_cv_ksymtab_copy_fs_struct="Y$cr_cv_ksymtab_copy_fs_struct"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -93466,42 +98847,25 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_tasklist_lock="N$cr_cv_ksymtab_tasklist_lock"
-+	 cr_cv_ksymtab_do_pipe_flags="N$cr_cv_ksymtab_do_pipe_flags"
+ 	 cr_cv_ksymtab_copy_fs_struct="N$cr_cv_ksymtab_copy_fs_struct"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_tasklist_lock"; then
-+  if test -z "$cr_cv_ksymtab_do_pipe_flags"; then
+@@ -53689,9 +39774,7 @@
      cr_result='not found'
    else
--    if expr "$cr_cv_ksymtab_tasklist_lock" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol tasklist_lock but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol tasklist_lock but no declaration -- please file a bug report." >&2;}
+     if expr "$cr_cv_ksymtab_copy_fs_struct" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol copy_fs_struct but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol copy_fs_struct but no declaration -- please file a bug report." >&2;}
 -   { (exit 1); exit 1; }; }
-+    if expr "$cr_cv_ksymtab_do_pipe_flags" : N >/dev/null; then
-+      as_fn_error $? "Found symbol do_pipe_flags but no declaration -- please file a bug report." "$LINENO" 5
++      as_fn_error $? "Found symbol copy_fs_struct but no declaration -- please file a bug report." "$LINENO" 5
      fi
--    cr_result=`echo $cr_cv_ksymtab_tasklist_lock | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_do_pipe_flags | tr -d 'YN'`
+     cr_result=`echo $cr_cv_ksymtab_copy_fs_struct | tr -d 'YN'`
      if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KDATA(tasklist_lock, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(do_pipe_flags, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KDATA_tasklist_lock $cr_addr
-+#define CR_KCODE_do_pipe_flags $cr_addr
+@@ -53707,17 +39790,17 @@
  _ACEOF
  
    fi
@@ -93512,30 +98876,20 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for shmem_file_operations" >&5
--echo $ECHO_N "checking kernel symbol table for shmem_file_operations... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_munmap" >&5
-+$as_echo_n "checking kernel symbol table for sys_munmap... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for put_fs_struct" >&5
+-echo $ECHO_N "checking kernel symbol table for put_fs_struct... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for put_fs_struct" >&5
++$as_echo_n "checking kernel symbol table for put_fs_struct... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_shmem_file_operations+set}" = set; then
+-    if test "${cr_cv_ksymtab_put_fs_struct+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_sys_munmap+set}" = set; then :
++    if ${cr_cv_ksymtab_put_fs_struct+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_shmem_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}shmem_file_operations$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_shmem_file_operations"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_shmem_file_operations\$" >/dev/null ; then
--        cr_cv_ksymtab_shmem_file_operations=0
-+    cr_cv_ksymtab_sys_munmap=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_munmap$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_munmap"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_munmap\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_munmap=0
-       fi
- 
- 
-@@ -49027,11 +36850,7 @@
+     cr_cv_ksymtab_put_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}put_fs_struct$/ {s/ .*//p;q;}"`
+@@ -53733,11 +39816,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -93548,13 +98902,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -49046,93 +36865,69 @@
- int
- main ()
- {
--int x = sizeof(&shmem_file_operations);
-+int x = sizeof(&sys_munmap);
-   ;
+@@ -53757,42 +39836,18 @@
    return 0;
  }
  _ACEOF
@@ -93584,8 +98932,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_shmem_file_operations="Y$cr_cv_ksymtab_shmem_file_operations"
-+	 cr_cv_ksymtab_sys_munmap="Y$cr_cv_ksymtab_sys_munmap"
+ 	 cr_cv_ksymtab_put_fs_struct="Y$cr_cv_ksymtab_put_fs_struct"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -93594,43 +98941,25 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_shmem_file_operations="N$cr_cv_ksymtab_shmem_file_operations"
-+	 cr_cv_ksymtab_sys_munmap="N$cr_cv_ksymtab_sys_munmap"
+ 	 cr_cv_ksymtab_put_fs_struct="N$cr_cv_ksymtab_put_fs_struct"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_shmem_file_operations"; then
-+  if test -z "$cr_cv_ksymtab_sys_munmap"; then
+@@ -53803,9 +39858,7 @@
      cr_result='not found'
    else
--    if expr "$cr_cv_ksymtab_shmem_file_operations" : N >/dev/null; then
-+    if expr "$cr_cv_ksymtab_sys_munmap" : N >/dev/null; then
-       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern const struct file_operations shmem_file_operations;
-+extern asmlinkage long sys_munmap(unsigned long addr, size_t len);
- _EOF
- 
+     if expr "$cr_cv_ksymtab_put_fs_struct" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol put_fs_struct but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol put_fs_struct but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol put_fs_struct but no declaration -- please file a bug report." "$LINENO" 5
      fi
--    cr_result=`echo $cr_cv_ksymtab_shmem_file_operations | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_sys_munmap | tr -d 'YN'`
+     cr_result=`echo $cr_cv_ksymtab_put_fs_struct | tr -d 'YN'`
      if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KDATA(shmem_file_operations, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(sys_munmap, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KDATA_shmem_file_operations $cr_addr
-+#define CR_KCODE_sys_munmap $cr_addr
+@@ -53821,18 +39874,18 @@
  _ACEOF
  
    fi
@@ -93639,32 +98968,23 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+ if test -z "$cr_addr"; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for ramfs_file_operations" >&5
--echo $ECHO_N "checking kernel symbol table for ramfs_file_operations... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_dup2" >&5
-+$as_echo_n "checking kernel symbol table for sys_dup2... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for free_fs_struct" >&5
+-echo $ECHO_N "checking kernel symbol table for free_fs_struct... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for free_fs_struct" >&5
++$as_echo_n "checking kernel symbol table for free_fs_struct... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_ramfs_file_operations+set}" = set; then
+-    if test "${cr_cv_ksymtab_free_fs_struct+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_sys_dup2+set}" = set; then :
++    if ${cr_cv_ksymtab_free_fs_struct+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_ramfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ramfs_file_operations$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_ramfs_file_operations"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_ramfs_file_operations\$" >/dev/null ; then
--        cr_cv_ksymtab_ramfs_file_operations=0
-+    cr_cv_ksymtab_sys_dup2=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_dup2$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_dup2"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_dup2\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_dup2=0
-       fi
- 
- 
-@@ -49142,11 +36937,7 @@
+     cr_cv_ksymtab_free_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_fs_struct$/ {s/ .*//p;q;}"`
+@@ -53848,11 +39901,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -93677,13 +98997,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -49161,93 +36952,69 @@
- int
- main ()
- {
--int x = sizeof(&ramfs_file_operations);
-+int x = sizeof(&sys_dup2);
-   ;
+@@ -53872,42 +39921,18 @@
    return 0;
  }
  _ACEOF
@@ -93713,8 +99027,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_ramfs_file_operations="Y$cr_cv_ksymtab_ramfs_file_operations"
-+	 cr_cv_ksymtab_sys_dup2="Y$cr_cv_ksymtab_sys_dup2"
+ 	 cr_cv_ksymtab_free_fs_struct="Y$cr_cv_ksymtab_free_fs_struct"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -93723,43 +99036,25 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_ramfs_file_operations="N$cr_cv_ksymtab_ramfs_file_operations"
-+	 cr_cv_ksymtab_sys_dup2="N$cr_cv_ksymtab_sys_dup2"
+ 	 cr_cv_ksymtab_free_fs_struct="N$cr_cv_ksymtab_free_fs_struct"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_ramfs_file_operations"; then
-+  if test -z "$cr_cv_ksymtab_sys_dup2"; then
+@@ -53918,9 +39943,7 @@
      cr_result='not found'
    else
--    if expr "$cr_cv_ksymtab_ramfs_file_operations" : N >/dev/null; then
-+    if expr "$cr_cv_ksymtab_sys_dup2" : N >/dev/null; then
-       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern const struct file_operations ramfs_file_operations;
-+extern asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd);
- _EOF
- 
+     if expr "$cr_cv_ksymtab_free_fs_struct" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol free_fs_struct but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol free_fs_struct but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "Found symbol free_fs_struct but no declaration -- please file a bug report." "$LINENO" 5
      fi
--    cr_result=`echo $cr_cv_ksymtab_ramfs_file_operations | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_sys_dup2 | tr -d 'YN'`
+     cr_result=`echo $cr_cv_ksymtab_free_fs_struct | tr -d 'YN'`
      if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KDATA(ramfs_file_operations, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(sys_dup2, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KDATA_ramfs_file_operations $cr_addr
-+#define CR_KCODE_sys_dup2 $cr_addr
+@@ -53936,13 +39959,11 @@
  _ACEOF
  
    fi
@@ -93768,32 +99063,32 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+   if test -z "$cr_addr"; then
+-    { { echo "$as_me:$LINENO: error: failed to find either symbol put_fs_struct or free_fs_struct" >&5
+-echo "$as_me: error: failed to find either symbol put_fs_struct or free_fs_struct" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "failed to find either symbol put_fs_struct or free_fs_struct" "$LINENO" 5
+   fi
+ fi
  
+@@ -53950,12 +39971,11 @@
  
--  echo "$as_me:$LINENO: checking kernel symbol table for HPAGE_SHIFT" >&5
--echo $ECHO_N "checking kernel symbol table for HPAGE_SHIFT... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_lseek" >&5
-+$as_echo_n "checking kernel symbol table for sys_lseek... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_HPAGE_SHIFT+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for CONFIG_AUDITSYSCALL" >&5
++$as_echo_n "checking kernel for CONFIG_AUDITSYSCALL... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for CONFIG_AUDITSYSCALL" >&5
+-echo $ECHO_N "checking kernel for CONFIG_AUDITSYSCALL... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_CONFIG_AUDITSYSCALL+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_sys_lseek+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_CONFIG_AUDITSYSCALL+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_HPAGE_SHIFT=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}HPAGE_SHIFT$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_HPAGE_SHIFT"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_HPAGE_SHIFT\$" >/dev/null ; then
--        cr_cv_ksymtab_HPAGE_SHIFT=0
-+    cr_cv_ksymtab_sys_lseek=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_lseek$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_lseek"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_lseek\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_lseek=0
-       fi
- 
  
-@@ -49257,11 +37024,7 @@
+@@ -53966,11 +39986,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -93806,13 +99101,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -49276,93 +37039,69 @@
- int
- main ()
- {
--int x = sizeof(&HPAGE_SHIFT);
-+int x = sizeof(&sys_lseek);
-   ;
+@@ -53991,42 +40007,18 @@
    return 0;
  }
  _ACEOF
@@ -93842,8 +99131,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_HPAGE_SHIFT="Y$cr_cv_ksymtab_HPAGE_SHIFT"
-+	 cr_cv_ksymtab_sys_lseek="Y$cr_cv_ksymtab_sys_lseek"
+ 	 cr_cv_kconfig_HAVE_CONFIG_AUDITSYSCALL=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -93852,77 +99140,57 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_HPAGE_SHIFT="N$cr_cv_ksymtab_HPAGE_SHIFT"
-+	 cr_cv_ksymtab_sys_lseek="N$cr_cv_ksymtab_sys_lseek"
+ 	 cr_cv_kconfig_HAVE_CONFIG_AUDITSYSCALL=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
  fi
+@@ -54034,34 +40026,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_CONFIG_AUDITSYSCALL
  
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_HPAGE_SHIFT"; then
-+  if test -z "$cr_cv_ksymtab_sys_lseek"; then
-     cr_result='not found'
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CONFIG_AUDITSYSCALL 1
+-_ACEOF
++    $as_echo "#define HAVE_CONFIG_AUDITSYSCALL 1" >>confdefs.h
+ 
+      HAVE_CONFIG_AUDITSYSCALL=1
    else
--    if expr "$cr_cv_ksymtab_HPAGE_SHIFT" : N >/dev/null; then
-+    if expr "$cr_cv_ksymtab_sys_lseek" : N >/dev/null; then
-       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern unsigned int HPAGE_SHIFT;
-+extern asmlinkage off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin);
- _EOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CONFIG_AUDITSYSCALL 0
+-_ACEOF
++    $as_echo "#define HAVE_CONFIG_AUDITSYSCALL 0" >>confdefs.h
  
-     fi
--    cr_result=`echo $cr_cv_ksymtab_HPAGE_SHIFT | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_sys_lseek | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KDATA(HPAGE_SHIFT, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(sys_lseek, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
+      HAVE_CONFIG_AUDITSYSCALL=''
+   fi
  
- cat >>confdefs.h <<_ACEOF
--#define CR_KDATA_HPAGE_SHIFT $cr_addr
-+#define CR_KCODE_sys_lseek $cr_addr
- _ACEOF
  
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
+ if test -n "${HAVE_CONFIG_AUDITSYSCALL}"; then
  
--  echo "$as_me:$LINENO: checking kernel symbol table for phys_base" >&5
--echo $ECHO_N "checking kernel symbol table for phys_base... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_ftruncate" >&5
-+$as_echo_n "checking kernel symbol table for sys_ftruncate... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_phys_base+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for audit_dummy_context" >&5
++$as_echo_n "checking kernel for audit_dummy_context... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for audit_dummy_context" >&5
+-echo $ECHO_N "checking kernel for audit_dummy_context... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_AUDIT_DUMMY_CONTEXT+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_sys_ftruncate+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_AUDIT_DUMMY_CONTEXT+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_phys_base=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}phys_base$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_phys_base"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_phys_base\$" >/dev/null ; then
--        cr_cv_ksymtab_phys_base=0
-+    cr_cv_ksymtab_sys_ftruncate=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_ftruncate$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_ftruncate"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_ftruncate\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_ftruncate=0
-       fi
- 
  
-@@ -49372,11 +37111,7 @@
+@@ -54072,11 +40059,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -93935,13 +99203,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -49391,95 +37126,69 @@
- int
- main ()
- {
--int x = sizeof(&phys_base);
-+int x = sizeof(&sys_ftruncate);
-   ;
+@@ -54100,42 +40083,18 @@
    return 0;
  }
  _ACEOF
@@ -93971,8 +99233,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_phys_base="Y$cr_cv_ksymtab_phys_base"
-+	 cr_cv_ksymtab_sys_ftruncate="Y$cr_cv_ksymtab_sys_ftruncate"
+ 	 cr_cv_kconfig_HAVE_AUDIT_DUMMY_CONTEXT=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -93981,79 +99242,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_phys_base="N$cr_cv_ksymtab_phys_base"
-+	 cr_cv_ksymtab_sys_ftruncate="N$cr_cv_ksymtab_sys_ftruncate"
+ 	 cr_cv_kconfig_HAVE_AUDIT_DUMMY_CONTEXT=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
  fi
+@@ -54143,33 +40102,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_AUDIT_DUMMY_CONTEXT
  
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_phys_base"; then
-+  if test -z "$cr_cv_ksymtab_sys_ftruncate"; then
-     cr_result='not found'
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_AUDIT_DUMMY_CONTEXT 1
+-_ACEOF
++    $as_echo "#define HAVE_AUDIT_DUMMY_CONTEXT 1" >>confdefs.h
+ 
+      HAVE_AUDIT_DUMMY_CONTEXT=1
    else
--    if expr "$cr_cv_ksymtab_phys_base" : N >/dev/null; then
-+    if expr "$cr_cv_ksymtab_sys_ftruncate" : N >/dev/null; then
-       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern unsigned long phys_base;
-+extern asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
- _EOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_AUDIT_DUMMY_CONTEXT 0
+-_ACEOF
++    $as_echo "#define HAVE_AUDIT_DUMMY_CONTEXT 0" >>confdefs.h
  
-     fi
--    cr_result=`echo $cr_cv_ksymtab_phys_base | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_sys_ftruncate | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KDATA(phys_base, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(sys_ftruncate, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
+      HAVE_AUDIT_DUMMY_CONTEXT=''
+   fi
  
- cat >>confdefs.h <<_ACEOF
--#define CR_KDATA_phys_base $cr_addr
-+#define CR_KCODE_sys_ftruncate $cr_addr
- _ACEOF
  
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
 -
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
--# CODE
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for do_pipe" >&5
--echo $ECHO_N "checking kernel symbol table for do_pipe... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_mprotect" >&5
-+$as_echo_n "checking kernel symbol table for sys_mprotect... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_do_pipe+set}" = set; then
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2.6.6 audit_syscall_exit" >&5
+-echo $ECHO_N "checking kernel for 2.6.6 audit_syscall_exit... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.6 audit_syscall_exit" >&5
++$as_echo_n "checking kernel for 2.6.6 audit_syscall_exit... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_2_6_6_AUDIT_SYSCALL_EXIT+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_sys_mprotect+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_6_6_AUDIT_SYSCALL_EXIT+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_do_pipe=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_do_pipe"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_pipe\$" >/dev/null ; then
--        cr_cv_ksymtab_do_pipe=0
-+    cr_cv_ksymtab_sys_mprotect=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_mprotect$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_mprotect"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_mprotect\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_mprotect=0
-       fi
- 
  
-@@ -49489,11 +37198,7 @@
+@@ -54180,11 +40134,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -94066,13 +99304,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -49508,92 +37213,69 @@
- int
- main ()
- {
--int x = sizeof(&do_pipe);
-+int x = sizeof(&sys_mprotect);
-   ;
+@@ -54210,42 +40160,18 @@
    return 0;
  }
  _ACEOF
@@ -94102,8 +99334,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_do_pipe="Y$cr_cv_ksymtab_do_pipe"
-+	 cr_cv_ksymtab_sys_mprotect="Y$cr_cv_ksymtab_sys_mprotect"
+ 	 cr_cv_kconfig_HAVE_2_6_6_AUDIT_SYSCALL_EXIT=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -94112,79 +99343,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_do_pipe="N$cr_cv_ksymtab_do_pipe"
-+	 cr_cv_ksymtab_sys_mprotect="N$cr_cv_ksymtab_sys_mprotect"
+ 	 cr_cv_kconfig_HAVE_2_6_6_AUDIT_SYSCALL_EXIT=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
  fi
+@@ -54253,33 +40179,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_6_AUDIT_SYSCALL_EXIT
  
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_do_pipe"; then
-+  if test -z "$cr_cv_ksymtab_sys_mprotect"; then
-     cr_result='not found'
-   else
--    if expr "$cr_cv_ksymtab_do_pipe" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol do_pipe but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol do_pipe but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+    if expr "$cr_cv_ksymtab_sys_mprotect" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot);
-+_EOF
-+
-     fi
--    cr_result=`echo $cr_cv_ksymtab_do_pipe | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_sys_mprotect | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(do_pipe, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(sys_mprotect, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_6_AUDIT_SYSCALL_EXIT 1
+-_ACEOF
++    $as_echo "#define HAVE_2_6_6_AUDIT_SYSCALL_EXIT 1" >>confdefs.h
  
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_do_pipe $cr_addr
-+#define CR_KCODE_sys_mprotect $cr_addr
- _ACEOF
+      HAVE_2_6_6_AUDIT_SYSCALL_EXIT=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_6_AUDIT_SYSCALL_EXIT 0
+-_ACEOF
++    $as_echo "#define HAVE_2_6_6_AUDIT_SYSCALL_EXIT 0" >>confdefs.h
  
+      HAVE_2_6_6_AUDIT_SYSCALL_EXIT=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for do_pipe_flags" >&5
--echo $ECHO_N "checking kernel symbol table for do_pipe_flags... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_setitimer" >&5
-+$as_echo_n "checking kernel symbol table for sys_setitimer... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_do_pipe_flags+set}" = set; then
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.12 audit_syscall_exit" >&5
++$as_echo_n "checking kernel for 2.6.12 audit_syscall_exit... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2.6.12 audit_syscall_exit" >&5
+-echo $ECHO_N "checking kernel for 2.6.12 audit_syscall_exit... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_2_6_12_AUDIT_SYSCALL_EXIT+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_sys_setitimer+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_6_12_AUDIT_SYSCALL_EXIT+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_do_pipe_flags=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe_flags$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_do_pipe_flags"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_pipe_flags\$" >/dev/null ; then
--        cr_cv_ksymtab_do_pipe_flags=0
-+    cr_cv_ksymtab_sys_setitimer=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setitimer$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_setitimer"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_setitimer\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_setitimer=0
-       fi
- 
  
-@@ -49603,11 +37285,7 @@
+@@ -54290,11 +40211,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -94197,13 +99405,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -49622,92 +37300,69 @@
- int
- main ()
- {
--int x = sizeof(&do_pipe_flags);
-+int x = sizeof(&sys_setitimer);
-   ;
+@@ -54320,42 +40237,18 @@
    return 0;
  }
  _ACEOF
@@ -94233,8 +99435,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_do_pipe_flags="Y$cr_cv_ksymtab_do_pipe_flags"
-+	 cr_cv_ksymtab_sys_setitimer="Y$cr_cv_ksymtab_sys_setitimer"
+ 	 cr_cv_kconfig_HAVE_2_6_12_AUDIT_SYSCALL_EXIT=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -94243,79 +99444,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_do_pipe_flags="N$cr_cv_ksymtab_do_pipe_flags"
-+	 cr_cv_ksymtab_sys_setitimer="N$cr_cv_ksymtab_sys_setitimer"
+ 	 cr_cv_kconfig_HAVE_2_6_12_AUDIT_SYSCALL_EXIT=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
  fi
+@@ -54363,33 +40256,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_12_AUDIT_SYSCALL_EXIT
  
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_do_pipe_flags"; then
-+  if test -z "$cr_cv_ksymtab_sys_setitimer"; then
-     cr_result='not found'
-   else
--    if expr "$cr_cv_ksymtab_do_pipe_flags" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol do_pipe_flags but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol do_pipe_flags but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+    if expr "$cr_cv_ksymtab_sys_setitimer" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern asmlinkage long sys_setitimer(int which, struct itimerval *value, struct itimerval *ovalue);
-+_EOF
-+
-     fi
--    cr_result=`echo $cr_cv_ksymtab_do_pipe_flags | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_sys_setitimer | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(do_pipe_flags, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(sys_setitimer, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_12_AUDIT_SYSCALL_EXIT 1
+-_ACEOF
++    $as_echo "#define HAVE_2_6_12_AUDIT_SYSCALL_EXIT 1" >>confdefs.h
  
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_do_pipe_flags $cr_addr
-+#define CR_KCODE_sys_setitimer $cr_addr
- _ACEOF
+      HAVE_2_6_12_AUDIT_SYSCALL_EXIT=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_12_AUDIT_SYSCALL_EXIT 0
+-_ACEOF
++    $as_echo "#define HAVE_2_6_12_AUDIT_SYSCALL_EXIT 0" >>confdefs.h
  
+      HAVE_2_6_12_AUDIT_SYSCALL_EXIT=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
+-
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_munmap" >&5
--echo $ECHO_N "checking kernel symbol table for sys_munmap... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_prctl" >&5
-+$as_echo_n "checking kernel symbol table for sys_prctl... " >&6; }
-   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-   # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_munmap+set}" = set; then
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for 2.6.17 audit_syscall_exit" >&5
+-echo $ECHO_N "checking kernel for 2.6.17 audit_syscall_exit... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.17 audit_syscall_exit" >&5
++$as_echo_n "checking kernel for 2.6.17 audit_syscall_exit... " >&6; }
+ 
+-    if test "${cr_cv_kconfig_HAVE_2_6_17_AUDIT_SYSCALL_EXIT+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_sys_prctl+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_2_6_17_AUDIT_SYSCALL_EXIT+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_sys_munmap=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_munmap$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_munmap"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_munmap\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_munmap=0
-+    cr_cv_ksymtab_sys_prctl=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_prctl$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_prctl"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_prctl\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_prctl=0
-       fi
- 
  
-@@ -49717,11 +37372,7 @@
+@@ -54400,11 +40288,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -94328,13 +99506,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -49736,93 +37387,70 @@
- int
- main ()
- {
--int x = sizeof(&sys_munmap);
-+int x = sizeof(&sys_prctl);
-   ;
+@@ -54430,42 +40314,18 @@
    return 0;
  }
  _ACEOF
@@ -94364,8 +99536,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_munmap="Y$cr_cv_ksymtab_sys_munmap"
-+	 cr_cv_ksymtab_sys_prctl="Y$cr_cv_ksymtab_sys_prctl"
+ 	 cr_cv_kconfig_HAVE_2_6_17_AUDIT_SYSCALL_EXIT=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -94374,78 +99545,62 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_munmap="N$cr_cv_ksymtab_sys_munmap"
-+	 cr_cv_ksymtab_sys_prctl="N$cr_cv_ksymtab_sys_prctl"
+ 	 cr_cv_kconfig_HAVE_2_6_17_AUDIT_SYSCALL_EXIT=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     fi
  
  fi
+@@ -54473,38 +40333,32 @@
+   cr_result=$cr_cv_kconfig_HAVE_2_6_17_AUDIT_SYSCALL_EXIT
  
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_munmap"; then
-+  if test -z "$cr_cv_ksymtab_sys_prctl"; then
-     cr_result='not found'
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_17_AUDIT_SYSCALL_EXIT 1
+-_ACEOF
++    $as_echo "#define HAVE_2_6_17_AUDIT_SYSCALL_EXIT 1" >>confdefs.h
+ 
+      HAVE_2_6_17_AUDIT_SYSCALL_EXIT=1
    else
--    if expr "$cr_cv_ksymtab_sys_munmap" : N >/dev/null; then
-+    if expr "$cr_cv_ksymtab_sys_prctl" : N >/dev/null; then
-       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage long sys_munmap(unsigned long addr, size_t len);
-+extern asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5);
- _EOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_2_6_17_AUDIT_SYSCALL_EXIT 0
+-_ACEOF
++    $as_echo "#define HAVE_2_6_17_AUDIT_SYSCALL_EXIT 0" >>confdefs.h
  
-     fi
--    cr_result=`echo $cr_cv_ksymtab_sys_munmap | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_sys_prctl | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_munmap, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(sys_prctl, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
+      HAVE_2_6_17_AUDIT_SYSCALL_EXIT=''
+   fi
  
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_munmap $cr_addr
-+#define CR_KCODE_sys_prctl $cr_addr
- _ACEOF
  
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-+
  
  
+   if test x"${HAVE_2_6_6_AUDIT_SYSCALL_EXIT}${HAVE_2_6_12_AUDIT_SYSCALL_EXIT}${HAVE_2_6_17_AUDIT_SYSCALL_EXIT}" != x"1"; then
+-    { { echo "$as_me:$LINENO: error: failed to determine arguments to audit_syscall_exit()" >&5
+-echo "$as_me: error: failed to determine arguments to audit_syscall_exit()" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "failed to determine arguments to audit_syscall_exit()" "$LINENO" 5
+   fi
+   if test x"${HAVE_2_6_17_AUDIT_SYSCALL_EXIT}" = x"1"; then
  
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_dup2" >&5
--echo $ECHO_N "checking kernel symbol table for sys_dup2... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for copy_fs_struct" >&5
-+$as_echo_n "checking kernel symbol table for copy_fs_struct... " >&6; }
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for audit_syscall_exit" >&5
+-echo $ECHO_N "checking kernel symbol table for audit_syscall_exit... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for audit_syscall_exit" >&5
++$as_echo_n "checking kernel symbol table for audit_syscall_exit... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_dup2+set}" = set; then
+-    if test "${cr_cv_ksymtab_audit_syscall_exit+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_copy_fs_struct+set}" = set; then :
++    if ${cr_cv_ksymtab_audit_syscall_exit+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_sys_dup2=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_dup2$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_dup2"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_dup2\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_dup2=0
-+    cr_cv_ksymtab_copy_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_fs_struct$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_copy_fs_struct"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_copy_fs_struct\$" >/dev/null ; then
-+        cr_cv_ksymtab_copy_fs_struct=0
-       fi
- 
- 
-@@ -49832,11 +37460,7 @@
+     cr_cv_ksymtab_audit_syscall_exit=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}audit_syscall_exit$/ {s/ .*//p;q;}"`
+@@ -54520,11 +40374,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -94458,13 +99613,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -49851,93 +37475,66 @@
- int
- main ()
- {
--int x = sizeof(&sys_dup2);
-+int x = sizeof(&copy_fs_struct);
-   ;
+@@ -54544,42 +40394,18 @@
    return 0;
  }
  _ACEOF
@@ -94494,8 +99643,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_dup2="Y$cr_cv_ksymtab_sys_dup2"
-+	 cr_cv_ksymtab_copy_fs_struct="Y$cr_cv_ksymtab_copy_fs_struct"
+ 	 cr_cv_ksymtab_audit_syscall_exit="Y$cr_cv_ksymtab_audit_syscall_exit"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -94504,43 +99652,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_dup2="N$cr_cv_ksymtab_sys_dup2"
-+	 cr_cv_ksymtab_copy_fs_struct="N$cr_cv_ksymtab_copy_fs_struct"
+ 	 cr_cv_ksymtab_audit_syscall_exit="N$cr_cv_ksymtab_audit_syscall_exit"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_dup2"; then
-+  if test -z "$cr_cv_ksymtab_copy_fs_struct"; then
-     cr_result='not found'
-   else
--    if expr "$cr_cv_ksymtab_sys_dup2" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd);
--_EOF
--
-+    if expr "$cr_cv_ksymtab_copy_fs_struct" : N >/dev/null; then
-+      as_fn_error $? "Found symbol copy_fs_struct but no declaration -- please file a bug report." "$LINENO" 5
-     fi
--    cr_result=`echo $cr_cv_ksymtab_sys_dup2 | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_copy_fs_struct | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_dup2, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(copy_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_dup2 $cr_addr
-+#define CR_KCODE_copy_fs_struct $cr_addr
+@@ -54609,18 +40435,18 @@
  _ACEOF
  
    fi
@@ -94549,32 +99668,23 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
+   elif test x"${HAVE_2_6_12_AUDIT_SYSCALL_EXIT}" = x"1"; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_lseek" >&5
--echo $ECHO_N "checking kernel symbol table for sys_lseek... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for put_fs_struct" >&5
-+$as_echo_n "checking kernel symbol table for put_fs_struct... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for audit_syscall_exit" >&5
+-echo $ECHO_N "checking kernel symbol table for audit_syscall_exit... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for audit_syscall_exit" >&5
++$as_echo_n "checking kernel symbol table for audit_syscall_exit... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_lseek+set}" = set; then
+-    if test "${cr_cv_ksymtab_audit_syscall_exit+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_put_fs_struct+set}" = set; then :
++    if ${cr_cv_ksymtab_audit_syscall_exit+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_sys_lseek=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_lseek$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_lseek"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_lseek\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_lseek=0
-+    cr_cv_ksymtab_put_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}put_fs_struct$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_put_fs_struct"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_put_fs_struct\$" >/dev/null ; then
-+        cr_cv_ksymtab_put_fs_struct=0
-       fi
- 
- 
-@@ -49947,11 +37544,7 @@
+     cr_cv_ksymtab_audit_syscall_exit=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}audit_syscall_exit$/ {s/ .*//p;q;}"`
+@@ -54636,11 +40462,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -94587,13 +99697,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -49966,93 +37559,67 @@
- int
- main ()
- {
--int x = sizeof(&sys_lseek);
-+int x = sizeof(&put_fs_struct);
-   ;
+@@ -54660,42 +40482,18 @@
    return 0;
  }
  _ACEOF
@@ -94623,8 +99727,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_lseek="Y$cr_cv_ksymtab_sys_lseek"
-+	 cr_cv_ksymtab_put_fs_struct="Y$cr_cv_ksymtab_put_fs_struct"
+ 	 cr_cv_ksymtab_audit_syscall_exit="Y$cr_cv_ksymtab_audit_syscall_exit"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -94633,43 +99736,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_lseek="N$cr_cv_ksymtab_sys_lseek"
-+	 cr_cv_ksymtab_put_fs_struct="N$cr_cv_ksymtab_put_fs_struct"
+ 	 cr_cv_ksymtab_audit_syscall_exit="N$cr_cv_ksymtab_audit_syscall_exit"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_lseek"; then
-+  if test -z "$cr_cv_ksymtab_put_fs_struct"; then
-     cr_result='not found'
-   else
--    if expr "$cr_cv_ksymtab_sys_lseek" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin);
--_EOF
--
-+    if expr "$cr_cv_ksymtab_put_fs_struct" : N >/dev/null; then
-+      as_fn_error $? "Found symbol put_fs_struct but no declaration -- please file a bug report." "$LINENO" 5
-     fi
--    cr_result=`echo $cr_cv_ksymtab_sys_lseek | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_put_fs_struct | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_lseek, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(put_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_lseek $cr_addr
-+#define CR_KCODE_put_fs_struct $cr_addr
+@@ -54725,18 +40523,18 @@
  _ACEOF
  
    fi
@@ -94678,33 +99752,23 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
-+if test -z "$cr_addr"; then
+   elif test x"${HAVE_2_6_6_AUDIT_SYSCALL_EXIT}" = x"1"; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_ftruncate" >&5
--echo $ECHO_N "checking kernel symbol table for sys_ftruncate... $ECHO_C" >&6
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for free_fs_struct" >&5
-+$as_echo_n "checking kernel symbol table for free_fs_struct... " >&6; }
+-  echo "$as_me:$LINENO: checking kernel symbol table for audit_syscall_exit" >&5
+-echo $ECHO_N "checking kernel symbol table for audit_syscall_exit... $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for audit_syscall_exit" >&5
++$as_echo_n "checking kernel symbol table for audit_syscall_exit... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_ftruncate+set}" = set; then
+-    if test "${cr_cv_ksymtab_audit_syscall_exit+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_free_fs_struct+set}" = set; then :
++    if ${cr_cv_ksymtab_audit_syscall_exit+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_sys_ftruncate=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_ftruncate$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_ftruncate"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_ftruncate\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_ftruncate=0
-+    cr_cv_ksymtab_free_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_fs_struct$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_free_fs_struct"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_free_fs_struct\$" >/dev/null ; then
-+        cr_cv_ksymtab_free_fs_struct=0
-       fi
- 
- 
-@@ -50062,11 +37629,7 @@
+     cr_cv_ksymtab_audit_syscall_exit=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}audit_syscall_exit$/ {s/ .*//p;q;}"`
+@@ -54752,11 +40550,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -94717,13 +99781,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -50081,93 +37644,72 @@
- int
- main ()
- {
--int x = sizeof(&sys_ftruncate);
-+int x = sizeof(&free_fs_struct);
-   ;
+@@ -54776,42 +40570,18 @@
    return 0;
  }
  _ACEOF
@@ -94753,8 +99811,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_ftruncate="Y$cr_cv_ksymtab_sys_ftruncate"
-+	 cr_cv_ksymtab_free_fs_struct="Y$cr_cv_ksymtab_free_fs_struct"
+ 	 cr_cv_ksymtab_audit_syscall_exit="Y$cr_cv_ksymtab_audit_syscall_exit"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -94763,43 +99820,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_ftruncate="N$cr_cv_ksymtab_sys_ftruncate"
-+	 cr_cv_ksymtab_free_fs_struct="N$cr_cv_ksymtab_free_fs_struct"
+ 	 cr_cv_ksymtab_audit_syscall_exit="N$cr_cv_ksymtab_audit_syscall_exit"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_ftruncate"; then
-+  if test -z "$cr_cv_ksymtab_free_fs_struct"; then
-     cr_result='not found'
-   else
--    if expr "$cr_cv_ksymtab_sys_ftruncate" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
--_EOF
--
-+    if expr "$cr_cv_ksymtab_free_fs_struct" : N >/dev/null; then
-+      as_fn_error $? "Found symbol free_fs_struct but no declaration -- please file a bug report." "$LINENO" 5
-     fi
--    cr_result=`echo $cr_cv_ksymtab_sys_ftruncate | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_free_fs_struct | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_ftruncate, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(free_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_ftruncate $cr_addr
-+#define CR_KCODE_free_fs_struct $cr_addr
+@@ -54841,31 +40611,27 @@
  _ACEOF
  
    fi
@@ -94807,39 +99835,39 @@
 -echo "${ECHO_T}$cr_result" >&6
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-+
-+  if test -z "$cr_addr"; then
-+    as_fn_error $? "failed to find either symbol put_fs_struct or free_fs_struct" "$LINENO" 5
-+  fi
-+fi
  
-+# For blcr
+   else
+     : # Unreachable?
+-    { { echo "$as_me:$LINENO: error: failed to determine arguments to audit_syscall_exit()" >&5
+-echo "$as_me: error: failed to determine arguments to audit_syscall_exit()" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "failed to determine arguments to audit_syscall_exit()" "$LINENO" 5
+   fi
+   if test -z "$cr_addr"; then
+-    { { echo "$as_me:$LINENO: error: failed to find symbol audit_syscall_exit()" >&5
+-echo "$as_me: error: failed to find symbol audit_syscall_exit()" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "failed to find symbol audit_syscall_exit()" "$LINENO" 5
+   fi
+ fi
  
+ # For blcr
  
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_mprotect" >&5
--echo $ECHO_N "checking kernel symbol table for sys_mprotect... $ECHO_C" >&6
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for set_fs_pwd" >&5
+-echo $ECHO_N "checking kernel symbol table for set_fs_pwd... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for set_fs_pwd" >&5
 +$as_echo_n "checking kernel symbol table for set_fs_pwd... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_mprotect+set}" = set; then
+-    if test "${cr_cv_ksymtab_set_fs_pwd+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_set_fs_pwd+set}" = set; then :
++    if ${cr_cv_ksymtab_set_fs_pwd+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_sys_mprotect=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_mprotect$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_mprotect"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_mprotect\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_mprotect=0
-+    cr_cv_ksymtab_set_fs_pwd=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}set_fs_pwd$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_set_fs_pwd"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_set_fs_pwd\$" >/dev/null ; then
-+        cr_cv_ksymtab_set_fs_pwd=0
-       fi
- 
- 
-@@ -50177,11 +37719,7 @@
+     cr_cv_ksymtab_set_fs_pwd=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}set_fs_pwd$/ {s/ .*//p;q;}"`
+@@ -54881,11 +40647,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -94852,13 +99880,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -50196,93 +37734,67 @@
- int
- main ()
- {
--int x = sizeof(&sys_mprotect);
-+int x = sizeof(&set_fs_pwd);
-   ;
+@@ -54905,42 +40667,18 @@
    return 0;
  }
  _ACEOF
@@ -94888,8 +99910,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_mprotect="Y$cr_cv_ksymtab_sys_mprotect"
-+	 cr_cv_ksymtab_set_fs_pwd="Y$cr_cv_ksymtab_set_fs_pwd"
+ 	 cr_cv_ksymtab_set_fs_pwd="Y$cr_cv_ksymtab_set_fs_pwd"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -94898,43 +99919,25 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_mprotect="N$cr_cv_ksymtab_sys_mprotect"
-+	 cr_cv_ksymtab_set_fs_pwd="N$cr_cv_ksymtab_set_fs_pwd"
+ 	 cr_cv_ksymtab_set_fs_pwd="N$cr_cv_ksymtab_set_fs_pwd"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_mprotect"; then
-+  if test -z "$cr_cv_ksymtab_set_fs_pwd"; then
+@@ -54951,9 +40689,7 @@
      cr_result='not found'
    else
--    if expr "$cr_cv_ksymtab_sys_mprotect" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot);
--_EOF
--
-+    if expr "$cr_cv_ksymtab_set_fs_pwd" : N >/dev/null; then
+     if expr "$cr_cv_ksymtab_set_fs_pwd" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol set_fs_pwd but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol set_fs_pwd but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
 +      as_fn_error $? "Found symbol set_fs_pwd but no declaration -- please file a bug report." "$LINENO" 5
      fi
--    cr_result=`echo $cr_cv_ksymtab_sys_mprotect | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_set_fs_pwd | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_mprotect, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(set_fs_pwd, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_mprotect $cr_addr
-+#define CR_KCODE_set_fs_pwd $cr_addr
+     cr_result=`echo $cr_cv_ksymtab_set_fs_pwd | tr -d 'YN'`
+     if test $cr_result = 0; then
+@@ -54969,18 +40705,18 @@
  _ACEOF
  
    fi
@@ -94943,33 +99946,23 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
-+# For vmadump4
+ # For vmadump4
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_setitimer" >&5
--echo $ECHO_N "checking kernel symbol table for sys_setitimer... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_mremap" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_mremap... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_mremap" >&5
 +$as_echo_n "checking kernel symbol table for sys_mremap... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_setitimer+set}" = set; then
+-    if test "${cr_cv_ksymtab_sys_mremap+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_sys_mremap+set}" = set; then :
++    if ${cr_cv_ksymtab_sys_mremap+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_sys_setitimer=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setitimer$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_setitimer"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_setitimer\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_setitimer=0
-+    cr_cv_ksymtab_sys_mremap=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_mremap$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_mremap"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_mremap\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_mremap=0
-       fi
- 
- 
-@@ -50292,11 +37804,7 @@
+     cr_cv_ksymtab_sys_mremap=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_mremap$/ {s/ .*//p;q;}"`
+@@ -54996,11 +40732,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -94982,13 +99975,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -50311,93 +37819,69 @@
- int
- main ()
- {
--int x = sizeof(&sys_setitimer);
-+int x = sizeof(&sys_mremap);
-   ;
+@@ -55020,42 +40752,18 @@
    return 0;
  }
  _ACEOF
@@ -95018,8 +100005,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_setitimer="Y$cr_cv_ksymtab_sys_setitimer"
-+	 cr_cv_ksymtab_sys_mremap="Y$cr_cv_ksymtab_sys_mremap"
+ 	 cr_cv_ksymtab_sys_mremap="Y$cr_cv_ksymtab_sys_mremap"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -95028,43 +100014,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_setitimer="N$cr_cv_ksymtab_sys_setitimer"
-+	 cr_cv_ksymtab_sys_mremap="N$cr_cv_ksymtab_sys_mremap"
+ 	 cr_cv_ksymtab_sys_mremap="N$cr_cv_ksymtab_sys_mremap"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_setitimer"; then
-+  if test -z "$cr_cv_ksymtab_sys_mremap"; then
-     cr_result='not found'
-   else
--    if expr "$cr_cv_ksymtab_sys_setitimer" : N >/dev/null; then
-+    if expr "$cr_cv_ksymtab_sys_mremap" : N >/dev/null; then
-       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage long sys_setitimer(int which, struct itimerval *value, struct itimerval *ovalue);
-+extern asmlinkage unsigned long sys_mremap(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr);
- _EOF
- 
-     fi
--    cr_result=`echo $cr_cv_ksymtab_sys_setitimer | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_sys_mremap | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_setitimer, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(sys_mremap, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_setitimer $cr_addr
-+#define CR_KCODE_sys_mremap $cr_addr
+@@ -55085,17 +40793,17 @@
  _ACEOF
  
    fi
@@ -95075,30 +100032,20 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_prctl" >&5
--echo $ECHO_N "checking kernel symbol table for sys_prctl... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for do_sigaction" >&5
+-echo $ECHO_N "checking kernel symbol table for do_sigaction... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_sigaction" >&5
 +$as_echo_n "checking kernel symbol table for do_sigaction... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_prctl+set}" = set; then
+-    if test "${cr_cv_ksymtab_do_sigaction+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_do_sigaction+set}" = set; then :
++    if ${cr_cv_ksymtab_do_sigaction+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_sys_prctl=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_prctl$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_prctl"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_prctl\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_prctl=0
-+    cr_cv_ksymtab_do_sigaction=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_sigaction$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_do_sigaction"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_sigaction\$" >/dev/null ; then
-+        cr_cv_ksymtab_do_sigaction=0
-       fi
- 
- 
-@@ -50407,11 +37891,7 @@
+     cr_cv_ksymtab_do_sigaction=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_sigaction$/ {s/ .*//p;q;}"`
+@@ -55111,11 +40819,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -95111,13 +100058,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -50426,94 +37906,67 @@
- int
- main ()
- {
--int x = sizeof(&sys_prctl);
-+int x = sizeof(&do_sigaction);
-   ;
+@@ -55135,42 +40839,18 @@
    return 0;
  }
  _ACEOF
@@ -95147,8 +100088,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_prctl="Y$cr_cv_ksymtab_sys_prctl"
-+	 cr_cv_ksymtab_do_sigaction="Y$cr_cv_ksymtab_do_sigaction"
+ 	 cr_cv_ksymtab_do_sigaction="Y$cr_cv_ksymtab_do_sigaction"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -95157,79 +100097,50 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_prctl="N$cr_cv_ksymtab_sys_prctl"
-+	 cr_cv_ksymtab_do_sigaction="N$cr_cv_ksymtab_do_sigaction"
+ 	 cr_cv_ksymtab_do_sigaction="N$cr_cv_ksymtab_do_sigaction"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_prctl"; then
-+  if test -z "$cr_cv_ksymtab_do_sigaction"; then
+@@ -55181,9 +40861,7 @@
      cr_result='not found'
    else
--    if expr "$cr_cv_ksymtab_sys_prctl" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5);
--_EOF
--
-+    if expr "$cr_cv_ksymtab_do_sigaction" : N >/dev/null; then
+     if expr "$cr_cv_ksymtab_do_sigaction" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol do_sigaction but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol do_sigaction but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
 +      as_fn_error $? "Found symbol do_sigaction but no declaration -- please file a bug report." "$LINENO" 5
      fi
--    cr_result=`echo $cr_cv_ksymtab_sys_prctl | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_do_sigaction | tr -d 'YN'`
+     cr_result=`echo $cr_cv_ksymtab_do_sigaction | tr -d 'YN'`
      if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_prctl, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(do_sigaction, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_prctl $cr_addr
-+#define CR_KCODE_do_sigaction $cr_addr
+@@ -55199,18 +40877,18 @@
  _ACEOF
  
    fi
 -    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
-+if test $CR_KARCH = x86_64; then
+ if test $CR_KARCH = x86_64; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for copy_fs_struct" >&5
--echo $ECHO_N "checking kernel symbol table for copy_fs_struct... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for load_gs_index" >&5
+-echo $ECHO_N "checking kernel symbol table for load_gs_index... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for load_gs_index" >&5
 +$as_echo_n "checking kernel symbol table for load_gs_index... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_copy_fs_struct+set}" = set; then
+-    if test "${cr_cv_ksymtab_load_gs_index+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_load_gs_index+set}" = set; then :
++    if ${cr_cv_ksymtab_load_gs_index+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_copy_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_fs_struct$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_copy_fs_struct"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_copy_fs_struct\$" >/dev/null ; then
--        cr_cv_ksymtab_copy_fs_struct=0
-+    cr_cv_ksymtab_load_gs_index=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}load_gs_index$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_load_gs_index"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_load_gs_index\$" >/dev/null ; then
-+        cr_cv_ksymtab_load_gs_index=0
-       fi
- 
- 
-@@ -50523,11 +37976,7 @@
+     cr_cv_ksymtab_load_gs_index=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}load_gs_index$/ {s/ .*//p;q;}"`
+@@ -55226,11 +40904,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -95242,16 +100153,10 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -50542,93 +37991,63 @@
- int
- main ()
- {
--int x = sizeof(&copy_fs_struct);
-+int x = sizeof(&load_gs_index);
-   ;
--  return 0;
--}
--_ACEOF
+@@ -55250,42 +40924,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -95274,15 +100179,11 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  return 0;
-+}
-+_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_copy_fs_struct="Y$cr_cv_ksymtab_copy_fs_struct"
-+	 cr_cv_ksymtab_load_gs_index="Y$cr_cv_ksymtab_load_gs_index"
+ 	 cr_cv_ksymtab_load_gs_index="Y$cr_cv_ksymtab_load_gs_index"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -95291,42 +100192,25 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_copy_fs_struct="N$cr_cv_ksymtab_copy_fs_struct"
-+	 cr_cv_ksymtab_load_gs_index="N$cr_cv_ksymtab_load_gs_index"
+ 	 cr_cv_ksymtab_load_gs_index="N$cr_cv_ksymtab_load_gs_index"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_copy_fs_struct"; then
-+  if test -z "$cr_cv_ksymtab_load_gs_index"; then
+@@ -55296,9 +40946,7 @@
      cr_result='not found'
    else
--    if expr "$cr_cv_ksymtab_copy_fs_struct" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol copy_fs_struct but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol copy_fs_struct but no declaration -- please file a bug report." >&2;}
+     if expr "$cr_cv_ksymtab_load_gs_index" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol load_gs_index but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol load_gs_index but no declaration -- please file a bug report." >&2;}
 -   { (exit 1); exit 1; }; }
-+    if expr "$cr_cv_ksymtab_load_gs_index" : N >/dev/null; then
 +      as_fn_error $? "Found symbol load_gs_index but no declaration -- please file a bug report." "$LINENO" 5
      fi
--    cr_result=`echo $cr_cv_ksymtab_copy_fs_struct | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_load_gs_index | tr -d 'YN'`
+     cr_result=`echo $cr_cv_ksymtab_load_gs_index | tr -d 'YN'`
      if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(copy_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(load_gs_index, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_copy_fs_struct $cr_addr
-+#define CR_KCODE_load_gs_index $cr_addr
+@@ -55314,19 +40962,18 @@
  _ACEOF
  
    fi
@@ -95337,30 +100221,22 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for put_fs_struct" >&5
--echo $ECHO_N "checking kernel symbol table for put_fs_struct... $ECHO_C" >&6
--  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
--  # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_put_fs_struct+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
+ 
+ 
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for read_pda" >&5
 +$as_echo_n "checking kernel for read_pda... " >&6; }
-+
-+    if test "${cr_cv_kconfig_HAVE_READ_PDA+set}" = set; then :
+ 
+-  echo "$as_me:$LINENO: checking kernel for read_pda" >&5
+-echo $ECHO_N "checking kernel for read_pda... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_READ_PDA+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_READ_PDA+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_put_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}put_fs_struct$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_put_fs_struct"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_put_fs_struct\$" >/dev/null ; then
--        cr_cv_ksymtab_put_fs_struct=0
--      fi
- 
  
-   SAVE_CC=$CC
-@@ -50637,11 +38056,7 @@
+@@ -55337,11 +40984,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -95373,28 +100249,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -50649,101 +38064,65 @@
- 		   #define FASTCALL(_decl) _decl
- 		 #endif
- 		 #include <linux/types.h>
--
--		#define IN_CONFIGURE 1
--		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
--
-+		 #include <asm/percpu.h>
- int
- main ()
- {
--int x = sizeof(&put_fs_struct);
-+
-+   #ifdef read_pda
-+     /* OK, it exists and is a macro */
-+   #else
-+     /* Check for function case */
-+     int x = sizeof(&read_pda);
-+   #endif
-+
-   ;
+@@ -55365,42 +41008,18 @@
    return 0;
  }
  _ACEOF
@@ -95424,8 +100279,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_put_fs_struct="Y$cr_cv_ksymtab_put_fs_struct"
-+	 cr_cv_kconfig_HAVE_READ_PDA=yes
+ 	 cr_cv_kconfig_HAVE_READ_PDA=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -95434,81 +100288,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_put_fs_struct="N$cr_cv_ksymtab_put_fs_struct"
-+	 cr_cv_kconfig_HAVE_READ_PDA=no
+ 	 cr_cv_kconfig_HAVE_READ_PDA=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--    fi
  
  fi
+@@ -55408,33 +41027,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_READ_PDA
  
--  cr_addr=''
--  if test -z "$cr_cv_ksymtab_put_fs_struct"; then
--    cr_result='not found'
--  else
--    if expr "$cr_cv_ksymtab_put_fs_struct" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol put_fs_struct but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol put_fs_struct but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
--    fi
--    cr_result=`echo $cr_cv_ksymtab_put_fs_struct | tr -d 'YN'`
--    if test $cr_result = 0; then
--      cr_result=exported
--      cr_addr=0
--    else
--      cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(put_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
--    fi
-+  cr_result=$cr_cv_kconfig_HAVE_READ_PDA
- 
--cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_put_fs_struct $cr_addr
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_READ_PDA 1
 -_ACEOF
-+  if test $cr_result = yes; then
 +    $as_echo "#define HAVE_READ_PDA 1" >>confdefs.h
  
-+     HAVE_READ_PDA=1
-+  else
+      HAVE_READ_PDA=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_READ_PDA 0
+-_ACEOF
 +    $as_echo "#define HAVE_READ_PDA 0" >>confdefs.h
-+
-+     HAVE_READ_PDA=''
+ 
+      HAVE_READ_PDA=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
  
--if test -z "$cr_addr"; then
  
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
--  echo "$as_me:$LINENO: checking kernel symbol table for free_fs_struct" >&5
--echo $ECHO_N "checking kernel symbol table for free_fs_struct... $ECHO_C" >&6
--  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
--  # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_free_fs_struct+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for write_pda" >&5
+-echo $ECHO_N "checking kernel for write_pda... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for write_pda" >&5
 +$as_echo_n "checking kernel for write_pda... " >&6; }
-+
-+    if test "${cr_cv_kconfig_HAVE_WRITE_PDA+set}" = set; then :
+ 
+-    if test "${cr_cv_kconfig_HAVE_WRITE_PDA+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_WRITE_PDA+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_free_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_fs_struct$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_free_fs_struct"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_free_fs_struct\$" >/dev/null ; then
--        cr_cv_ksymtab_free_fs_struct=0
--      fi
- 
  
-   SAVE_CC=$CC
-@@ -50752,11 +38131,7 @@
+@@ -55445,11 +41059,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -95521,28 +100350,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -50764,108 +38139,66 @@
- 		   #define FASTCALL(_decl) _decl
- 		 #endif
- 		 #include <linux/types.h>
--
--		#define IN_CONFIGURE 1
--		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
--
-+		 #include <asm/percpu.h>
- int
- main ()
- {
--int x = sizeof(&free_fs_struct);
-+
-+   #ifdef write_pda
-+     /* OK, it exists and is a macro */
-+   #else
-+     /* Check for function case */
-+     int x = sizeof(&write_pda);
-+   #endif
-+
-   ;
+@@ -55473,42 +41083,18 @@
    return 0;
  }
  _ACEOF
@@ -95572,8 +100380,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_free_fs_struct="Y$cr_cv_ksymtab_free_fs_struct"
-+	 cr_cv_kconfig_HAVE_WRITE_PDA=yes
+ 	 cr_cv_kconfig_HAVE_WRITE_PDA=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -95582,88 +100389,57 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_free_fs_struct="N$cr_cv_ksymtab_free_fs_struct"
-+	 cr_cv_kconfig_HAVE_WRITE_PDA=no
+ 	 cr_cv_kconfig_HAVE_WRITE_PDA=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--    fi
  
  fi
+@@ -55516,34 +41102,29 @@
+   cr_result=$cr_cv_kconfig_HAVE_WRITE_PDA
  
--  cr_addr=''
--  if test -z "$cr_cv_ksymtab_free_fs_struct"; then
--    cr_result='not found'
--  else
--    if expr "$cr_cv_ksymtab_free_fs_struct" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol free_fs_struct but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol free_fs_struct but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
--    fi
--    cr_result=`echo $cr_cv_ksymtab_free_fs_struct | tr -d 'YN'`
--    if test $cr_result = 0; then
--      cr_result=exported
--      cr_addr=0
--    else
--      cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(free_fs_struct, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
--    fi
-+  cr_result=$cr_cv_kconfig_HAVE_WRITE_PDA
- 
--cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_free_fs_struct $cr_addr
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_WRITE_PDA 1
 -_ACEOF
-+  if test $cr_result = yes; then
 +    $as_echo "#define HAVE_WRITE_PDA 1" >>confdefs.h
  
--  fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+     HAVE_WRITE_PDA=1
-+  else
+      HAVE_WRITE_PDA=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_WRITE_PDA 0
+-_ACEOF
 +    $as_echo "#define HAVE_WRITE_PDA 0" >>confdefs.h
  
--  if test -z "$cr_addr"; then
--    { { echo "$as_me:$LINENO: error: failed to find either symbol put_fs_struct or free_fs_struct" >&5
--echo "$as_me: error: failed to find either symbol put_fs_struct or free_fs_struct" >&2;}
--   { (exit 1); exit 1; }; }
-+     HAVE_WRITE_PDA=''
+      HAVE_WRITE_PDA=''
    fi
--fi
  
--# For blcr
  
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
--  echo "$as_me:$LINENO: checking kernel symbol table for set_fs_pwd" >&5
--echo $ECHO_N "checking kernel symbol table for set_fs_pwd... $ECHO_C" >&6
--  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
--  # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_set_fs_pwd+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+  if test "$HAVE_READ_PDA$HAVE_WRITE_PDA" != "11"; then
-+
-+
-+
+ 
+   if test "$HAVE_READ_PDA$HAVE_WRITE_PDA" != "11"; then
+ 
+ 
+ 
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for percpu_read" >&5
 +$as_echo_n "checking kernel for percpu_read... " >&6; }
-+
-+    if test "${cr_cv_kconfig_HAVE_PERCPU_READ+set}" = set; then :
+ 
+-  echo "$as_me:$LINENO: checking kernel for percpu_read" >&5
+-echo $ECHO_N "checking kernel for percpu_read... $ECHO_C" >&6
+-
+-    if test "${cr_cv_kconfig_HAVE_PERCPU_READ+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_PERCPU_READ+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_set_fs_pwd=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}set_fs_pwd$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_set_fs_pwd"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_set_fs_pwd\$" >/dev/null ; then
--        cr_cv_ksymtab_set_fs_pwd=0
--      fi
- 
  
-   SAVE_CC=$CC
-@@ -50874,11 +38207,7 @@
+@@ -55554,11 +41135,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -95676,28 +100452,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -50886,101 +38215,65 @@
- 		   #define FASTCALL(_decl) _decl
- 		 #endif
- 		 #include <linux/types.h>
--
--		#define IN_CONFIGURE 1
--		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
--
-+		 #include <asm/percpu.h>
- int
- main ()
- {
--int x = sizeof(&set_fs_pwd);
-+
-+   #ifdef percpu_read
-+     /* OK, it exists and is a macro */
-+   #else
-+     /* Check for function case */
-+     int x = sizeof(&percpu_read);
-+   #endif
-+
-   ;
+@@ -55582,42 +41159,18 @@
    return 0;
  }
  _ACEOF
@@ -95727,8 +100482,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_set_fs_pwd="Y$cr_cv_ksymtab_set_fs_pwd"
-+	 cr_cv_kconfig_HAVE_PERCPU_READ=yes
+ 	 cr_cv_kconfig_HAVE_PERCPU_READ=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -95737,81 +100491,56 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_set_fs_pwd="N$cr_cv_ksymtab_set_fs_pwd"
-+	 cr_cv_kconfig_HAVE_PERCPU_READ=no
+ 	 cr_cv_kconfig_HAVE_PERCPU_READ=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--    fi
  
  fi
+@@ -55625,33 +41178,28 @@
+   cr_result=$cr_cv_kconfig_HAVE_PERCPU_READ
  
--  cr_addr=''
--  if test -z "$cr_cv_ksymtab_set_fs_pwd"; then
--    cr_result='not found'
--  else
--    if expr "$cr_cv_ksymtab_set_fs_pwd" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol set_fs_pwd but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol set_fs_pwd but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
--    fi
--    cr_result=`echo $cr_cv_ksymtab_set_fs_pwd | tr -d 'YN'`
--    if test $cr_result = 0; then
--      cr_result=exported
--      cr_addr=0
--    else
--      cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(set_fs_pwd, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
--    fi
-+  cr_result=$cr_cv_kconfig_HAVE_PERCPU_READ
- 
--cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_set_fs_pwd $cr_addr
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PERCPU_READ 1
 -_ACEOF
-+  if test $cr_result = yes; then
 +    $as_echo "#define HAVE_PERCPU_READ 1" >>confdefs.h
-+
-+     HAVE_PERCPU_READ=1
-+  else
+ 
+      HAVE_PERCPU_READ=1
+   else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PERCPU_READ 0
+-_ACEOF
 +    $as_echo "#define HAVE_PERCPU_READ 0" >>confdefs.h
  
-+     HAVE_PERCPU_READ=''
+      HAVE_PERCPU_READ=''
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
  
--# For vmadump4
  
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_mremap" >&5
--echo $ECHO_N "checking kernel symbol table for sys_mremap... $ECHO_C" >&6
--  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
--  # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_mremap+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
+ 
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel for percpu_write" >&5
+-echo $ECHO_N "checking kernel for percpu_write... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for percpu_write" >&5
 +$as_echo_n "checking kernel for percpu_write... " >&6; }
-+
-+    if test "${cr_cv_kconfig_HAVE_PERCPU_WRITE+set}" = set; then :
+ 
+-    if test "${cr_cv_kconfig_HAVE_PERCPU_WRITE+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_kconfig_HAVE_PERCPU_WRITE+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_sys_mremap=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_mremap$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_mremap"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_mremap\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_mremap=0
--      fi
- 
  
-   SAVE_CC=$CC
-@@ -50989,11 +38282,7 @@
+@@ -55662,11 +41210,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -95824,28 +100553,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -51001,100 +38290,158 @@
- 		   #define FASTCALL(_decl) _decl
- 		 #endif
- 		 #include <linux/types.h>
--
--		#define IN_CONFIGURE 1
--		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
--
-+		 #include <asm/percpu.h>
- int
- main ()
- {
--int x = sizeof(&sys_mremap);
-+
-+   #ifdef percpu_write
-+     /* OK, it exists and is a macro */
-+   #else
-+     /* Check for function case */
-+     int x = sizeof(&percpu_write);
-+   #endif
-+
-   ;
+@@ -55690,42 +41234,18 @@
    return 0;
  }
  _ACEOF
@@ -95875,8 +100583,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_mremap="Y$cr_cv_ksymtab_sys_mremap"
-+	 cr_cv_kconfig_HAVE_PERCPU_WRITE=yes
+ 	 cr_cv_kconfig_HAVE_PERCPU_WRITE=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -95885,74 +100592,49 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_mremap="N$cr_cv_ksymtab_sys_mremap"
-+	 cr_cv_kconfig_HAVE_PERCPU_WRITE=no
+ 	 cr_cv_kconfig_HAVE_PERCPU_WRITE=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--    fi
  
  fi
+@@ -55733,22 +41253,18 @@
+   cr_result=$cr_cv_kconfig_HAVE_PERCPU_WRITE
  
--  cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_mremap"; then
--    cr_result='not found'
-+  cr_result=$cr_cv_kconfig_HAVE_PERCPU_WRITE
-+
-+  if test $cr_result = yes; then
+   if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PERCPU_WRITE 1
+-_ACEOF
 +    $as_echo "#define HAVE_PERCPU_WRITE 1" >>confdefs.h
-+
-+     HAVE_PERCPU_WRITE=1
+ 
+      HAVE_PERCPU_WRITE=1
    else
--    if expr "$cr_cv_ksymtab_sys_mremap" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage unsigned long sys_mremap(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr);
--_EOF
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PERCPU_WRITE 0
+-_ACEOF
 +    $as_echo "#define HAVE_PERCPU_WRITE 0" >>confdefs.h
  
--    fi
--    cr_result=`echo $cr_cv_ksymtab_sys_mremap | tr -d 'YN'`
--    if test $cr_result = 0; then
--      cr_result=exported
--      cr_addr=0
--    else
--      cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_mremap, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
--    fi
-+     HAVE_PERCPU_WRITE=''
-+  fi
-+
-+
+      HAVE_PERCPU_WRITE=''
+   fi
+ 
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-+
-+
-+    if test "$HAVE_PERCPU_READ$HAVE_PERCPU_WRITE" != "11"; then
-+
-+  cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
  
--cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_mremap $cr_addr
- _ACEOF
  
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
+     if test "$HAVE_PERCPU_READ$HAVE_PERCPU_WRITE" != "11"; then
+@@ -55771,39 +41287,70 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
 +# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
 +(
 +  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
 +    eval ac_val=\$$ac_var
@@ -95970,83 +100652,96 @@
 +    esac
 +  done
 +
-+  (set) 2>&1 |
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
 +    case $as_nl`(ac_space=' '; set) 2>&1` in #(
 +    *${as_nl}ac_space=\ *)
 +      # `set' does not quote correctly, so add quotes: double-quote
 +      # substitution turns \\\\ into \\, and sed turns \\ into \.
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
 +      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
 +      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
+       ;;
+-    esac;
+-} |
 +    esac |
 +    sort
 +) |
-+  sed '
+   sed '
 +     /^ac_cv_env_/b end
-+     t clear
+      t clear
+-     : clear
 +     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+-    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+fi
-+rm -f confcache
-+
-+  echo "======================================================================"
-+  echo "Please review the following configuration information:"
-+  echo "  Kernel source directory = $LINUX_SRC"
-+  echo "  Kernel build directory = $LINUX_OBJ"
-+  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
-+  echo "  Kernel version probed from kernel build = $LINUX_VER"
-+  echo "  Kernel running currently = `uname -r`"
-+  echo "======================================================================"
-+
+ fi
+ rm -f confcache
+@@ -55817,19 +41364,17 @@
+   echo "  Kernel running currently = `uname -r`"
+   echo "======================================================================"
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - found neither {read,write}_pda() nor percpu_{read,write}()" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - found neither {read,write}_pda() nor percpu_{read,write}()" >&2;}
+-   { (exit 1); exit 1; }; }
 +   as_fn_error $? "Unable to use kernel $LINUX_VER - found neither {read,write}_pda() nor percpu_{read,write}()" "$LINENO" 5
  
-+    else
+     else
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for do_sigaction" >&5
--echo $ECHO_N "checking kernel symbol table for do_sigaction... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for per_cpu__old_rsp" >&5
+-echo $ECHO_N "checking kernel symbol table for per_cpu__old_rsp... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for per_cpu__old_rsp" >&5
 +$as_echo_n "checking kernel symbol table for per_cpu__old_rsp... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_do_sigaction+set}" = set; then
+-    if test "${cr_cv_ksymtab_per_cpu__old_rsp+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_per_cpu__old_rsp+set}" = set; then :
++    if ${cr_cv_ksymtab_per_cpu__old_rsp+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_do_sigaction=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_sigaction$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_do_sigaction"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_do_sigaction\$" >/dev/null ; then
--        cr_cv_ksymtab_do_sigaction=0
-+    cr_cv_ksymtab_per_cpu__old_rsp=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}per_cpu__old_rsp$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_per_cpu__old_rsp"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_per_cpu__old_rsp\$" >/dev/null ; then
-+        cr_cv_ksymtab_per_cpu__old_rsp=0
-       fi
- 
- 
-@@ -51104,11 +38451,7 @@
+     cr_cv_ksymtab_per_cpu__old_rsp=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}per_cpu__old_rsp$/ {s/ .*//p;q;}"`
+@@ -55845,11 +41390,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -96059,13 +100754,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -51123,93 +38466,70 @@
- int
- main ()
- {
--int x = sizeof(&do_sigaction);
-+int x = sizeof(&per_cpu__old_rsp);
-   ;
+@@ -55869,42 +41410,18 @@
    return 0;
  }
  _ACEOF
@@ -96095,8 +100784,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_do_sigaction="Y$cr_cv_ksymtab_do_sigaction"
-+	 cr_cv_ksymtab_per_cpu__old_rsp="Y$cr_cv_ksymtab_per_cpu__old_rsp"
+ 	 cr_cv_ksymtab_per_cpu__old_rsp="Y$cr_cv_ksymtab_per_cpu__old_rsp"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -96105,45 +100793,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_do_sigaction="N$cr_cv_ksymtab_do_sigaction"
-+	 cr_cv_ksymtab_per_cpu__old_rsp="N$cr_cv_ksymtab_per_cpu__old_rsp"
+ 	 cr_cv_ksymtab_per_cpu__old_rsp="N$cr_cv_ksymtab_per_cpu__old_rsp"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_do_sigaction"; then
-+  if test -z "$cr_cv_ksymtab_per_cpu__old_rsp"; then
-     cr_result='not found'
-   else
--    if expr "$cr_cv_ksymtab_do_sigaction" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol do_sigaction but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol do_sigaction but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+    if expr "$cr_cv_ksymtab_per_cpu__old_rsp" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+DECLARE_PER_CPU(unsigned long, old_rsp);
-+_EOF
-+
-     fi
--    cr_result=`echo $cr_cv_ksymtab_do_sigaction | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_per_cpu__old_rsp | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(do_sigaction, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KDATA(per_cpu__old_rsp, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_do_sigaction $cr_addr
-+#define CR_KDATA_per_cpu__old_rsp $cr_addr
+@@ -55934,18 +41451,18 @@
  _ACEOF
  
    fi
@@ -96152,34 +100809,23 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
--if test $CR_ARCH = x86_64; then
-+      if test -z "$cr_addr"; then
+       if test -z "$cr_addr"; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for load_gs_index" >&5
--echo $ECHO_N "checking kernel symbol table for load_gs_index... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for old_rsp" >&5
+-echo $ECHO_N "checking kernel symbol table for old_rsp... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for old_rsp" >&5
 +$as_echo_n "checking kernel symbol table for old_rsp... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_load_gs_index+set}" = set; then
+-    if test "${cr_cv_ksymtab_old_rsp+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_old_rsp+set}" = set; then :
++    if ${cr_cv_ksymtab_old_rsp+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_load_gs_index=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}load_gs_index$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_load_gs_index"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_load_gs_index\$" >/dev/null ; then
--        cr_cv_ksymtab_load_gs_index=0
-+    cr_cv_ksymtab_old_rsp=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}old_rsp$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_old_rsp"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_old_rsp\$" >/dev/null ; then
-+        cr_cv_ksymtab_old_rsp=0
-       fi
- 
- 
-@@ -51219,11 +38539,7 @@
+     cr_cv_ksymtab_old_rsp=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}old_rsp$/ {s/ .*//p;q;}"`
+@@ -55961,11 +41478,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -96192,13 +100838,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -51238,90 +38554,78 @@
- int
- main ()
- {
--int x = sizeof(&load_gs_index);
-+int x = sizeof(&old_rsp);
-   ;
+@@ -55985,42 +41498,18 @@
    return 0;
  }
  _ACEOF
@@ -96228,8 +100868,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_load_gs_index="Y$cr_cv_ksymtab_load_gs_index"
-+	 cr_cv_ksymtab_old_rsp="Y$cr_cv_ksymtab_old_rsp"
+ 	 cr_cv_ksymtab_old_rsp="Y$cr_cv_ksymtab_old_rsp"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -96238,88 +100877,48 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_load_gs_index="N$cr_cv_ksymtab_load_gs_index"
-+	 cr_cv_ksymtab_old_rsp="N$cr_cv_ksymtab_old_rsp"
+ 	 cr_cv_ksymtab_old_rsp="N$cr_cv_ksymtab_old_rsp"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_load_gs_index"; then
-+  if test -z "$cr_cv_ksymtab_old_rsp"; then
-     cr_result='not found'
-   else
--    if expr "$cr_cv_ksymtab_load_gs_index" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol load_gs_index but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol load_gs_index but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
-+    if expr "$cr_cv_ksymtab_old_rsp" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+DECLARE_PER_CPU(unsigned long, old_rsp);
-+_EOF
-+
-     fi
--    cr_result=`echo $cr_cv_ksymtab_load_gs_index | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_old_rsp | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(load_gs_index, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KDATA(old_rsp, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_load_gs_index $cr_addr
-+#define CR_KDATA_old_rsp $cr_addr
+@@ -56050,13 +41539,11 @@
  _ACEOF
  
    fi
 -    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
--
--
--
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
-+        if test -z "$cr_addr"; then
+         if test -z "$cr_addr"; then
+-          { { echo "$as_me:$LINENO: error: failed to locate either symbol per_cpu__old_rsp or old_rsp" >&5
+-echo "$as_me: error: failed to locate either symbol per_cpu__old_rsp or old_rsp" >&2;}
+-   { (exit 1); exit 1; }; }
 +          as_fn_error $? "failed to locate either symbol per_cpu__old_rsp or old_rsp" "$LINENO" 5
-+        fi
-+      fi
-+    fi
-+  fi
-+fi
-+if test x$enable_restore_ids = xyes; then
+         fi
+       fi
+     fi
+@@ -56065,12 +41552,12 @@
+ if test x$enable_restore_ids = xyes; then
  
--  echo "$as_me:$LINENO: checking kernel for read_pda" >&5
--echo $ECHO_N "checking kernel for read_pda... $ECHO_C" >&6
  
--    if test "${cr_cv_kconfig_HAVE_READ_PDA+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_setgroups" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_setgroups... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_setgroups" >&5
 +$as_echo_n "checking kernel symbol table for sys_setgroups... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_sys_setgroups+set}" = set; then :
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_sys_setgroups+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_sys_setgroups+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-+    cr_cv_ksymtab_sys_setgroups=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setgroups$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_setgroups"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_setgroups\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_setgroups=0
-+      fi
- 
- 
-   SAVE_CC=$CC
-@@ -51330,11 +38634,7 @@
+     cr_cv_ksymtab_sys_setgroups=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setgroups$/ {s/ .*//p;q;}"`
+@@ -56086,11 +41573,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -96331,29 +100930,8 @@
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 		 #include <linux/kernel.h>
-@@ -51342,94 +38642,77 @@
- 		   #define FASTCALL(_decl) _decl
- 		 #endif
- 		 #include <linux/types.h>
--		 #include <asm/percpu.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
- int
- main ()
- {
--
--   #ifdef read_pda
--     /* OK, it exists and is a macro */
--   #else
--     /* Check for function case */
--     int x = sizeof(&read_pda);
--   #endif
--
-+int x = sizeof(&sys_setgroups);
-   ;
+ 		 #include <linux/kernel.h>
+@@ -56110,42 +41593,18 @@
    return 0;
  }
  _ACEOF
@@ -96383,8 +100961,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_READ_PDA=yes
-+	 cr_cv_ksymtab_sys_setgroups="Y$cr_cv_ksymtab_sys_setgroups"
+ 	 cr_cv_ksymtab_sys_setgroups="Y$cr_cv_ksymtab_sys_setgroups"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -96393,84 +100970,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_READ_PDA=no
-+	 cr_cv_ksymtab_sys_setgroups="N$cr_cv_ksymtab_sys_setgroups"
+ 	 cr_cv_ksymtab_sys_setgroups="N$cr_cv_ksymtab_sys_setgroups"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-+    fi
- 
- fi
- 
--  cr_result=$cr_cv_kconfig_HAVE_READ_PDA
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_sys_setgroups"; then
-+    cr_result='not found'
-+  else
-+    if expr "$cr_cv_ksymtab_sys_setgroups" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern asmlinkage long sys_setgroups(int, gid_t *);
-+_EOF
- 
--  if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_READ_PDA 1
--_ACEOF
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_sys_setgroups | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KCODE(sys_setgroups, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
+     fi
  
--     HAVE_READ_PDA=1
--  else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_READ_PDA 0
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KCODE_sys_setgroups $cr_addr
+@@ -56175,17 +41634,17 @@
  _ACEOF
  
--     HAVE_READ_PDA=''
    fi
--
--
--  echo "$as_me:$LINENO: result: $cr_result" >&5
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
--
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
  
--
--
--  echo "$as_me:$LINENO: checking kernel for write_pda" >&5
--echo $ECHO_N "checking kernel for write_pda... $ECHO_C" >&6
--
--    if test "${cr_cv_kconfig_HAVE_WRITE_PDA+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_setresuid" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_setresuid... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_setresuid" >&5
 +$as_echo_n "checking kernel symbol table for sys_setresuid... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_sys_setresuid+set}" = set; then :
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_sys_setresuid+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_sys_setresuid+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-+    cr_cv_ksymtab_sys_setresuid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setresuid$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_setresuid"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_setresuid\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_setresuid=0
-+      fi
- 
- 
-   SAVE_CC=$CC
-@@ -51438,11 +38721,7 @@
+     cr_cv_ksymtab_sys_setresuid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setresuid$/ {s/ .*//p;q;}"`
+@@ -56201,11 +41660,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -96483,28 +101014,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -51450,95 +38729,77 @@
- 		   #define FASTCALL(_decl) _decl
- 		 #endif
- 		 #include <linux/types.h>
--		 #include <asm/percpu.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
- int
- main ()
- {
--
--   #ifdef write_pda
--     /* OK, it exists and is a macro */
--   #else
--     /* Check for function case */
--     int x = sizeof(&write_pda);
--   #endif
--
-+int x = sizeof(&sys_setresuid);
-   ;
+@@ -56225,42 +41680,18 @@
    return 0;
  }
  _ACEOF
@@ -96534,8 +101044,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_WRITE_PDA=yes
-+	 cr_cv_ksymtab_sys_setresuid="Y$cr_cv_ksymtab_sys_setresuid"
+ 	 cr_cv_ksymtab_sys_setresuid="Y$cr_cv_ksymtab_sys_setresuid"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -96543,91 +101052,39 @@
 -CC=$SAVE_CC
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_WRITE_PDA=no
--fi
+ 	 CPPFLAGS=$SAVE_CPPFLAGS
+ 	 cr_cv_ksymtab_sys_setresuid="N$cr_cv_ksymtab_sys_setresuid"
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--
--
--fi
--
--  cr_result=$cr_cv_kconfig_HAVE_WRITE_PDA
--
--  if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_WRITE_PDA 1
--_ACEOF
--
--     HAVE_WRITE_PDA=1
--  else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_WRITE_PDA 0
--_ACEOF
--
--     HAVE_WRITE_PDA=''
--  fi
-+	 CPPFLAGS=$SAVE_CPPFLAGS
-+	 cr_cv_ksymtab_sys_setresuid="N$cr_cv_ksymtab_sys_setresuid"
-+fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-+    fi
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
-+fi
- 
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_sys_setresuid"; then
-+    cr_result='not found'
-+  else
-+    if expr "$cr_cv_ksymtab_sys_setresuid" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern asmlinkage long sys_setresuid(uid_t, uid_t, uid_t);
-+_EOF
- 
--  if test "$HAVE_READ_PDA$HAVE_WRITE_PDA" != "11"; then
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_sys_setresuid | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KCODE(sys_setresuid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
+     fi
  
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KCODE_sys_setresuid $cr_addr
-+_ACEOF
+@@ -56290,17 +41721,17 @@
+ _ACEOF
  
-+  fi
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
  
--  echo "$as_me:$LINENO: checking kernel for percpu_read" >&5
--echo $ECHO_N "checking kernel for percpu_read... $ECHO_C" >&6
  
--    if test "${cr_cv_kconfig_HAVE_PERCPU_READ+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_setresgid" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_setresgid... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_setresgid" >&5
 +$as_echo_n "checking kernel symbol table for sys_setresgid... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_sys_setresgid+set}" = set; then :
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_sys_setresgid+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_sys_setresgid+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-+    cr_cv_ksymtab_sys_setresgid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setresgid$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_setresgid"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_setresgid\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_setresgid=0
-+      fi
- 
- 
-   SAVE_CC=$CC
-@@ -51547,11 +38808,7 @@
+     cr_cv_ksymtab_sys_setresgid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setresgid$/ {s/ .*//p;q;}"`
+@@ -56316,11 +41747,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -96640,28 +101097,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -51559,94 +38816,78 @@
- 		   #define FASTCALL(_decl) _decl
- 		 #endif
- 		 #include <linux/types.h>
--		 #include <asm/percpu.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
- int
- main ()
- {
--
--   #ifdef percpu_read
--     /* OK, it exists and is a macro */
--   #else
--     /* Check for function case */
--     int x = sizeof(&percpu_read);
--   #endif
--
-+int x = sizeof(&sys_setresgid);
-   ;
+@@ -56340,42 +41767,18 @@
    return 0;
  }
  _ACEOF
@@ -96691,8 +101127,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_PERCPU_READ=yes
-+	 cr_cv_ksymtab_sys_setresgid="Y$cr_cv_ksymtab_sys_setresgid"
+ 	 cr_cv_ksymtab_sys_setresgid="Y$cr_cv_ksymtab_sys_setresgid"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -96701,85 +101136,39 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_PERCPU_READ=no
-+	 cr_cv_ksymtab_sys_setresgid="N$cr_cv_ksymtab_sys_setresgid"
+ 	 cr_cv_ksymtab_sys_setresgid="N$cr_cv_ksymtab_sys_setresgid"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-+    fi
- 
- fi
- 
--  cr_result=$cr_cv_kconfig_HAVE_PERCPU_READ
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_sys_setresgid"; then
-+    cr_result='not found'
-+  else
-+    if expr "$cr_cv_ksymtab_sys_setresgid" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern asmlinkage long sys_setresgid(gid_t, gid_t, gid_t);
-+_EOF
- 
--  if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PERCPU_READ 1
--_ACEOF
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_sys_setresgid | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KCODE(sys_setresgid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
+     fi
  
--     HAVE_PERCPU_READ=1
--  else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PERCPU_READ 0
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KCODE_sys_setresgid $cr_addr
+@@ -56405,18 +41808,18 @@
  _ACEOF
  
--     HAVE_PERCPU_READ=''
    fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
-+fi
+ fi
  
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
--
--
--
--
--
--
--  echo "$as_me:$LINENO: checking kernel for percpu_write" >&5
--echo $ECHO_N "checking kernel for percpu_write... $ECHO_C" >&6
  
--    if test "${cr_cv_kconfig_HAVE_PERCPU_WRITE+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for expand_files" >&5
+-echo $ECHO_N "checking kernel symbol table for expand_files... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for expand_files" >&5
 +$as_echo_n "checking kernel symbol table for expand_files... " >&6; }
-+  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
-+  # if a declaration was found or not, and the address or 0 as the rest.
-+    if test "${cr_cv_ksymtab_expand_files+set}" = set; then :
+   # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
+   # if a declaration was found or not, and the address or 0 as the rest.
+-    if test "${cr_cv_ksymtab_expand_files+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if ${cr_cv_ksymtab_expand_files+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
-+    cr_cv_ksymtab_expand_files=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}expand_files$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_expand_files"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_expand_files\$" >/dev/null ; then
-+        cr_cv_ksymtab_expand_files=0
-+      fi
- 
- 
-   SAVE_CC=$CC
-@@ -51655,11 +38896,7 @@
+     cr_cv_ksymtab_expand_files=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}expand_files$/ {s/ .*//p;q;}"`
+@@ -56432,11 +41835,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -96792,28 +101181,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -51667,168 +38904,76 @@
- 		   #define FASTCALL(_decl) _decl
- 		 #endif
- 		 #include <linux/types.h>
--		 #include <asm/percpu.h>
-+
-+		#define IN_CONFIGURE 1
-+		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
-+
- int
- main ()
- {
--
--   #ifdef percpu_write
--     /* OK, it exists and is a macro */
--   #else
--     /* Check for function case */
--     int x = sizeof(&percpu_write);
--   #endif
--
-+int x = sizeof(&expand_files);
-   ;
+@@ -56456,42 +41855,18 @@
    return 0;
  }
  _ACEOF
@@ -96843,8 +101211,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_PERCPU_WRITE=yes
-+	 cr_cv_ksymtab_expand_files="Y$cr_cv_ksymtab_expand_files"
+ 	 cr_cv_ksymtab_expand_files="Y$cr_cv_ksymtab_expand_files"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -96853,154 +101220,38 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_PERCPU_WRITE=no
-+	 cr_cv_ksymtab_expand_files="N$cr_cv_ksymtab_expand_files"
+ 	 cr_cv_ksymtab_expand_files="N$cr_cv_ksymtab_expand_files"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-+    fi
- 
- fi
- 
--  cr_result=$cr_cv_kconfig_HAVE_PERCPU_WRITE
--
--  if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PERCPU_WRITE 1
--_ACEOF
--
--     HAVE_PERCPU_WRITE=1
-+  cr_addr=''
-+  if test -z "$cr_cv_ksymtab_expand_files"; then
-+    cr_result='not found'
-   else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PERCPU_WRITE 0
--_ACEOF
--
--     HAVE_PERCPU_WRITE=''
--  fi
--
--
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
--
--
--    if test "$HAVE_PERCPU_READ$HAVE_PERCPU_WRITE" != "11"; then
-+    if expr "$cr_cv_ksymtab_expand_files" : N >/dev/null; then
-+      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
-+extern int expand_files(struct files_struct *, int);
-+_EOF
- 
--  cat >confcache <<\_ACEOF
--# This file is a shell script that caches the results of configure
--# tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
--#
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
--#
--# `ac_cv_env_foo' variables (set or unset) will be overridden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_expand_files | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KCODE(expand_files, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
+     fi
  
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KCODE_expand_files $cr_addr
+@@ -56521,17 +41896,17 @@
  _ACEOF
  
--# The following way of writing the cache mishandles newlines in values,
--# but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
--# Ultrix sh set writes to stderr and can't be redirected directly,
--# and sets the high bit in the cache file unless we assign to the vars.
--{
--  (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
--      sed -n \
--	"s/'/'\\\\''/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
--    *)
--      # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--      ;;
--    esac;
--} |
--  sed '
--     t clear
--     : clear
--     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--     t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--    cat confcache >$cache_file
--  else
--    echo "not updating unwritable cache $cache_file"
    fi
--fi
--rm -f confcache
--
--  echo "======================================================================"
--  echo "Please review the following configuration information:"
--  echo "  Kernel source directory = $LINUX_SRC"
--  echo "  Kernel build directory = $LINUX_OBJ"
--  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
--  echo "  Kernel version probed from kernel build = $LINUX_VER"
--  echo "  Kernel running currently = `uname -r`"
--  echo "======================================================================"
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - found neither {read,write}_pda() nor percpu_{read,write}()" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - found neither {read,write}_pda() nor percpu_{read,write}()" >&2;}
--   { (exit 1); exit 1; }; }
--
--    else
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for per_cpu__old_rsp" >&5
--echo $ECHO_N "checking kernel symbol table for per_cpu__old_rsp... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for __flush_icache_range" >&5
+-echo $ECHO_N "checking kernel symbol table for __flush_icache_range... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __flush_icache_range" >&5
 +$as_echo_n "checking kernel symbol table for __flush_icache_range... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_per_cpu__old_rsp+set}" = set; then
+-    if test "${cr_cv_ksymtab___flush_icache_range+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab___flush_icache_range+set}" = set; then :
++    if ${cr_cv_ksymtab___flush_icache_range+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_per_cpu__old_rsp=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}per_cpu__old_rsp$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_per_cpu__old_rsp"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_per_cpu__old_rsp\$" >/dev/null ; then
--        cr_cv_ksymtab_per_cpu__old_rsp=0
-+    cr_cv_ksymtab___flush_icache_range=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__flush_icache_range$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab___flush_icache_range"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab___flush_icache_range\$" >/dev/null ; then
-+        cr_cv_ksymtab___flush_icache_range=0
-       fi
- 
- 
-@@ -51838,11 +38983,7 @@
+     cr_cv_ksymtab___flush_icache_range=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__flush_icache_range$/ {s/ .*//p;q;}"`
+@@ -56547,11 +41922,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -97013,13 +101264,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -51857,102 +38998,66 @@
- int
- main ()
- {
--int x = sizeof(&per_cpu__old_rsp);
-+int x = sizeof(&__flush_icache_range);
-   ;
+@@ -56571,42 +41942,18 @@
    return 0;
  }
  _ACEOF
@@ -97049,53 +101294,35 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_per_cpu__old_rsp="Y$cr_cv_ksymtab_per_cpu__old_rsp"
-+	 cr_cv_ksymtab___flush_icache_range="Y$cr_cv_ksymtab___flush_icache_range"
- else
+ 	 cr_cv_ksymtab___flush_icache_range="Y$cr_cv_ksymtab___flush_icache_range"
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -CC=$SAVE_CC
++else
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_per_cpu__old_rsp="N$cr_cv_ksymtab_per_cpu__old_rsp"
-+	 cr_cv_ksymtab___flush_icache_range="N$cr_cv_ksymtab___flush_icache_range"
+ 	 cr_cv_ksymtab___flush_icache_range="N$cr_cv_ksymtab___flush_icache_range"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_per_cpu__old_rsp"; then
-+  if test -z "$cr_cv_ksymtab___flush_icache_range"; then
+@@ -56617,9 +41964,7 @@
      cr_result='not found'
    else
--    if expr "$cr_cv_ksymtab_per_cpu__old_rsp" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--DECLARE_PER_CPU(unsigned long, old_rsp);
--_EOF
--
-+    if expr "$cr_cv_ksymtab___flush_icache_range" : N >/dev/null; then
+     if expr "$cr_cv_ksymtab___flush_icache_range" : N >/dev/null; then
+-      { { echo "$as_me:$LINENO: error: Found symbol __flush_icache_range but no declaration -- please file a bug report." >&5
+-echo "$as_me: error: Found symbol __flush_icache_range but no declaration -- please file a bug report." >&2;}
+-   { (exit 1); exit 1; }; }
 +      as_fn_error $? "Found symbol __flush_icache_range but no declaration -- please file a bug report." "$LINENO" 5
      fi
--    cr_result=`echo $cr_cv_ksymtab_per_cpu__old_rsp | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab___flush_icache_range | tr -d 'YN'`
+     cr_result=`echo $cr_cv_ksymtab___flush_icache_range | tr -d 'YN'`
      if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KDATA(per_cpu__old_rsp, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(__flush_icache_range, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KDATA_per_cpu__old_rsp $cr_addr
-+#define CR_KCODE___flush_icache_range $cr_addr
+@@ -56635,17 +41980,17 @@
  _ACEOF
  
    fi
@@ -97104,41 +101331,22 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
  
--      if test -z "$cr_addr"; then
--        { { echo "$as_me:$LINENO: error: failed to locate symbol per_cpu__old_rsp" >&5
--echo "$as_me: error: failed to locate symbol per_cpu__old_rsp" >&2;}
--   { (exit 1); exit 1; }; }
--      fi
--    fi
--  fi
--fi
--if test x$enable_restore_ids = xyes; then
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_setgroups" >&5
--echo $ECHO_N "checking kernel symbol table for sys_setgroups... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for sys_link" >&5
+-echo $ECHO_N "checking kernel symbol table for sys_link... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_link" >&5
 +$as_echo_n "checking kernel symbol table for sys_link... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_setgroups+set}" = set; then
+-    if test "${cr_cv_ksymtab_sys_link+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_sys_link+set}" = set; then :
++    if ${cr_cv_ksymtab_sys_link+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_sys_setgroups=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setgroups$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_setgroups"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_setgroups\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_setgroups=0
-+    cr_cv_ksymtab_sys_link=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_link$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_sys_link"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_link\$" >/dev/null ; then
-+        cr_cv_ksymtab_sys_link=0
-       fi
- 
- 
-@@ -51962,11 +39067,7 @@
+     cr_cv_ksymtab_sys_link=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_link$/ {s/ .*//p;q;}"`
+@@ -56661,11 +42006,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -97151,13 +101359,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -51981,93 +39082,69 @@
- int
- main ()
- {
--int x = sizeof(&sys_setgroups);
-+int x = sizeof(&sys_link);
-   ;
+@@ -56685,42 +42026,18 @@
    return 0;
  }
  _ACEOF
@@ -97187,8 +101389,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_setgroups="Y$cr_cv_ksymtab_sys_setgroups"
-+	 cr_cv_ksymtab_sys_link="Y$cr_cv_ksymtab_sys_link"
+ 	 cr_cv_ksymtab_sys_link="Y$cr_cv_ksymtab_sys_link"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -97197,43 +101398,14 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_setgroups="N$cr_cv_ksymtab_sys_setgroups"
-+	 cr_cv_ksymtab_sys_link="N$cr_cv_ksymtab_sys_link"
+ 	 cr_cv_ksymtab_sys_link="N$cr_cv_ksymtab_sys_link"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_setgroups"; then
-+  if test -z "$cr_cv_ksymtab_sys_link"; then
-     cr_result='not found'
-   else
--    if expr "$cr_cv_ksymtab_sys_setgroups" : N >/dev/null; then
-+    if expr "$cr_cv_ksymtab_sys_link" : N >/dev/null; then
-       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage long sys_setgroups(int, gid_t *);
-+extern asmlinkage long sys_link(const char *oldname, const char *newname);
- _EOF
- 
-     fi
--    cr_result=`echo $cr_cv_ksymtab_sys_setgroups | tr -d 'YN'`
-+    cr_result=`echo $cr_cv_ksymtab_sys_link | tr -d 'YN'`
-     if test $cr_result = 0; then
-       cr_result=exported
-       cr_addr=0
-     else
-       cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_setgroups, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+      echo "_CR_IMPORT_KCODE(sys_link, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_setgroups $cr_addr
-+#define CR_KCODE_sys_link $cr_addr
+@@ -56750,17 +42067,17 @@
  _ACEOF
  
    fi
@@ -97244,30 +101416,20 @@
  
  
  
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_setresuid" >&5
--echo $ECHO_N "checking kernel symbol table for sys_setresuid... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking kernel symbol table for lookup_create" >&5
+-echo $ECHO_N "checking kernel symbol table for lookup_create... $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for lookup_create" >&5
 +$as_echo_n "checking kernel symbol table for lookup_create... " >&6; }
    # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
    # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_setresuid+set}" = set; then
+-    if test "${cr_cv_ksymtab_lookup_create+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_ksymtab_lookup_create+set}" = set; then :
++    if ${cr_cv_ksymtab_lookup_create+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
  
--    cr_cv_ksymtab_sys_setresuid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setresuid$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_setresuid"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_setresuid\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_setresuid=0
-+    cr_cv_ksymtab_lookup_create=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}lookup_create$/ {s/ .*//p;q;}"`
-+    if test -n "$cr_cv_ksymtab_lookup_create"; then
-+      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_lookup_create\$" >/dev/null ; then
-+        cr_cv_ksymtab_lookup_create=0
-       fi
- 
- 
-@@ -52077,11 +39154,7 @@
+     cr_cv_ksymtab_lookup_create=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}lookup_create$/ {s/ .*//p;q;}"`
+@@ -56776,11 +42093,7 @@
    CC=$KCC
    CFLAGS=""
    CPPFLAGS="$KCFLAGS"
@@ -97280,13 +101442,7 @@
  /* end confdefs.h.  */
  
  		 #include <linux/kernel.h>
-@@ -52096,94 +39169,351 @@
- int
- main ()
- {
--int x = sizeof(&sys_setresuid);
-+int x = sizeof(&lookup_create);
-   ;
+@@ -56800,42 +42113,18 @@
    return 0;
  }
  _ACEOF
@@ -97316,8 +101472,7 @@
    CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_setresuid="Y$cr_cv_ksymtab_sys_setresuid"
-+	 cr_cv_ksymtab_lookup_create="Y$cr_cv_ksymtab_lookup_create"
+ 	 cr_cv_ksymtab_lookup_create="Y$cr_cv_ksymtab_lookup_create"
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -97326,70 +101481,35 @@
 +  CC=$SAVE_CC
  	 CFLAGS=$SAVE_CFLAGS
  	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_setresuid="N$cr_cv_ksymtab_sys_setresuid"
-+	 cr_cv_ksymtab_lookup_create="N$cr_cv_ksymtab_lookup_create"
+ 	 cr_cv_ksymtab_lookup_create="N$cr_cv_ksymtab_lookup_create"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
      fi
  
- fi
- 
-   cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_setresuid"; then
-+  if test -z "$cr_cv_ksymtab_lookup_create"; then
-     cr_result='not found'
-   else
--    if expr "$cr_cv_ksymtab_sys_setresuid" : N >/dev/null; then
-+    if expr "$cr_cv_ksymtab_lookup_create" : N >/dev/null; then
-       cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage long sys_setresuid(uid_t, uid_t, uid_t);
-+extern struct dentry *lookup_create(struct nameidata *, int);
- _EOF
+@@ -56865,8 +42154,8 @@
+ _ACEOF
  
--    fi
--    cr_result=`echo $cr_cv_ksymtab_sys_setresuid | tr -d 'YN'`
--    if test $cr_result = 0; then
--      cr_result=exported
--      cr_addr=0
--    else
--      cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_setresuid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
--    fi
-+    fi
-+    cr_result=`echo $cr_cv_ksymtab_lookup_create | tr -d 'YN'`
-+    if test $cr_result = 0; then
-+      cr_result=exported
-+      cr_addr=0
-+    else
-+      cr_addr="0x$cr_result"
-+      echo "_CR_IMPORT_KCODE(lookup_create, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
-+    fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CR_KCODE_lookup_create $cr_addr
-+_ACEOF
-+
-+  fi
+   fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
-+
-+
-+
-+# CODE & DATA used for sanity checks
-+#
-+# Unless you are adding additional sanity checks, there is
-+# no good reason to add more calls to CR_FIND_EXPORTED_KSYM.
-+#
-+# register_{chr,blk}dev are used at module load to validate
-+# the System.map used to locate symbols and configure time.
-+
-+
-+
+ 
+ 
+ 
+@@ -56880,71 +42169,755 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking kernel symbol table for exported register_chrdev" >&5
+-echo $ECHO_N "checking kernel symbol table for exported register_chrdev... $ECHO_C" >&6
+-    if test "${cr_cv_ksymtab_exp_register_chrdev+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for exported register_chrdev" >&5
 +$as_echo_n "checking kernel symbol table for exported register_chrdev... " >&6; }
-+    if test "${cr_cv_ksymtab_exp_register_chrdev+set}" = set; then :
++    if ${cr_cv_ksymtab_exp_register_chrdev+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +
@@ -97422,7 +101542,7 @@
 +
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for exported __register_chrdev" >&5
 +$as_echo_n "checking kernel symbol table for exported __register_chrdev... " >&6; }
-+    if test "${cr_cv_ksymtab_exp___register_chrdev+set}" = set; then :
++    if ${cr_cv_ksymtab_exp___register_chrdev+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +
@@ -97515,10 +101635,21 @@
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
 +  else
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -97544,7 +101675,7 @@
 +
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for exported register_blkdev" >&5
 +$as_echo_n "checking kernel symbol table for exported register_blkdev... " >&6; }
-+    if test "${cr_cv_ksymtab_exp_register_blkdev+set}" = set; then :
++    if ${cr_cv_ksymtab_exp_register_blkdev+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +
@@ -97637,10 +101768,21 @@
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
 +  else
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -97658,65 +101800,39 @@
 +  echo "======================================================================"
 +
 +   as_fn_error $? "Unable to use kernel $LINUX_VER - kernel does not export register_blkdev" "$LINENO" 5
- 
--cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_setresuid $cr_addr
--_ACEOF
++
 +fi
 +# One of {init,system}_utsname is used to validate UTS_RELEASE
- 
--  fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
- 
- 
++
++
++
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for init_utsname" >&5
 +$as_echo_n "checking kernel for init_utsname... " >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_setresgid" >&5
--echo $ECHO_N "checking kernel symbol table for sys_setresgid... $ECHO_C" >&6
--  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
--  # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_setresgid+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    if test "${cr_cv_kconfig_HAVE_INIT_UTSNAME+set}" = set; then :
++
++    if ${cr_cv_kconfig_HAVE_INIT_UTSNAME+:} false; then :
 +  $as_echo_n "(cached) " >&6
- else
- 
--    cr_cv_ksymtab_sys_setresgid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setresgid$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_setresgid"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_setresgid\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_setresgid=0
--      fi
- 
- 
-   SAVE_CC=$CC
-@@ -52192,11 +39522,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++else
++
++
++
++  SAVE_CC=$CC
++  SAVE_CFLAGS=$CFLAGS
++  SAVE_CPPFLAGS=$CPPFLAGS
++  CC=$KCC
++  CFLAGS=""
++  CPPFLAGS="$KCFLAGS"
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 		 #include <linux/kernel.h>
-@@ -52204,102 +39530,65 @@
- 		   #define FASTCALL(_decl) _decl
- 		 #endif
- 		 #include <linux/types.h>
--
--		#define IN_CONFIGURE 1
--		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
--
++/* end confdefs.h.  */
++
++		 #include <linux/kernel.h>
++		 #ifndef FASTCALL
++		   #define FASTCALL(_decl) _decl
++		 #endif
++		 #include <linux/types.h>
 +		 #include <linux/utsname.h>
- int
- main ()
- {
--int x = sizeof(&sys_setresgid);
++int
++main ()
++{
 +
 +   #ifdef init_utsname
 +     /* OK, it exists and is a macro */
@@ -97725,101 +101841,42 @@
 +     int x = sizeof(&init_utsname);
 +   #endif
 +
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_setresgid="Y$cr_cv_ksymtab_sys_setresgid"
++  CC=$SAVE_CC
++	 CFLAGS=$SAVE_CFLAGS
++	 CPPFLAGS=$SAVE_CPPFLAGS
 +	 cr_cv_kconfig_HAVE_INIT_UTSNAME=yes
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
++else
 +  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_setresgid="N$cr_cv_ksymtab_sys_setresgid"
++	 CFLAGS=$SAVE_CFLAGS
++	 CPPFLAGS=$SAVE_CPPFLAGS
 +	 cr_cv_kconfig_HAVE_INIT_UTSNAME=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--    fi
- 
- fi
- 
--  cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_setresgid"; then
--    cr_result='not found'
--  else
--    if expr "$cr_cv_ksymtab_sys_setresgid" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage long sys_setresgid(gid_t, gid_t, gid_t);
--_EOF
++
++
++fi
++
 +  cr_result=$cr_cv_kconfig_HAVE_INIT_UTSNAME
- 
--    fi
--    cr_result=`echo $cr_cv_ksymtab_sys_setresgid | tr -d 'YN'`
--    if test $cr_result = 0; then
--      cr_result=exported
--      cr_addr=0
--    else
--      cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_setresgid, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
--    fi
++
 +  if test $cr_result = yes; then
 +    $as_echo "#define HAVE_INIT_UTSNAME 1" >>confdefs.h
- 
--cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_setresgid $cr_addr
--_ACEOF
++
 +     HAVE_INIT_UTSNAME=1
 +  else
 +    $as_echo "#define HAVE_INIT_UTSNAME 0" >>confdefs.h
- 
++
 +     HAVE_INIT_UTSNAME=''
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
- 
--fi
- 
++  fi
++
++
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for expand_files" >&5
--echo $ECHO_N "checking kernel symbol table for expand_files... $ECHO_C" >&6
--  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
--  # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_expand_files+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++
 +
 +
 +
@@ -97827,150 +101884,72 @@
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for system_utsname" >&5
 +$as_echo_n "checking kernel for system_utsname... " >&6; }
 +
-+    if test "${cr_cv_kconfig_HAVE_SYSTEM_UTSNAME+set}" = set; then :
++    if ${cr_cv_kconfig_HAVE_SYSTEM_UTSNAME+:} false; then :
 +  $as_echo_n "(cached) " >&6
- else
- 
--    cr_cv_ksymtab_expand_files=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}expand_files$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_expand_files"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_expand_files\$" >/dev/null ; then
--        cr_cv_ksymtab_expand_files=0
--      fi
- 
- 
-   SAVE_CC=$CC
-@@ -52308,11 +39597,7 @@
-   CC=$KCC
-   CFLAGS=""
-   CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++else
++
++
++
++  SAVE_CC=$CC
++  SAVE_CFLAGS=$CFLAGS
++  SAVE_CPPFLAGS=$CPPFLAGS
++  CC=$KCC
++  CFLAGS=""
++  CPPFLAGS="$KCFLAGS"
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 		 #include <linux/kernel.h>
-@@ -52320,474 +39605,347 @@
- 		   #define FASTCALL(_decl) _decl
- 		 #endif
- 		 #include <linux/types.h>
--
--		#define IN_CONFIGURE 1
--		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
--
++/* end confdefs.h.  */
++
++		 #include <linux/kernel.h>
++		 #ifndef FASTCALL
++		   #define FASTCALL(_decl) _decl
++		 #endif
++		 #include <linux/types.h>
 +		 #include <linux/utsname.h>
- int
- main ()
- {
--int x = sizeof(&expand_files);
++int
++main ()
++{
 +
 +     int x = sizeof(&system_utsname);
 +
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
-   CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_expand_files="Y$cr_cv_ksymtab_expand_files"
++  CC=$SAVE_CC
++	 CFLAGS=$SAVE_CFLAGS
++	 CPPFLAGS=$SAVE_CPPFLAGS
 +	 cr_cv_kconfig_HAVE_SYSTEM_UTSNAME=yes
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--CC=$SAVE_CC
++else
 +  CC=$SAVE_CC
- 	 CFLAGS=$SAVE_CFLAGS
- 	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_expand_files="N$cr_cv_ksymtab_expand_files"
++	 CFLAGS=$SAVE_CFLAGS
++	 CPPFLAGS=$SAVE_CPPFLAGS
 +	 cr_cv_kconfig_HAVE_SYSTEM_UTSNAME=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--    fi
- 
- fi
- 
--  cr_addr=''
--  if test -z "$cr_cv_ksymtab_expand_files"; then
--    cr_result='not found'
--  else
--    if expr "$cr_cv_ksymtab_expand_files" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern int expand_files(struct files_struct *, int);
--_EOF
++
++
++fi
++
 +  cr_result=$cr_cv_kconfig_HAVE_SYSTEM_UTSNAME
- 
--    fi
--    cr_result=`echo $cr_cv_ksymtab_expand_files | tr -d 'YN'`
--    if test $cr_result = 0; then
--      cr_result=exported
--      cr_addr=0
--    else
--      cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(expand_files, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
--    fi
++
 +  if test $cr_result = yes; then
 +    $as_echo "#define HAVE_SYSTEM_UTSNAME 1" >>confdefs.h
- 
--cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_expand_files $cr_addr
--_ACEOF
++
 +     HAVE_SYSTEM_UTSNAME=1
 +  else
 +    $as_echo "#define HAVE_SYSTEM_UTSNAME 0" >>confdefs.h
- 
++
 +     HAVE_SYSTEM_UTSNAME=''
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
- 
- 
++  fi
++
++
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5
 +$as_echo "$cr_result" >&6; }
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for __flush_icache_range" >&5
--echo $ECHO_N "checking kernel symbol table for __flush_icache_range... $ECHO_C" >&6
--  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
--  # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab___flush_icache_range+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
- 
--    cr_cv_ksymtab___flush_icache_range=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__flush_icache_range$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab___flush_icache_range"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab___flush_icache_range\$" >/dev/null ; then
--        cr_cv_ksymtab___flush_icache_range=0
--      fi
++
++
 +if test -z "${HAVE_INIT_UTSNAME}${HAVE_SYSTEM_UTSNAME}"; then
- 
++
 +  cat >confcache <<\_ACEOF
 +# This file is a shell script that caches the results of configure
 +# tests run on this system so they can be shared between configure
@@ -97984,66 +101963,9 @@
 +# `ac_cv_env_foo' variables (set or unset) will be overridden when
 +# loading this file, other *unset* `ac_cv_foo' will be assigned the
 +# following values.
- 
--  SAVE_CC=$CC
--  SAVE_CFLAGS=$CFLAGS
--  SAVE_CPPFLAGS=$CPPFLAGS
--  CC=$KCC
--  CFLAGS=""
--  CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--		 #include <linux/kernel.h>
--		 #ifndef FASTCALL
--		   #define FASTCALL(_decl) _decl
--		 #endif
--		 #include <linux/types.h>
--
--		#define IN_CONFIGURE 1
--		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
- 
--int
--main ()
--{
--int x = sizeof(&__flush_icache_range);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  CC=$SAVE_CC
--	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab___flush_icache_range="Y$cr_cv_ksymtab___flush_icache_range"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++
++_ACEOF
++
 +# The following way of writing the cache mishandles newlines in values,
 +# but we know of no workaround that is simple, portable, and efficient.
 +# So, we kill variables containing newlines.
@@ -98065,11 +101987,7 @@
 +      esac ;;
 +    esac
 +  done
- 
--CC=$SAVE_CC
--	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab___flush_icache_range="N$cr_cv_ksymtab___flush_icache_range"
++
 +  (set) 2>&1 |
 +    case $as_nl`(ac_space=' '; set) 2>&1` in #(
 +    *${as_nl}ac_space=\ *)
@@ -98096,19 +102014,28 @@
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
 +  else
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
 +  fi
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
 +rm -f confcache
- 
--    fi
++
 +  echo "======================================================================"
 +  echo "Please review the following configuration information:"
 +  echo "  Kernel source directory = $LINUX_SRC"
@@ -98119,46 +102046,18 @@
 +  echo "======================================================================"
 +
 +   as_fn_error $? "Unable to use kernel $LINUX_VER - unable to determine how to query UTSNAME" "$LINENO" 5
- 
- fi
- 
--  cr_addr=''
--  if test -z "$cr_cv_ksymtab___flush_icache_range"; then
--    cr_result='not found'
--  else
--    if expr "$cr_cv_ksymtab___flush_icache_range" : N >/dev/null; then
--      { { echo "$as_me:$LINENO: error: Found symbol __flush_icache_range but no declaration -- please file a bug report." >&5
--echo "$as_me: error: Found symbol __flush_icache_range but no declaration -- please file a bug report." >&2;}
--   { (exit 1); exit 1; }; }
--    fi
--    cr_result=`echo $cr_cv_ksymtab___flush_icache_range | tr -d 'YN'`
--    if test $cr_result = 0; then
--      cr_result=exported
--      cr_addr=0
--    else
--      cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(__flush_icache_range, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
--    fi
- 
- cat >>confdefs.h <<_ACEOF
--#define CR_KCODE___flush_icache_range $cr_addr
++
++fi
++
++
++cat >>confdefs.h <<_ACEOF
 +#define BLCR_CONFIG_TIMESTAMP "`date`"
- _ACEOF
- 
--  fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
- 
++_ACEOF
++
++
 +fi # cr_build_modules
- 
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for sys_link" >&5
--echo $ECHO_N "checking kernel symbol table for sys_link... $ECHO_C" >&6
--  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
--  # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_sys_link+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++
++
 +if test x"$cr_build_libcr" = xyes && expr $CR_ARCH : ppc >/dev/null; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for work around for bug 2524" >&5
 +$as_echo_n "checking for work around for bug 2524... " >&6; }
@@ -98170,107 +102069,41 @@
 +  case "$force_bug2524" in
 +    yes|no) ;; # nothing to do
 +    '') force_bug2524=no ;; # empty is no
-+    *) as_fn_error $? "Argument to --with-bug2524 must be 'yes', 'no' or empty" "$LINENO" 5  ;;
++    *) as_fn_error $? "Argument to --with-bug2524 must be 'yes', 'no' or empty" "$LINENO" 5 ;;
 +  esac
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $force_bug2524" >&5
 +$as_echo "$force_bug2524" >&6; }
- 
--    cr_cv_ksymtab_sys_link=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_link$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_sys_link"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_sys_link\$" >/dev/null ; then
--        cr_cv_ksymtab_sys_link=0
--      fi
++
 +  if test x$force_bug2524 = xyes; then
 +    $as_echo "#define CR_HAVE_BUG2524 1" >>confdefs.h
- 
++
 +  else
 +    $as_echo "#define CR_HAVE_BUG2524 0" >>confdefs.h
- 
--  SAVE_CC=$CC
--  SAVE_CFLAGS=$CFLAGS
--  SAVE_CPPFLAGS=$CPPFLAGS
--  CC=$KCC
--  CFLAGS=""
--  CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
 +  fi
- 
--		 #include <linux/kernel.h>
--		 #ifndef FASTCALL
--		   #define FASTCALL(_decl) _decl
--		 #endif
--		 #include <linux/types.h>
- 
--		#define IN_CONFIGURE 1
--		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
++
++
 +fi
- 
--int
--main ()
--{
--int x = sizeof(&sys_link);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  CC=$SAVE_CC
--	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_link="Y$cr_cv_ksymtab_sys_link"
++
 +################################################################################
 +# AM_CONDITIONAL may not be called contitionally, so these go here
 +################################################################################
 + if echo $LINUX_SYMTAB_CMD | grep ^cat >/dev/null 2>&1; then
 +  CR_HAVE_SYSTEM_MAP_TRUE=
 +  CR_HAVE_SYSTEM_MAP_FALSE='#'
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
 +  CR_HAVE_SYSTEM_MAP_TRUE='#'
 +  CR_HAVE_SYSTEM_MAP_FALSE=
 +fi
- 
--CC=$SAVE_CC
--	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_sys_link="N$cr_cv_ksymtab_sys_link"
++
 + if test x$cr_build_util$cross_compiling = xyesno; then
 +  CR_BUILD_MAN_TRUE=
 +  CR_BUILD_MAN_FALSE='#'
 +else
 +  CR_BUILD_MAN_TRUE='#'
 +  CR_BUILD_MAN_FALSE=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--    fi
++fi
++
 + if test x$cr_have_ftb = xyes; then
 +  CR_HAVE_FTB_TRUE=
 +  CR_HAVE_FTB_FALSE='#'
@@ -98278,69 +102111,34 @@
 +  CR_HAVE_FTB_TRUE='#'
 +  CR_HAVE_FTB_FALSE=
 +fi
- 
++
 + if test "x$CXX" != xno; then
 +  CR_HAVE_CXX_TRUE=
 +  CR_HAVE_CXX_FALSE='#'
 +else
 +  CR_HAVE_CXX_TRUE='#'
 +  CR_HAVE_CXX_FALSE=
- fi
- 
--  cr_addr=''
--  if test -z "$cr_cv_ksymtab_sys_link"; then
--    cr_result='not found'
--  else
--    if expr "$cr_cv_ksymtab_sys_link" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern asmlinkage long sys_link(const char *oldname, const char *newname);
--_EOF
- 
--    fi
--    cr_result=`echo $cr_cv_ksymtab_sys_link | tr -d 'YN'`
--    if test $cr_result = 0; then
--      cr_result=exported
--      cr_addr=0
--    else
--      cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(sys_link, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
--    fi
++fi
++
++
 +################################################################################
 +# Automake sillyness
 +################################################################################
 +GMAKE_IFEQ=ifeq
- 
--cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_sys_link $cr_addr
--_ACEOF
++
 +GMAKE_IFNEQ=ifneq
- 
--  fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
++
 +GMAKE_ELSE=else
- 
++
 +GMAKE_ENDIF=endif
- 
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for lookup_create" >&5
--echo $ECHO_N "checking kernel symbol table for lookup_create... $ECHO_C" >&6
--  # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate
--  # if a declaration was found or not, and the address or 0 as the rest.
--    if test "${cr_cv_ksymtab_lookup_create+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++
++
 +################################################################################
 +# Kbuild glue
 +################################################################################
 +KBUILD_MAK="${TOP_BUILDDIR}/config/kbuild.mak"
- 
--    cr_cv_ksymtab_lookup_create=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}lookup_create$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_lookup_create"; then
--      if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_lookup_create\$" >/dev/null ; then
--        cr_cv_ksymtab_lookup_create=0
--      fi
- 
++
++
 +################################################################################
 +# Enable/disable building various pieces of the code
 +################################################################################
@@ -98351,19 +102149,7 @@
 +  BUILD_CR_INFO_TRUE='#'
 +  BUILD_CR_INFO_FALSE=
 +fi
- 
--  SAVE_CC=$CC
--  SAVE_CFLAGS=$CFLAGS
--  SAVE_CPPFLAGS=$CPPFLAGS
--  CC=$KCC
--  CFLAGS=""
--  CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
 + if false; then
 +  BUILD_VMADLIB_TRUE=
 +  BUILD_VMADLIB_FALSE='#'
@@ -98371,12 +102157,7 @@
 +  BUILD_VMADLIB_TRUE='#'
 +  BUILD_VMADLIB_FALSE=
 +fi
- 
--		 #include <linux/kernel.h>
--		 #ifndef FASTCALL
--		   #define FASTCALL(_decl) _decl
--		 #endif
--		 #include <linux/types.h>
++
 + if test x$cr_build_modules = xyes; then
 +  CR_BUILD_MODULES_TRUE=
 +  CR_BUILD_MODULES_FALSE='#'
@@ -98384,9 +102165,7 @@
 +  CR_BUILD_MODULES_TRUE='#'
 +  CR_BUILD_MODULES_FALSE=
 +fi
- 
--		#define IN_CONFIGURE 1
--		#include "${TOP_SRCDIR}/include/blcr_imports.h.in"
++
 + if test x$cr_build_util = xyes; then
 +  CR_BUILD_UTIL_TRUE=
 +  CR_BUILD_UTIL_FALSE='#'
@@ -98394,65 +102173,23 @@
 +  CR_BUILD_UTIL_TRUE='#'
 +  CR_BUILD_UTIL_FALSE=
 +fi
- 
--int
--main ()
--{
--int x = sizeof(&lookup_create);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  CC=$SAVE_CC
--	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_lookup_create="Y$cr_cv_ksymtab_lookup_create"
++
 + if test x$cr_build_libcr = xyes; then
 +  CR_BUILD_LIBCR_TRUE=
 +  CR_BUILD_LIBCR_FALSE='#'
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
 +  CR_BUILD_LIBCR_TRUE='#'
 +  CR_BUILD_LIBCR_FALSE=
 +fi
- 
--CC=$SAVE_CC
--	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_ksymtab_lookup_create="N$cr_cv_ksymtab_lookup_create"
++
 + if test x$cr_build_include = xyes; then
 +  CR_BUILD_INCLUDE_TRUE=
 +  CR_BUILD_INCLUDE_FALSE='#'
 +else
 +  CR_BUILD_INCLUDE_TRUE='#'
 +  CR_BUILD_INCLUDE_FALSE=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--    fi
++fi
++
 + if test x$cr_build_tests = xyes; then
 +  CR_BUILD_TESTS_TRUE=
 +  CR_BUILD_TESTS_FALSE='#'
@@ -98460,43 +102197,35 @@
 +  CR_BUILD_TESTS_TRUE='#'
 +  CR_BUILD_TESTS_FALSE=
 +fi
- 
++
 + if test x$cr_build_examples = xyes; then
 +  CR_BUILD_EXAMPLES_TRUE=
 +  CR_BUILD_EXAMPLES_FALSE='#'
-+else
+ else
 +  CR_BUILD_EXAMPLES_TRUE='#'
 +  CR_BUILD_EXAMPLES_FALSE=
- fi
++fi
  
--  cr_addr=''
--  if test -z "$cr_cv_ksymtab_lookup_create"; then
--    cr_result='not found'
--  else
--    if expr "$cr_cv_ksymtab_lookup_create" : N >/dev/null; then
--      cat >>$CR_KSYM_IMPORT_DECLS <<_EOF
--extern struct dentry *lookup_create(struct nameidata *, int);
--_EOF
+-    cr_cv_ksymtab_exp_register_chrdev=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}register_chrdev$/ {s/ .*//p;q;}"`
+-    if test -n "$cr_cv_ksymtab_exp_register_chrdev" && eval $LINUX_SYMTAB_CMD | grep " __ksymtab_register_chrdev\$" >/dev/null; then
+-      : # keep it
+-    else
+-      cr_cv_ksymtab_exp_register_chrdev=''
+-    fi
 + if test x$cr_build_contrib = xyes; then
 +  CR_BUILD_CONTRIB_TRUE=
 +  CR_BUILD_CONTRIB_FALSE='#'
 +else
 +  CR_BUILD_CONTRIB_TRUE='#'
 +  CR_BUILD_CONTRIB_FALSE=
-+fi
+ fi
  
--    fi
--    cr_result=`echo $cr_cv_ksymtab_lookup_create | tr -d 'YN'`
--    if test $cr_result = 0; then
--      cr_result=exported
--      cr_addr=0
--    else
--      cr_addr="0x$cr_result"
--      echo "_CR_IMPORT_KCODE(lookup_create, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS
--    fi
+-  if test -n "$cr_cv_ksymtab_exp_register_chrdev"; then
+-    cr_result="$cr_cv_ksymtab_exp_register_chrdev"
+-    cr_addr="0x$cr_cv_ksymtab_exp_register_chrdev"
  
 -cat >>confdefs.h <<_ACEOF
--#define CR_KCODE_lookup_create $cr_addr
+-#define CR_EXPORTED_KCODE_register_chrdev $cr_addr
 -_ACEOF
 +################################################################################
 +# Finally generate the files and a report (unless supressed)
@@ -98504,6 +102233,9 @@
 +if test x"$cr_build_modules" = xyes; then
 +  ac_config_files="$ac_config_files cr_module/Makefile cr_module/kbuild/Makefile vmadump4/Makefile include/blcr_imports.h blcr_imports/imports.c blcr_imports/Makefile blcr_imports/kbuild/Makefile config/kbuild.mak"
  
+-  else
+-    cr_result='not found'
+-    cr_addr=0
 -  fi
 -    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
@@ -98511,6 +102243,7 @@
 +if test x"$cr_build_util" = xyes; then
 +  ac_config_files="$ac_config_files util/Makefile util/cr_checkpoint/Makefile util/cr_restart/Makefile util/cr_run/Makefile util/cr_info/Makefile man/Makefile"
  
+-if test "$cr_addr" = "0"; then
 +fi
 +if test x"$cr_build_libcr" = xyes; then
 +  ac_config_files="$ac_config_files libcr/Makefile"
@@ -98519,49 +102252,36 @@
 +if test x"$cr_build_tests" = xyes; then
 +  ac_config_files="$ac_config_files tests/Makefile"
  
--# CODE & DATA used for sanity checks
--#
--# Unless you are adding additional sanity checks, there is
--# no good reason to add more calls to CR_FIND_EXPORTED_KSYM.
--#
--# register_{chr,blk}dev are used at module load to validate
--# the System.map used to locate symbols and configure time.
 +  ac_config_files="$ac_config_files tests/shellinit"
  
+-  echo "$as_me:$LINENO: checking kernel symbol table for exported __register_chrdev" >&5
+-echo $ECHO_N "checking kernel symbol table for exported __register_chrdev... $ECHO_C" >&6
+-    if test "${cr_cv_ksymtab_exp___register_chrdev+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 +fi
 +if test x"$cr_build_examples" = xyes; then
 +  ac_config_files="$ac_config_files examples/Makefile examples/counting/Makefile examples/pthread_counting/Makefile examples/pthread_misc/Makefile examples/file_counting/Makefile examples/io_bench/Makefile examples/pipe_counting/Makefile"
  
-+fi
-+if test x"$cr_build_contrib" = xyes; then
-+  ac_config_files="$ac_config_files contrib/Makefile"
- 
--  echo "$as_me:$LINENO: checking kernel symbol table for exported register_chrdev" >&5
--echo $ECHO_N "checking kernel symbol table for exported register_chrdev... $ECHO_C" >&6
--    if test "${cr_cv_ksymtab_exp_register_chrdev+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+  ac_config_files="$ac_config_files contrib/cr_insmod"
- 
--    cr_cv_ksymtab_exp_register_chrdev=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}register_chrdev$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_exp_register_chrdev" && eval $LINUX_SYMTAB_CMD | grep " __ksymtab_register_chrdev\$" >/dev/null; then
+-    cr_cv_ksymtab_exp___register_chrdev=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__register_chrdev$/ {s/ .*//p;q;}"`
+-    if test -n "$cr_cv_ksymtab_exp___register_chrdev" && eval $LINUX_SYMTAB_CMD | grep " __ksymtab___register_chrdev\$" >/dev/null; then
 -      : # keep it
 -    else
--      cr_cv_ksymtab_exp_register_chrdev=''
+-      cr_cv_ksymtab_exp___register_chrdev=''
 -    fi
--fi
-+  ac_config_files="$ac_config_files contrib/gen_cscope"
+ fi
++if test x"$cr_build_contrib" = xyes; then
++  ac_config_files="$ac_config_files contrib/Makefile"
  
--  if test -n "$cr_cv_ksymtab_exp_register_chrdev"; then
--    cr_result="$cr_cv_ksymtab_exp_register_chrdev"
--    cr_addr="0x$cr_cv_ksymtab_exp_register_chrdev"
-+  ac_config_files="$ac_config_files contrib/batch_build"
+-  if test -n "$cr_cv_ksymtab_exp___register_chrdev"; then
+-    cr_result="$cr_cv_ksymtab_exp___register_chrdev"
+-    cr_addr="0x$cr_cv_ksymtab_exp___register_chrdev"
++  ac_config_files="$ac_config_files contrib/cr_insmod"
  
 -cat >>confdefs.h <<_ACEOF
--#define CR_EXPORTED_KCODE_register_chrdev $cr_addr
+-#define CR_EXPORTED_KCODE___register_chrdev $cr_addr
 -_ACEOF
-+fi
-+ac_config_headers="$ac_config_headers blcr_config.h"
++  ac_config_files="$ac_config_files contrib/gen_cscope"
  
 -  else
 -    cr_result='not found'
@@ -98569,16 +102289,21 @@
 -  fi
 -    echo "$as_me:$LINENO: result: $cr_result" >&5
 -echo "${ECHO_T}$cr_result" >&6
-+ac_config_files="$ac_config_files Makefile etc/Makefile rpm/Makefile rpm/specfile include/Makefile include/blcr_common.h doc/Makefile"
++  ac_config_files="$ac_config_files contrib/batch_build"
  
--if test "$cr_addr" = "0"; then
+-  if test "$cr_addr" = "0"; then
++fi
++ac_config_headers="$ac_config_headers blcr_config.h"
  
 -  cat >confcache <<\_ACEOF
++ac_config_files="$ac_config_files Makefile etc/Makefile rpm/Makefile rpm/specfile include/Makefile include/blcr_common.h doc/Makefile"
++
++
 +cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
  # scripts and configure runs, see configure's option --config-cache.
-@@ -52805,2410 +39963,2754 @@
+@@ -56962,2409 +42935,2791 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -98641,14 +102366,26 @@
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -98668,9 +102405,14 @@
 +test "x$prefix" = xNONE && prefix=$ac_default_prefix
 +# Let make expand exec_prefix.
 +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - kernel does not export register_chrdev or __register_chrdev" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - kernel does not export register_chrdev or __register_chrdev" >&2;}
+-   { (exit 1); exit 1; }; }
 +DEFS=-DHAVE_CONFIG_H
-+
+ 
+-  fi
+-fi
 +ac_libobjs=
 +ac_ltlibobjs=
 +U=
@@ -98684,21 +102426,32 @@
 +  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 +done
 +LIBOBJS=$ac_libobjs
-+
+ 
 +LTLIBOBJS=$ac_ltlibobjs
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - kernel does not export register_chrdev" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - kernel does not export register_chrdev" >&2;}
--   { (exit 1); exit 1; }; }
  
+-  echo "$as_me:$LINENO: checking kernel symbol table for exported register_blkdev" >&5
+-echo $ECHO_N "checking kernel symbol table for exported register_blkdev... $ECHO_C" >&6
+-    if test "${cr_cv_ksymtab_exp_register_blkdev+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 + if test -n "$EXEEXT"; then
 +  am__EXEEXT_TRUE=
 +  am__EXEEXT_FALSE='#'
-+else
+ else
+-
+-    cr_cv_ksymtab_exp_register_blkdev=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}register_blkdev$/ {s/ .*//p;q;}"`
+-    if test -n "$cr_cv_ksymtab_exp_register_blkdev" && eval $LINUX_SYMTAB_CMD | grep " __ksymtab_register_blkdev\$" >/dev/null; then
+-      : # keep it
+-    else
+-      cr_cv_ksymtab_exp_register_blkdev=''
+-    fi
 +  am__EXEEXT_TRUE='#'
 +  am__EXEEXT_FALSE=
-+fi
-+
+ fi
+ 
+-  if test -n "$cr_cv_ksymtab_exp_register_blkdev"; then
+-    cr_result="$cr_cv_ksymtab_exp_register_blkdev"
+-    cr_addr="0x$cr_cv_ksymtab_exp_register_blkdev"
 +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
 +  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -98763,10 +102516,6 @@
 +  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
 +fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
 +if test -z "${CR_BUILD_LIBCR32_TRUE}" && test -z "${CR_BUILD_LIBCR32_FALSE}"; then
 +  as_fn_error $? "conditional \"CR_BUILD_LIBCR32\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -98822,9 +102571,12 @@
 +if test -z "${CR_BUILD_CONTRIB_TRUE}" && test -z "${CR_BUILD_CONTRIB_FALSE}"; then
 +  as_fn_error $? "conditional \"CR_BUILD_CONTRIB\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
++fi
  
-+: ${CONFIG_STATUS=./config.status}
+-cat >>confdefs.h <<_ACEOF
+-#define CR_EXPORTED_KCODE_register_blkdev $cr_addr
+-_ACEOF
++: "${CONFIG_STATUS=./config.status}"
 +ac_write_fail=0
 +ac_clean_files_save=$ac_clean_files
 +ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -98837,11 +102589,18 @@
 +# Run this file to recreate the current configuration.
 +# Compiler output produced by configure, useful for debugging
 +# configure, is in config.log if it exists.
-+
+ 
+-  else
+-    cr_result='not found'
+-    cr_addr=0
+-  fi
+-    echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 +debug=false
 +ac_cs_recheck=false
 +ac_cs_silent=false
  
+-if test "$cr_addr" = "0"; then
 +SHELL=\${CONFIG_SHELL-$SHELL}
 +export SHELL
 +_ASEOF
@@ -98850,10 +102609,19 @@
 +## M4sh Initialization. ##
 +## -------------------- ##
  
--  echo "$as_me:$LINENO: checking kernel symbol table for exported register_blkdev" >&5
--echo $ECHO_N "checking kernel symbol table for exported register_blkdev... $ECHO_C" >&6
--    if test "${cr_cv_ksymtab_exp_register_blkdev+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  cat >confcache <<\_ACEOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
+-#
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
+-#
+-# `ac_cv_env_foo' variables (set or unset) will be overridden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
 +# Be more Bourne compatible
 +DUALCASE=1; export DUALCASE # for MKS sh
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
@@ -98863,7 +102631,7 @@
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
- else
++else
 +  case `(set -o) 2>/dev/null` in #(
 +  *posix*) :
 +    set -o posix ;; #(
@@ -98872,13 +102640,43 @@
 +esac
 +fi
  
--    cr_cv_ksymtab_exp_register_blkdev=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}register_blkdev$/ {s/ .*//p;q;}"`
--    if test -n "$cr_cv_ksymtab_exp_register_blkdev" && eval $LINUX_SYMTAB_CMD | grep " __ksymtab_register_blkdev\$" >/dev/null; then
--      : # keep it
--    else
--      cr_cv_ksymtab_exp_register_blkdev=''
--    fi
-+
+-_ACEOF
+ 
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-{
+-  (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+-      sed -n \
+-	"s/'/'\\\\''/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
+-    *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+-      ;;
+-    esac;
+-} |
+-  sed '
+-     t clear
+-     : clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
+-  else
+-    echo "not updating unwritable cache $cache_file"
 +as_nl='
 +'
 +export as_nl
@@ -98912,14 +102710,20 @@
 +    '
 +    export as_echo_n_body
 +    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
+   fi
 +  export as_echo_body
 +  as_echo='sh -c $as_echo_body as_echo'
  fi
+-rm -f confcache
  
--  if test -n "$cr_cv_ksymtab_exp_register_blkdev"; then
--    cr_result="$cr_cv_ksymtab_exp_register_blkdev"
--    cr_addr="0x$cr_cv_ksymtab_exp_register_blkdev"
+-  echo "======================================================================"
+-  echo "Please review the following configuration information:"
+-  echo "  Kernel source directory = $LINUX_SRC"
+-  echo "  Kernel build directory = $LINUX_OBJ"
+-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+-  echo "  Kernel version probed from kernel build = $LINUX_VER"
+-  echo "  Kernel running currently = `uname -r`"
+-  echo "======================================================================"
 +# The user is always right.
 +if test "${PATH_SEPARATOR+set}" != set; then
 +  PATH_SEPARATOR=:
@@ -98929,10 +102733,12 @@
 +  }
 +fi
  
--cat >>confdefs.h <<_ACEOF
--#define CR_EXPORTED_KCODE_register_blkdev $cr_addr
--_ACEOF
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - kernel does not export register_blkdev" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - kernel does not export register_blkdev" >&2;}
+-   { (exit 1); exit 1; }; }
  
+-fi
+-# One of {init,system}_utsname is used to validate UTS_RELEASE
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
@@ -98941,6 +102747,7 @@
 +IFS=" ""	$as_nl"
 +
 +# Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
 +case $0 in #((
 +  *[\\/]* ) as_myself=$0 ;;
 +  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -98975,7 +102782,7 @@
 +PS1='$ '
 +PS2='> '
 +PS4='+ '
-+
+ 
 +# NLS nuisances.
 +LC_ALL=C
 +export LC_ALL
@@ -98984,8 +102791,8 @@
 +
 +# CDPATH.
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+
+ 
+ 
 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
 +# ----------------------------------------
 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
@@ -99063,27 +102870,43 @@
 +    as_val=`expr "$@" || test $? -eq 1`
 +  }
 +fi # as_fn_arith
-+
-+
+ 
+-  echo "$as_me:$LINENO: checking kernel for init_utsname" >&5
+-echo $ECHO_N "checking kernel for init_utsname... $ECHO_C" >&6
+ 
+-    if test "${cr_cv_kconfig_HAVE_INIT_UTSNAME+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
 +  as_expr=expr
-+else
+ else
 +  as_expr=false
 +fi
-+
+ 
 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
 +  as_basename=basename
 +else
 +  as_basename=false
 +fi
-+
+ 
 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 +  as_dirname=dirname
 +else
 +  as_dirname=false
 +fi
-+
+ 
+-  SAVE_CC=$CC
+-  SAVE_CFLAGS=$CFLAGS
+-  SAVE_CPPFLAGS=$CPPFLAGS
+-  CC=$KCC
+-  CFLAGS=""
+-  CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 +as_me=`$as_basename -- "$0" ||
 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 +	 X"$0" : 'X\(//\)$' \| \
@@ -99102,7 +102925,15 @@
 +	    q
 +	  }
 +	  s/.*/./; q'`
-+
+ 
+-		 #include <linux/kernel.h>
+-		 #ifndef FASTCALL
+-		   #define FASTCALL(_decl) _decl
+-		 #endif
+-		 #include <linux/types.h>
+-		 #include <linux/utsname.h>
+-int
+-main ()
 +# Avoid depending upon Character Ranges.
 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -99141,41 +102972,28 @@
 +      as_ln_s='cp -p'
 +  elif ln conf$$.file conf$$ 2>/dev/null; then
 +    as_ln_s=ln
-   else
--    cr_result='not found'
--    cr_addr=0
++  else
 +    as_ln_s='cp -p'
-   fi
--    echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
++  fi
 +else
 +  as_ln_s='cp -p'
 +fi
 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 +rmdir conf$$.dir 2>/dev/null
- 
--if test "$cr_addr" = "0"; then
- 
--  cat >confcache <<\_ACEOF
--# This file is a shell script that caches the results of configure
--# tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
--#
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
--#
--# `ac_cv_env_foo' variables (set or unset) will be overridden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
++
++
 +# as_fn_mkdir_p
 +# -------------
 +# Create "$as_dir" as a directory, including parents if necessary.
 +as_fn_mkdir_p ()
-+{
+ {
  
--_ACEOF
+-   #ifdef init_utsname
+-     /* OK, it exists and is a macro */
+-   #else
+-     /* Check for function case */
+-     int x = sizeof(&init_utsname);
+-   #endif
 +  case $as_dir in #(
 +  -*) as_dir=./$as_dir;;
 +  esac
@@ -99215,57 +103033,59 @@
 +    test -z "$as_dirs" || eval "mkdir $as_dirs"
 +  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
  
--# The following way of writing the cache mishandles newlines in values,
--# but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
--# Ultrix sh set writes to stderr and can't be redirected directly,
--# and sets the high bit in the cache file unless we assign to the vars.
--{
--  (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
--      sed -n \
--	"s/'/'\\\\''/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
--    *)
--      # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--      ;;
--    esac;
--} |
--  sed '
--     t clear
--     : clear
--     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--     t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--    cat confcache >$cache_file
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  CC=$SAVE_CC
+-	 CFLAGS=$SAVE_CFLAGS
+-	 CPPFLAGS=$SAVE_CPPFLAGS
+-	 cr_cv_kconfig_HAVE_INIT_UTSNAME=yes
 +
 +} # as_fn_mkdir_p
 +if mkdir -p . 2>/dev/null; then
 +  as_mkdir_p='mkdir -p "$as_dir"'
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  test -d ./-p && rmdir ./-p
 +  as_mkdir_p=false
 +fi
-+
+ 
+-CC=$SAVE_CC
+-	 CFLAGS=$SAVE_CFLAGS
+-	 CPPFLAGS=$SAVE_CPPFLAGS
+-	 cr_cv_kconfig_HAVE_INIT_UTSNAME=no
 +if test -x / >/dev/null 2>&1; then
 +  as_test_x='test -x'
 +else
 +  if ls -dL / >/dev/null 2>&1; then
 +    as_ls_L_option=L
-   else
--    echo "not updating unwritable cache $cache_file"
++  else
 +    as_ls_L_option=
-   fi
++  fi
 +  as_test_x='
 +    eval sh -c '\''
 +      if test -d "$1"; then
@@ -99279,64 +103099,55 @@
 +    '\'' sh
 +  '
  fi
--rm -f confcache
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +as_executable_p=$as_test_x
  
--  echo "======================================================================"
--  echo "Please review the following configuration information:"
--  echo "  Kernel source directory = $LINUX_SRC"
--  echo "  Kernel build directory = $LINUX_OBJ"
--  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
--  echo "  Kernel version probed from kernel build = $LINUX_VER"
--  echo "  Kernel running currently = `uname -r`"
--  echo "======================================================================"
 +# Sed expression to map a string onto a valid CPP name.
 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
  
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - kernel does not export register_blkdev" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - kernel does not export register_blkdev" >&2;}
--   { (exit 1); exit 1; }; }
+-fi
 +# Sed expression to map a string onto a valid variable name.
 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
--fi
--# One of {init,system}_utsname is used to validate UTS_RELEASE
+-  cr_result=$cr_cv_kconfig_HAVE_INIT_UTSNAME
  
+-  if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_INIT_UTSNAME 1
 +exec 6>&1
 +## ----------------------------------- ##
 +## Main body of $CONFIG_STATUS script. ##
 +## ----------------------------------- ##
 +_ASEOF
 +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
- 
++
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +# Save the log message, to keep $0 and so on meaningful, and to
 +# report actual input values of CONFIG_FILES etc. instead of their
 +# values after options handling.
 +ac_log="
-+This file was extended by blcr $as_me 0.8.2, which was
-+generated by GNU Autoconf 2.67.  Invocation command line was
- 
++This file was extended by blcr $as_me 0.8.4, which was
++generated by GNU Autoconf 2.68.  Invocation command line was
++
 +  CONFIG_FILES    = $CONFIG_FILES
 +  CONFIG_HEADERS  = $CONFIG_HEADERS
 +  CONFIG_LINKS    = $CONFIG_LINKS
 +  CONFIG_COMMANDS = $CONFIG_COMMANDS
 +  $ $0 $@
- 
--  echo "$as_me:$LINENO: checking kernel for init_utsname" >&5
--echo $ECHO_N "checking kernel for init_utsname... $ECHO_C" >&6
++
 +on `(hostname || uname -n) 2>/dev/null | sed 1q`
 +"
++
+ _ACEOF
  
--    if test "${cr_cv_kconfig_HAVE_INIT_UTSNAME+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+_ACEOF
- 
+-     HAVE_INIT_UTSNAME=1
+-  else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_INIT_UTSNAME 0
 +case $ac_config_files in *"
 +"*) set x $ac_config_files; shift; ac_config_files=$*;;
 +esac
- 
++
 +case $ac_config_headers in *"
 +"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
 +esac
@@ -99347,43 +103158,21 @@
 +config_files="$ac_config_files"
 +config_headers="$ac_config_headers"
 +config_commands="$ac_config_commands"
- 
--  SAVE_CC=$CC
--  SAVE_CFLAGS=$CFLAGS
--  SAVE_CPPFLAGS=$CPPFLAGS
--  CC=$KCC
--  CFLAGS=""
--  CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
++
  _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
  
--		 #include <linux/kernel.h>
--		 #ifndef FASTCALL
--		   #define FASTCALL(_decl) _decl
--		 #endif
--		 #include <linux/types.h>
--		 #include <linux/utsname.h>
--int
--main ()
--{
+-     HAVE_INIT_UTSNAME=''
+-  fi
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +ac_cs_usage="\
 +\`$as_me' instantiates files and other configuration actions
 +from templates according to the current configuration.  Unless the files
 +and actions are specified as TAGs, all are instantiated by default.
  
--   #ifdef init_utsname
--     /* OK, it exists and is a macro */
--   #else
--     /* Check for function case */
--     int x = sizeof(&init_utsname);
--   #endif
 +Usage: $0 [OPTION]... [TAG]...
-+
+ 
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
 +  -h, --help       print this help, then exit
 +  -V, --version    print version number and configuration settings, then exit
 +      --config     print configuration, then exit
@@ -99395,68 +103184,35 @@
 +                   instantiate the configuration file FILE
 +      --header=FILE[:TEMPLATE]
 +                   instantiate the configuration header FILE
-+
+ 
 +Configuration files:
 +$config_files
-+
+ 
 +Configuration headers:
 +$config_headers
-+
+ 
 +Configuration commands:
 +$config_commands
-+
+ 
 +Report bugs to <http://ftg.lbl.gov/checkpoint>."
  
--  ;
--  return 0;
--}
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  CC=$SAVE_CC
--	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_INIT_UTSNAME=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++_ACEOF
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 +ac_cs_version="\\
-+blcr config.status 0.8.2
-+configured by $0, generated by GNU Autoconf 2.67,
++blcr config.status 0.8.4
++configured by $0, generated by GNU Autoconf 2.68,
 +  with options \\"\$ac_cs_config\\"
  
--CC=$SAVE_CC
--	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_INIT_UTSNAME=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  echo "$as_me:$LINENO: checking kernel for system_utsname" >&5
+-echo $ECHO_N "checking kernel for system_utsname... $ECHO_C" >&6
 +Copyright (C) 2010 Free Software Foundation, Inc.
 +This config.status script is free software; the Free Software Foundation
 +gives unlimited permission to copy, distribute and modify it."
-+
+ 
+-    if test "${cr_cv_kconfig_HAVE_SYSTEM_UTSNAME+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 +ac_pwd='$ac_pwd'
 +srcdir='$srcdir'
 +INSTALL='$INSTALL'
@@ -99464,7 +103220,7 @@
 +AWK='$AWK'
 +test -n "\$AWK" || AWK=awk
 +_ACEOF
-+
+ 
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +# The default lists apply if the user does not specify any file.
 +ac_need_defaults=:
@@ -99487,7 +103243,7 @@
 +    ac_shift=shift
 +    ;;
 +  esac
-+
+ 
 +  case $ac_option in
 +  # Handling of the options.
 +  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
@@ -99533,16 +103289,26 @@
 +  esac
 +  shift
 +done
- 
++
 +ac_configure_extra_args=
- 
++
 +if $ac_cs_silent; then
 +  exec 6>/dev/null
 +  ac_configure_extra_args="$ac_configure_extra_args --silent"
- fi
++fi
  
--  cr_result=$cr_cv_kconfig_HAVE_INIT_UTSNAME
-+_ACEOF
+-  SAVE_CC=$CC
+-  SAVE_CFLAGS=$CFLAGS
+-  SAVE_CPPFLAGS=$CPPFLAGS
+-  CC=$KCC
+-  CFLAGS=""
+-  CPPFLAGS="$KCFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +if \$ac_cs_recheck; then
 +  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
@@ -99553,13 +103319,18 @@
 +  exec "\$@"
 +fi
  
--  if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_INIT_UTSNAME 1
- _ACEOF
+-		 #include <linux/kernel.h>
+-		 #ifndef FASTCALL
+-		   #define FASTCALL(_decl) _decl
+-		 #endif
+-		 #include <linux/types.h>
+-		 #include <linux/utsname.h>
+-int
+-main ()
++_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +exec 5>>config.log
-+{
+ {
 +  echo
 +  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 +## Running $as_me. ##
@@ -99567,207 +103338,257 @@
 +  $as_echo "$ac_log"
 +} >&5
  
--     HAVE_INIT_UTSNAME=1
--  else
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_INIT_UTSNAME 0
+-     int x = sizeof(&system_utsname);
+-
+-  ;
+-  return 0;
+-}
  _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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
+-  CC=$SAVE_CC
+-	 CFLAGS=$SAVE_CFLAGS
+-	 CPPFLAGS=$SAVE_CPPFLAGS
+-	 cr_cv_kconfig_HAVE_SYSTEM_UTSNAME=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +#
 +# INIT-COMMANDS
 +#
 +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
--     HAVE_INIT_UTSNAME=''
--  fi
- 
++
++
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
++
 +sed_quote_subst='$sed_quote_subst'
 +double_quote_subst='$double_quote_subst'
 +delay_variable_subst='$delay_variable_subst'
-+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
-+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
-+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
-+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
++macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
++enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
++pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
++enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
++SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
++ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
++host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
++host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
++host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
++build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
++build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
++build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
++SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
++Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
++GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
++EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
++FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
++LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
++NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
++LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
++max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
++ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
++exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
++lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
++lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
++lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
++reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
++reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
++OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
++deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
++file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
++AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
++AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
++STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
++RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
++old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
++old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
++old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
++lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
++CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
++CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
++compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
++GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
++objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
++MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
++need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
++DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
++NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
++LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
++OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
++OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
++libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
++shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
++extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
++archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
++export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
++whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
++compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
++old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
++archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
++archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
++module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
++module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
++with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
++allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
++no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
++hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
++hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
++hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
++hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
++hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
++inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
++link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
++always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
++export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
++exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
++include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
++prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
++file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
++variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
++need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
++need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
++version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
++runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
++shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
++shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
++libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
++library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
++soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
++install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
++postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
++postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
++finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
++finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
++hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
++sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
++sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
++hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
++enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
++enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
++enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
++old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
++striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
++compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
++predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
++postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
++predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
++postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
++compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
++LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
++reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
++reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
++GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
++archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
++export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
++whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
++compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
++old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
++allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
++no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
++inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
++link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
++always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
++export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
++include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
++prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
++compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
++predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
++postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
++predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
++postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
++compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
 +
 +LTCC='$LTCC'
 +LTCFLAGS='$LTCFLAGS'
 +compiler='$compiler_DEFAULT'
 +
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
++{
++  eval 'cat <<_LTECHO_EOF
++\$1
++_LTECHO_EOF'
++}
++
 +# Quote evaled strings.
-+for var in SED \
++for var in SHELL \
++ECHO \
++SED \
 +GREP \
 +EGREP \
 +FGREP \
@@ -99780,8 +103601,13 @@
 +OBJDUMP \
 +deplibs_check_method \
 +file_magic_cmd \
++file_magic_glob \
++want_nocaseglob \
++DLLTOOL \
++sharedlib_from_linklib_cmd \
 +AR \
 +AR_FLAGS \
++archiver_list_spec \
 +STRIP \
 +RANLIB \
 +CC \
@@ -99791,14 +103617,14 @@
 +lt_cv_sys_global_symbol_to_cdecl \
 +lt_cv_sys_global_symbol_to_c_name_address \
 +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-+SHELL \
-+ECHO \
++nm_file_list_spec \
 +lt_prog_compiler_no_builtin_flag \
-+lt_prog_compiler_wl \
 +lt_prog_compiler_pic \
++lt_prog_compiler_wl \
 +lt_prog_compiler_static \
 +lt_cv_prog_compiler_c_o \
 +need_locks \
++MANIFEST_TOOL \
 +DSYMUTIL \
 +NMEDIT \
 +LIPO \
@@ -99814,7 +103640,6 @@
 +hardcode_libdir_flag_spec \
 +hardcode_libdir_flag_spec_ld \
 +hardcode_libdir_separator \
-+fix_srcfile_path \
 +exclude_expsyms \
 +include_expsyms \
 +file_list_spec \
@@ -99822,6 +103647,7 @@
 +libname_spec \
 +library_names_spec \
 +soname_spec \
++install_override_mode \
 +finish_eval \
 +old_striplib \
 +striplib \
@@ -99832,10 +103658,11 @@
 +postdeps \
 +compiler_lib_search_path \
 +LD_CXX \
++reload_flag_CXX \
 +compiler_CXX \
 +lt_prog_compiler_no_builtin_flag_CXX \
-+lt_prog_compiler_wl_CXX \
 +lt_prog_compiler_pic_CXX \
++lt_prog_compiler_wl_CXX \
 +lt_prog_compiler_static_CXX \
 +lt_cv_prog_compiler_c_o_CXX \
 +export_dynamic_flag_spec_CXX \
@@ -99847,7 +103674,6 @@
 +hardcode_libdir_flag_spec_CXX \
 +hardcode_libdir_flag_spec_ld_CXX \
 +hardcode_libdir_separator_CXX \
-+fix_srcfile_path_CXX \
 +exclude_expsyms_CXX \
 +include_expsyms_CXX \
 +file_list_spec_CXX \
@@ -99857,9 +103683,9 @@
 +predeps_CXX \
 +postdeps_CXX \
 +compiler_lib_search_path_CXX; do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
 +      ;;
 +    *)
 +      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -99867,6 +103693,12 @@
 +    esac
 +done
  
+-CC=$SAVE_CC
+-	 CFLAGS=$SAVE_CFLAGS
+-	 CPPFLAGS=$SAVE_CPPFLAGS
+-	 cr_cv_kconfig_HAVE_SYSTEM_UTSNAME=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +# Double-quote double-evaled strings.
 +for var in reload_cmds \
 +old_postinstall_cmds \
@@ -99881,11 +103713,13 @@
 +module_expsym_cmds \
 +export_symbols_cmds \
 +prelink_cmds \
++postlink_cmds \
 +postinstall_cmds \
 +postuninstall_cmds \
 +finish_cmds \
 +sys_lib_search_path_spec \
 +sys_lib_dlsearch_path_spec \
++reload_cmds_CXX \
 +old_archive_cmds_CXX \
 +old_archive_from_new_cmds_CXX \
 +old_archive_from_expsyms_cmds_CXX \
@@ -99894,10 +103728,11 @@
 +module_cmds_CXX \
 +module_expsym_cmds_CXX \
 +export_symbols_cmds_CXX \
-+prelink_cmds_CXX; do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++prelink_cmds_CXX \
++postlink_cmds_CXX; do
++    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
 +      ;;
 +    *)
 +      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -99905,12 +103740,6 @@
 +    esac
 +done
  
-+# Fix-up fallback echo if it was mangled by the above quoting rules.
-+case \$lt_ECHO in
-+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-+  ;;
-+esac
- 
 +ac_aux_dir='$ac_aux_dir'
 +xsi_shell='$xsi_shell'
 +lt_shell_append='$lt_shell_append'
@@ -99919,48 +103748,53 @@
 +# commands through without removal of \ escapes INIT.
 +if test -n "\${ZSH_VERSION+set}" ; then
 +   setopt NO_GLOB_SUBST
-+fi
-+
-+
+ fi
+ 
+-  cr_result=$cr_cv_kconfig_HAVE_SYSTEM_UTSNAME
+ 
+-  if test $cr_result = yes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYSTEM_UTSNAME 1
+-_ACEOF
 +    PACKAGE='$PACKAGE'
 +    VERSION='$VERSION'
 +    TIMESTAMP='$TIMESTAMP'
 +    RM='$RM'
 +    ofile='$ofile'
  
+-     HAVE_SYSTEM_UTSNAME=1
+-  else
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYSTEM_UTSNAME 0
+-_ACEOF
  
--  echo "$as_me:$LINENO: checking kernel for system_utsname" >&5
--echo $ECHO_N "checking kernel for system_utsname... $ECHO_C" >&6
+-     HAVE_SYSTEM_UTSNAME=''
+-  fi
  
--    if test "${cr_cv_kconfig_HAVE_SYSTEM_UTSNAME+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
  
+-  echo "$as_me:$LINENO: result: $cr_result" >&5
+-echo "${ECHO_T}$cr_result" >&6
  
  
--  SAVE_CC=$CC
--  SAVE_CFLAGS=$CFLAGS
--  SAVE_CPPFLAGS=$CPPFLAGS
--  CC=$KCC
--  CFLAGS=""
--  CPPFLAGS="$KCFLAGS"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
+-if test -z "${HAVE_INIT_UTSNAME}${HAVE_SYSTEM_UTSNAME}"; then
++_ACEOF
  
--		 #include <linux/kernel.h>
--		 #ifndef FASTCALL
--		   #define FASTCALL(_decl) _decl
--		 #endif
--		 #include <linux/types.h>
--		 #include <linux/utsname.h>
--int
--main ()
+-  cat >confcache <<\_ACEOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
+-#
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
+-#
+-# `ac_cv_env_foo' variables (set or unset) will be overridden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+
+ 
+-_ACEOF
 +# Handling of arguments.
 +for ac_config_target in $ac_config_targets
 +do
@@ -100003,8 +103837,13 @@
 +    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
 +    "include/blcr_common.h") CONFIG_FILES="$CONFIG_FILES include/blcr_common.h" ;;
 +    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-+
-+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ 
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
++  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 +  esac
 +done
 +
@@ -100026,10 +103865,38 @@
 +# Note that there is a small window in which the directory will not be cleaned:
 +# after its creation but before its name has been assigned to `$tmp'.
 +$debug ||
-+{
-+  tmp=
+ {
+-  (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+-      sed -n \
+-	"s/'/'\\\\''/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
+-    *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+-      ;;
+-    esac;
+-} |
+-  sed '
+-     t clear
+-     : clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++  tmp= ac_tmp=
 +  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++  : "${ac_tmp:=$tmp}"
++  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 +' 0
 +  trap 'as_fn_exit 1' 1 2 13 15
 +}
@@ -100037,12 +103904,13 @@
 +
 +{
 +  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
++  test -d "$tmp"
 +}  ||
- {
++{
 +  tmp=./conf$$-$RANDOM
 +  (umask 077 && mkdir "$tmp")
 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++ac_tmp=$tmp
 +
 +# Set up the scripts for CONFIG_FILES section.
 +# No need to generate them if there are no CONFIG_FILES.
@@ -100081,13 +103949,13 @@
 +  ac_cs_awk_cr=$ac_cr
 +fi
 +
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 +_ACEOF
 +
 +# Create commands to substitute file output variables.
 +{
 +  echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
-+  echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
++  echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
 +  echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
 +  echo "_ACAWK" &&
 +  echo "_ACEOF"
@@ -100113,14 +103981,29 @@
 +    break
 +  elif $ac_last_try; then
 +    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+  else
+   else
+-    echo "not updating unwritable cache $cache_file"
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
+   fi
+-fi
+-rm -f confcache
+-
+-  echo "======================================================================"
+-  echo "Please review the following configuration information:"
+-  echo "  Kernel source directory = $LINUX_SRC"
+-  echo "  Kernel build directory = $LINUX_OBJ"
+-  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
+-  echo "  Kernel version probed from kernel build = $LINUX_VER"
+-  echo "  Kernel running currently = `uname -r`"
+-  echo "======================================================================"
 +done
 +rm -f conf$$subs.sh
-+
+ 
+-   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to query UTSNAME" >&5
+-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to query UTSNAME" >&2;}
+-   { (exit 1); exit 1; }; }
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 +_ACEOF
 +sed -n '
 +h
@@ -100168,7 +104051,7 @@
 +rm -f conf$$subs.awk
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +_ACAWK
-+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 +  for (key in S) S_is_set[key] = 1
 +  FS = ""
 +  \$ac_cs_awk_pipe_init
@@ -100206,10 +104089,10 @@
 +  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 +else
 +  cat
-+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
 +  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 +_ACEOF
-+
+ 
 +# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
 +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 +# trailing colons and then remove the whole line if VPATH becomes empty
@@ -100231,16 +104114,18 @@
 +s/\n//
 +s/^[^=]*=[	 ]*$//
 +}'
-+fi
-+
+ fi
+ 
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +fi # test -n "$CONFIG_FILES"
-+
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define BLCR_CONFIG_TIMESTAMP "`date`"
 +# Set up the scripts for CONFIG_HEADERS section.
 +# No need to generate them if there are no CONFIG_HEADERS.
 +# This happens for instance with `./config.status Makefile'.
 +if test -n "$CONFIG_HEADERS"; then
-+cat >"$tmp/defines.awk" <<\_ACAWK ||
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 +BEGIN {
 +_ACEOF
 +
@@ -100252,8 +104137,8 @@
 +# handling of long lines.
 +ac_delim='%!_!# '
 +for ac_last_try in false false :; do
-+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-+  if test -z "$ac_t"; then
++  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
++  if test -z "$ac_tt"; then
 +    break
 +  elif $ac_last_try; then
 +    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -100339,12 +104224,13 @@
 +}
 +{ print }
 +_ACAWK
-+_ACEOF
+ _ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 +fi # test -n "$CONFIG_HEADERS"
-+
-+
+ 
+ 
+-fi # cr_build_modules
 +eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
 +shift
 +for ac_tag
@@ -100354,7 +104240,7 @@
 +  esac
 +  case $ac_mode$ac_tag in
 +  :[FHL]*:*);;
-+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
++  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
 +  :[FH]-) ac_tag=-:-;;
 +  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
 +  esac
@@ -100366,7 +104252,6 @@
 +  ac_file=$1
 +  shift
  
--     int x = sizeof(&system_utsname);
 +  case $ac_mode in
 +  :L) ac_source=$1;;
 +  :[FH])
@@ -100374,7 +104259,7 @@
 +    for ac_f
 +    do
 +      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
++      -) ac_f="$ac_tmp/stdin";;
 +      *) # Look for the file first in the build tree, then in the source tree
 +	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 +	 # because $ac_f cannot contain `:'.
@@ -100383,45 +104268,20 @@
 +	   [\\/$]*) false;;
 +	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 +	   esac ||
-+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
++	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
 +      esac
 +      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 +      as_fn_append ac_file_inputs " '$ac_f'"
 +    done
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (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
--  CC=$SAVE_CC
--	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_SYSTEM_UTSNAME=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-if test x"$cr_build_libcr" = xyes && expr $CR_ARCH : ppc >/dev/null; then
+-  echo "$as_me:$LINENO: checking for work around for bug 2524" >&5
+-echo $ECHO_N "checking for work around for bug 2524... $ECHO_C" >&6
+-  if test "$cr_build_modules,$force_bug2524" = "yes,"; then
+-    if test `echo $LINUX_VER | sed -e 's/2.6.\([0-9]*\).*/\1/'` -le 15; then
+-      { { echo "$as_me:$LINENO: error: Because you are building for a PowerPC kernel 2.6.15 or older, you must specify either --with-bug2524 or --without-bug2524.  If in doubt --with-bug2524 is the safe option (with a small performance penalty)." >&5
+-echo "$as_me: error: Because you are building for a PowerPC kernel 2.6.15 or older, you must specify either --with-bug2524 or --without-bug2524.  If in doubt --with-bug2524 is the safe option (with a small performance penalty)." >&2;}
+-   { (exit 1); exit 1; }; }
 +    # Let's still pretend it is `configure' which instantiates (i.e., don't
 +    # use $as_me), people would be surprised to read:
 +    #    /* config.h.  Generated by config.status.  */
@@ -100432,7 +104292,14 @@
 +      configure_input="$ac_file.  $configure_input"
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 +$as_echo "$as_me: creating $ac_file" >&6;}
-+    fi
+     fi
+-  fi
+-  case "$force_bug2524" in
+-    yes|no) ;; # nothing to do
+-    '') force_bug2524=no ;; # empty is no
+-    *) { { echo "$as_me:$LINENO: error: Argument to --with-bug2524 must be 'yes', 'no' or empty" >&5
+-echo "$as_me: error: Argument to --with-bug2524 must be 'yes', 'no' or empty" >&2;}
+-   { (exit 1); exit 1; }; } ;;
 +    # Neutralize special characters interpreted by sed in replacement strings.
 +    case $configure_input in #(
 +    *\&* | *\|* | *\\* )
@@ -100440,20 +104307,19 @@
 +       sed 's/[\\\\&|]/\\\\&/g'`;; #(
 +    *) ac_sed_conf_input=$configure_input;;
 +    esac
- 
--CC=$SAVE_CC
--	 CFLAGS=$SAVE_CFLAGS
--	 CPPFLAGS=$SAVE_CPPFLAGS
--	 cr_cv_kconfig_HAVE_SYSTEM_UTSNAME=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
++    *:-:* | *:-) cat >"$ac_tmp/stdin" \
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
 +    esac
 +    ;;
-+  esac
-+
+   esac
+-  echo "$as_me:$LINENO: result: $force_bug2524" >&5
+-echo "${ECHO_T}$force_bug2524" >&6
+ 
+-  if test x$force_bug2524 = xyes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define CR_HAVE_BUG2524 1
 +  ac_dir=`$as_dirname -- "$ac_file" ||
 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$ac_file" : 'X\(//\)[^/]' \| \
@@ -100479,7 +104345,7 @@
 +	  s/.*/./; q'`
 +  as_dir="$ac_dir"; as_fn_mkdir_p
 +  ac_builddir=.
- 
++
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
@@ -100495,8 +104361,7 @@
 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
 +# for backward compatibility:
 +ac_top_builddir=$ac_top_build_prefix
- 
--fi
++
 +case $srcdir in
 +  .)  # We are building in place.
 +    ac_srcdir=.
@@ -100512,12 +104377,8 @@
 +    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 +esac
 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
--  cr_result=$cr_cv_kconfig_HAVE_SYSTEM_UTSNAME
- 
--  if test $cr_result = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SYSTEM_UTSNAME 1
++
++
 +  case $ac_mode in
 +  :F)
 +  #
@@ -100535,10 +104396,9 @@
 +  esac
  _ACEOF
  
--     HAVE_SYSTEM_UTSNAME=1
 -  else
 -    cat >>confdefs.h <<\_ACEOF
--#define HAVE_SYSTEM_UTSNAME 0
+-#define CR_HAVE_BUG2524 0
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +# If the template does not know about datarootdir, expand it.
 +# FIXME: This hack should be removed a few years after 2.60.
@@ -100570,7 +104430,6 @@
 +esac
  _ACEOF
  
--     HAVE_SYSTEM_UTSNAME=''
 +# Neutralize VPATH when `$srcdir' = `.'.
 +# Shell code in configure.ac might set extrasub.
 +# FIXME: do we really want to maintain this feature?
@@ -100597,24 +104456,25 @@
 +"
 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
 +if $ac_cs_awk_getline; then
-+  $AWK -f "$tmp/subs.awk"
++  $AWK -f "$ac_tmp/subs.awk"
 +else
-+  $AWK -f "$tmp/subs.awk" | $SHELL
-+fi >$tmp/out \
-+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++  $AWK -f "$ac_tmp/subs.awk" | $SHELL
++fi \
++  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 +
 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
++      "$ac_tmp/out"`; test -z "$ac_out"; } &&
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +which seems to be undefined.  Please make sure it is defined" >&5
 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +which seems to be undefined.  Please make sure it is defined" >&2;}
 +
-+  rm -f "$tmp/stdin"
++  rm -f "$ac_tmp/stdin"
 +  case $ac_file in
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
++  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
 +  esac \
 +  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 + ;;
@@ -100625,20 +104485,20 @@
 +  if test x"$ac_file" != x-; then
 +    {
 +      $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-+    } >"$tmp/config.h" \
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
++    } >"$ac_tmp/config.h" \
 +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 +$as_echo "$as_me: $ac_file is unchanged" >&6;}
 +    else
 +      rm -f "$ac_file"
-+      mv "$tmp/config.h" "$ac_file" \
++      mv "$ac_tmp/config.h" "$ac_file" \
 +	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
 +    fi
 +  else
 +    $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
 +      || as_fn_error $? "could not create -" "$LINENO" 5
    fi
 +# Compute "$ac_file"'s index in $config_headers.
@@ -100676,15 +104536,14 @@
 +	  }
 +	  s/.*/./; q'`/stamp-h$_am_stamp_count
 + ;;
-+
+ 
 +  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 +$as_echo "$as_me: executing $ac_file commands" >&6;}
 + ;;
 +  esac
  
  
--  echo "$as_me:$LINENO: result: $cr_result" >&5
--echo "${ECHO_T}$cr_result" >&6
+-fi
 +  case $ac_file$ac_mode in
 +    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
 +  # Autoconf 2.62 quotes --file arguments for eval, but not when files
@@ -100782,7 +104641,10 @@
 +}
 + ;;
 +    "libtool":C)
-+
+ 
+-################################################################################
+-# AM_CONDITIONAL may not be called contitionally, so these go here
+-################################################################################
 +    # See if we are running on zsh, and set the options which allow our
 +    # commands through without removal of \ escapes.
 +    if test -n "${ZSH_VERSION+set}" ; then
@@ -100793,25 +104655,24 @@
 +    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
 +    $RM "$cfgfile"
  
--if test -z "${HAVE_INIT_UTSNAME}${HAVE_SYSTEM_UTSNAME}"; then
+-if echo $LINUX_SYMTAB_CMD | grep ^cat >/dev/null 2>&1; then
+-  CR_HAVE_SYSTEM_MAP_TRUE=
+-  CR_HAVE_SYSTEM_MAP_FALSE='#'
+-else
+-  CR_HAVE_SYSTEM_MAP_TRUE='#'
+-  CR_HAVE_SYSTEM_MAP_FALSE=
+-fi
 +    cat <<_LT_EOF >> "$cfgfile"
 +#! $SHELL
  
--  cat >confcache <<\_ACEOF
--# This file is a shell script that caches the results of configure
--# tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
 +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
 +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 +# NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
++#
 +#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
++#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
++#                 Inc.
 +#   Written by Gordon Matzigkeit, 1996
 +#
 +#   This file is part of GNU Libtool.
@@ -100830,177 +104691,13 @@
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
- #
--# `ac_cv_env_foo' variables (set or unset) will be overridden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
++#
 +# You should have received a copy of the GNU General Public License
 +# along with GNU Libtool; see the file COPYING.  If not, a copy
 +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
 +# obtained by writing to the Free Software Foundation, Inc.,
 +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
--_ACEOF
- 
--# The following way of writing the cache mishandles newlines in values,
--# but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
--# Ultrix sh set writes to stderr and can't be redirected directly,
--# and sets the high bit in the cache file unless we assign to the vars.
--{
--  (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
--      sed -n \
--	"s/'/'\\\\''/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
--    *)
--      # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--      ;;
--    esac;
--} |
--  sed '
--     t clear
--     : clear
--     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--     t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--    cat confcache >$cache_file
--  else
--    echo "not updating unwritable cache $cache_file"
--  fi
--fi
--rm -f confcache
-+# The names of the tagged configurations supported by this script.
-+available_tags="CXX "
- 
--  echo "======================================================================"
--  echo "Please review the following configuration information:"
--  echo "  Kernel source directory = $LINUX_SRC"
--  echo "  Kernel build directory = $LINUX_OBJ"
--  echo "  Kernel symbol table = ${LINUX_SYSTEM_MAP}${LINUX_VMLINUX}"
--  echo "  Kernel version probed from kernel build = $LINUX_VER"
--  echo "  Kernel running currently = `uname -r`"
--  echo "======================================================================"
-+# ### BEGIN LIBTOOL CONFIG
- 
--   { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to query UTSNAME" >&5
--echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to query UTSNAME" >&2;}
--   { (exit 1); exit 1; }; }
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
- 
--fi
-+# Which release of libtool.m4 was used?
-+macro_version=$macro_version
-+macro_revision=$macro_revision
- 
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
- 
--cat >>confdefs.h <<_ACEOF
--#define BLCR_CONFIG_TIMESTAMP "`date`"
--_ACEOF
-+# What type of objects to build.
-+pic_mode=$pic_mode
- 
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
- 
--fi # cr_build_modules
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
- 
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
- 
--if test x"$cr_build_libcr" = xyes && expr $CR_ARCH : ppc >/dev/null; then
--  echo "$as_me:$LINENO: checking for work around for bug 2524" >&5
--echo $ECHO_N "checking for work around for bug 2524... $ECHO_C" >&6
--  if test "$cr_build_modules,$force_bug2524" = "yes,"; then
--    if test `echo $LINUX_VER | sed -e 's/2.6.\([0-9]*\).*/\1/'` -le 15; then
--      { { echo "$as_me:$LINENO: error: Because you are building for a PowerPC kernel 2.6.15 or older, you must specify either --with-bug2524 or --without-bug2524.  If in doubt --with-bug2524 is the safe option (with a small performance penalty)." >&5
--echo "$as_me: error: Because you are building for a PowerPC kernel 2.6.15 or older, you must specify either --with-bug2524 or --without-bug2524.  If in doubt --with-bug2524 is the safe option (with a small performance penalty)." >&2;}
--   { (exit 1); exit 1; }; }
--    fi
--  fi
--  case "$force_bug2524" in
--    yes|no) ;; # nothing to do
--    '') force_bug2524=no ;; # empty is no
--    *) { { echo "$as_me:$LINENO: error: Argument to --with-bug2524 must be 'yes', 'no' or empty" >&5
--echo "$as_me: error: Argument to --with-bug2524 must be 'yes', 'no' or empty" >&2;}
--   { (exit 1); exit 1; }; } ;;
--  esac
--  echo "$as_me:$LINENO: result: $force_bug2524" >&5
--echo "${ECHO_T}$force_bug2524" >&6
-+# A sed program that does not truncate output.
-+SED=$lt_SED
- 
--  if test x$force_bug2524 = xyes; then
--    cat >>confdefs.h <<\_ACEOF
--#define CR_HAVE_BUG2524 1
--_ACEOF
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="\$SED -e 1s/^X//"
- 
--  else
--    cat >>confdefs.h <<\_ACEOF
--#define CR_HAVE_BUG2524 0
--_ACEOF
-+# A grep program that handles long lines.
-+GREP=$lt_GREP
- 
--  fi
-+# An ERE matcher.
-+EGREP=$lt_EGREP
- 
-+# A literal string matcher.
-+FGREP=$lt_FGREP
- 
-+# A BSD- or MS-compatible name lister.
-+NM=$lt_NM
- 
--fi
-+# Whether we need soft or hard links.
-+LN_S=$lt_LN_S
- 
--################################################################################
--# AM_CONDITIONAL may not be called contitionally, so these go here
--################################################################################
-+# What is the maximum length of a command?
-+max_cmd_len=$max_cmd_len
- 
-+# Object file suffix (normally "o").
-+objext=$ac_objext
- 
--if echo $LINUX_SYMTAB_CMD | grep ^cat >/dev/null 2>&1; then
--  CR_HAVE_SYSTEM_MAP_TRUE=
--  CR_HAVE_SYSTEM_MAP_FALSE='#'
--else
--  CR_HAVE_SYSTEM_MAP_TRUE='#'
--  CR_HAVE_SYSTEM_MAP_FALSE=
--fi
-+# Executable file suffix (normally "").
-+exeext=$exeext
- 
-+# whether the shell understands "unset".
-+lt_unset=$lt_unset
- 
-+# turn spaces into newlines.
-+SP2NL=$lt_lt_SP2NL
  
 -if test x$cr_build_util$cross_compiling = xyesno; then
 -  CR_BUILD_MAN_TRUE=
@@ -101009,15 +104706,13 @@
 -  CR_BUILD_MAN_TRUE='#'
 -  CR_BUILD_MAN_FALSE=
 -fi
-+# turn newlines into spaces.
-+NL2SP=$lt_lt_NL2SP
++# The names of the tagged configurations supported by this script.
++available_tags="CXX "
  
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
++# ### BEGIN LIBTOOL CONFIG
  
-+# An object symbol dumper.
-+OBJDUMP=$lt_OBJDUMP
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
  
 -if test x$cr_have_ftb = xyes; then
 -  CR_HAVE_FTB_TRUE=
@@ -101026,15 +104721,15 @@
 -  CR_HAVE_FTB_TRUE='#'
 -  CR_HAVE_FTB_FALSE=
 -fi
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
++# Which release of libtool.m4 was used?
++macro_version=$macro_version
++macro_revision=$macro_revision
  
-+# Command to use when deplibs_check_method == "file_magic".
-+file_magic_cmd=$lt_file_magic_cmd
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
  
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# What type of objects to build.
++pic_mode=$pic_mode
  
 -if test "x$CXX" != xno; then
 -  CR_HAVE_CXX_TRUE=
@@ -101043,57 +104738,56 @@
 -  CR_HAVE_CXX_TRUE='#'
 -  CR_HAVE_CXX_FALSE=
 -fi
-+# A symbol stripping program.
-+STRIP=$lt_STRIP
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
  
-+# Commands used to install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
  
 -################################################################################
 -# Automake sillyness
 -################################################################################
 -GMAKE_IFEQ=ifeq
-+# A C compiler.
-+LTCC=$lt_CC
++# An echo program that protects backslashes.
++ECHO=$lt_ECHO
  
 -GMAKE_IFNEQ=ifneq
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_CFLAGS
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
  
 -GMAKE_ELSE=else
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
  
 -GMAKE_ENDIF=endif
-+# Transform the output of nm in a proper C declaration.
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++# A sed program that does not truncate output.
++SED=$lt_SED
  
-+# Transform the output of nm in a C name address pair.
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="\$SED -e 1s/^X//"
  
 -################################################################################
 -# Kbuild glue
 -################################################################################
 -KBUILD_MAK="${TOP_BUILDDIR}/config/kbuild.mak"
-+# Transform the output of nm in a C name address pair when lib prefix is needed.
-+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
++# A grep program that handles long lines.
++GREP=$lt_GREP
  
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++# An ERE matcher.
++EGREP=$lt_EGREP
  
 -################################################################################
 -# Enable/disable building various pieces of the code
 -################################################################################
-+# An echo program that does not interpret backslashes.
-+ECHO=$lt_ECHO
++# A literal string matcher.
++FGREP=$lt_FGREP
  
-+# Used to examine libraries when file_magic_cmd begins with "file".
-+MAGIC_CMD=$MAGIC_CMD
++# A BSD- or MS-compatible name lister.
++NM=$lt_NM
  
 -if test x$enable_cr_info = xyes; then
 -  BUILD_CR_INFO_TRUE=
@@ -101102,14 +104796,14 @@
 -  BUILD_CR_INFO_TRUE='#'
 -  BUILD_CR_INFO_FALSE=
 -fi
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++# Whether we need soft or hard links.
++LN_S=$lt_LN_S
  
-+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-+DSYMUTIL=$lt_DSYMUTIL
++# What is the maximum length of a command?
++max_cmd_len=$max_cmd_len
  
-+# Tool to change global to local symbols on Mac OS X.
-+NMEDIT=$lt_NMEDIT
++# Object file suffix (normally "o").
++objext=$ac_objext
  
 -if false; then
 -  BUILD_VMADLIB_TRUE=
@@ -101118,14 +104812,14 @@
 -  BUILD_VMADLIB_TRUE='#'
 -  BUILD_VMADLIB_FALSE=
 -fi
-+# Tool to manipulate fat objects and archives on Mac OS X.
-+LIPO=$lt_LIPO
++# Executable file suffix (normally "").
++exeext=$exeext
  
-+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-+OTOOL=$lt_OTOOL
++# whether the shell understands "unset".
++lt_unset=$lt_unset
  
-+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-+OTOOL64=$lt_OTOOL64
++# turn spaces into newlines.
++SP2NL=$lt_lt_SP2NL
  
 -if test x$cr_build_modules = xyes; then
 -  CR_BUILD_MODULES_TRUE=
@@ -101134,14 +104828,14 @@
 -  CR_BUILD_MODULES_TRUE='#'
 -  CR_BUILD_MODULES_FALSE=
 -fi
-+# Old archive suffix (normally "a").
-+libext=$libext
++# turn newlines into spaces.
++NL2SP=$lt_lt_NL2SP
  
-+# Shared library suffix (normally ".so").
-+shrext_cmds=$lt_shrext_cmds
++# convert \$build file names to \$host format.
++to_host_file_cmd=$lt_cv_to_host_file_cmd
  
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
++# convert \$build files to toolchain format.
++to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  
 -if test x$cr_build_util = xyes; then
 -  CR_BUILD_UTIL_TRUE=
@@ -101150,15 +104844,14 @@
 -  CR_BUILD_UTIL_TRUE='#'
 -  CR_BUILD_UTIL_FALSE=
 -fi
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at link time.
-+variables_saved_for_relink=$lt_variables_saved_for_relink
++# An object symbol dumper.
++OBJDUMP=$lt_OBJDUMP
  
-+# Do we need the "lib" prefix for modules?
-+need_lib_prefix=$need_lib_prefix
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
  
-+# Do we need a version for libraries?
-+need_version=$need_version
++# Command to use when deplibs_check_method = "file_magic".
++file_magic_cmd=$lt_file_magic_cmd
  
 -if test x$cr_build_libcr = xyes; then
 -  CR_BUILD_LIBCR_TRUE=
@@ -101167,14 +104860,14 @@
 -  CR_BUILD_LIBCR_TRUE='#'
 -  CR_BUILD_LIBCR_FALSE=
 -fi
-+# Library versioning type.
-+version_type=$version_type
++# How to find potential files when deplibs_check_method = "file_magic".
++file_magic_glob=$lt_file_magic_glob
  
-+# Shared library runtime path variable.
-+runpath_var=$runpath_var
++# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
++want_nocaseglob=$lt_want_nocaseglob
  
-+# Shared library path variable.
-+shlibpath_var=$shlibpath_var
++# DLL creation program.
++DLLTOOL=$lt_DLLTOOL
  
 -if test x$cr_build_include = xyes; then
 -  CR_BUILD_INCLUDE_TRUE=
@@ -101183,15 +104876,14 @@
 -  CR_BUILD_INCLUDE_TRUE='#'
 -  CR_BUILD_INCLUDE_FALSE=
 -fi
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++# Command to associate shared and link libraries.
++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# The archiver.
++AR=$lt_AR
  
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME
-+library_names_spec=$lt_library_names_spec
++# Flags to create an archive.
++AR_FLAGS=$lt_AR_FLAGS
  
 -if test x$cr_build_tests = xyes; then
 -  CR_BUILD_TESTS_TRUE=
@@ -101200,14 +104892,16 @@
 -  CR_BUILD_TESTS_TRUE='#'
 -  CR_BUILD_TESTS_FALSE=
 -fi
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# How to feed a file listing to the archiver.
++archiver_list_spec=$lt_archiver_list_spec
  
-+# Command to use after installation of a shared archive.
-+postinstall_cmds=$lt_postinstall_cmds
++# A symbol stripping program.
++STRIP=$lt_STRIP
  
-+# Command to use after uninstallation of a shared archive.
-+postuninstall_cmds=$lt_postuninstall_cmds
++# Commands used to install an old-style archive.
++RANLIB=$lt_RANLIB
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
 -if test x$cr_build_examples = xyes; then
 -  CR_BUILD_EXAMPLES_TRUE=
@@ -101216,15 +104910,14 @@
 -  CR_BUILD_EXAMPLES_TRUE='#'
 -  CR_BUILD_EXAMPLES_FALSE=
 -fi
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
++# Whether to use a lock for old archive extraction.
++lock_old_archive_extraction=$lock_old_archive_extraction
  
-+# As "finish_cmds", except a single script fragment to be evaled but
-+# not shown.
-+finish_eval=$lt_finish_eval
++# A C compiler.
++LTCC=$lt_CC
  
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
++# LTCC compiler flags.
++LTCFLAGS=$lt_CFLAGS
  
 -if test x$cr_build_contrib = xyes; then
 -  CR_BUILD_CONTRIB_TRUE=
@@ -101233,79 +104926,77 @@
 -  CR_BUILD_CONTRIB_TRUE='#'
 -  CR_BUILD_CONTRIB_FALSE=
 -fi
-+# Compile-time system search path for libraries.
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
  
-+# Run-time system search path for libraries.
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++# Transform the output of nm in a proper C declaration.
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
  
 -################################################################################
 -# Finally generate the files and a report (unless supressed)
 -################################################################################
 -if test x"$cr_build_modules" = xyes; then
 -                                                                                  ac_config_files="$ac_config_files cr_module/Makefile cr_module/kbuild/Makefile vmadump4/Makefile include/blcr_imports.h blcr_imports/imports.c blcr_imports/Makefile blcr_imports/kbuild/Makefile config/kbuild.mak"
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
++# Transform the output of nm in a C name address pair.
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  
 -fi
 -if test x"$cr_build_util" = xyes; then
 -                                                              ac_config_files="$ac_config_files util/Makefile util/cr_checkpoint/Makefile util/cr_restart/Makefile util/cr_run/Makefile util/cr_info/Makefile man/Makefile"
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Transform the output of nm in a C name address pair when lib prefix is needed.
++global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
 -fi
 -if test x"$cr_build_libcr" = xyes; then
 -            ac_config_files="$ac_config_files libcr/Makefile"
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Specify filename containing input files for \$NM.
++nm_file_list_spec=$lt_nm_file_list_spec
  
 -fi
 -if test x"$cr_build_tests" = xyes; then
 -            ac_config_files="$ac_config_files tests/Makefile"
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# The root where to search for dependent libraries,and in which our libraries should be installed.
++lt_sysroot=$lt_sysroot
  
 -            ac_config_files="$ac_config_files tests/shellinit"
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
 -fi
 -if test x"$cr_build_examples" = xyes; then
 -                                                                        ac_config_files="$ac_config_files examples/Makefile examples/counting/Makefile examples/pthread_counting/Makefile examples/pthread_misc/Makefile examples/file_counting/Makefile examples/io_bench/Makefile examples/pipe_counting/Makefile"
-+# The linker used to build libraries.
-+LD=$lt_LD
++# Used to examine libraries when file_magic_cmd begins with "file".
++MAGIC_CMD=$MAGIC_CMD
  
 -fi
 -if test x"$cr_build_contrib" = xyes; then
 -            ac_config_files="$ac_config_files contrib/Makefile"
-+# Commands used to build an old-style archive.
-+old_archive_cmds=$lt_old_archive_cmds
-+
-+# A language specific compiler.
-+CC=$lt_compiler
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
  
 -            ac_config_files="$ac_config_files contrib/cr_insmod"
-+# Is the compiler the GNU compiler?
-+with_gcc=$GCC
++# Manifest tool.
++MANIFEST_TOOL=$lt_MANIFEST_TOOL
  
 -            ac_config_files="$ac_config_files contrib/gen_cscope"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
++# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
++DSYMUTIL=$lt_DSYMUTIL
  
 -            ac_config_files="$ac_config_files contrib/batch_build"
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl
++# Tool to change global to local symbols on Mac OS X.
++NMEDIT=$lt_NMEDIT
  
 -fi
 -          ac_config_headers="$ac_config_headers blcr_config.h"
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic
++# Tool to manipulate fat objects and archives on Mac OS X.
++LIPO=$lt_LIPO
  
 -                                                                      ac_config_files="$ac_config_files Makefile etc/Makefile rpm/Makefile rpm/specfile include/Makefile include/blcr_common.h doc/Makefile"
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static
++# ldd/readelf like tool for Mach-O binaries on Mac OS X.
++OTOOL=$lt_OTOOL
  
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
++# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
++OTOOL64=$lt_OTOOL64
  
 -cat >confcache <<\_ACEOF
 -# This file is a shell script that caches the results of configure
@@ -101320,12 +105011,12 @@
 -# `ac_cv_env_foo' variables (set or unset) will be overridden when
 -# loading this file, other *unset* `ac_cv_foo' will be assigned the
 -# following values.
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc
++# Old archive suffix (normally "a").
++libext=$libext
  
 -_ACEOF
-+# Whether or not to disallow shared libs when runtime libs are static.
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
++# Shared library suffix (normally ".so").
++shrext_cmds=$lt_shrext_cmds
  
 -# The following way of writing the cache mishandles newlines in values,
 -# but we know of no workaround that is simple, portable, and efficient.
@@ -101365,14 +105056,15 @@
 -  fi
 -fi
 -rm -f confcache
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
  
 -test "x$prefix" = xNONE && prefix=$ac_default_prefix
 -# Let make expand exec_prefix.
 -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at link time.
++variables_saved_for_relink=$lt_variables_saved_for_relink
  
 -# VPATH may cause trouble with some makes, so we remove $(srcdir),
 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
@@ -101388,12 +105080,12 @@
 -s/^[^=]*=[	 ]*$//;
 -}'
 -fi
-+# Whether the compiler copes with passing no objects directly.
-+compiler_needs_object=$lt_compiler_needs_object
++# Do we need the "lib" prefix for modules?
++need_lib_prefix=$need_lib_prefix
  
 -DEFS=-DHAVE_CONFIG_H
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++# Do we need a version for libraries?
++need_version=$need_version
  
 -ac_libobjs=
 -ac_ltlibobjs=
@@ -101406,18 +105098,15 @@
 -  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
 -done
 -LIBOBJS=$ac_libobjs
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++# Library versioning type.
++version_type=$version_type
  
 -LTLIBOBJS=$ac_ltlibobjs
-+# Commands used to build a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
++# Shared library runtime path variable.
++runpath_var=$runpath_var
  
-+# Commands used to build a loadable module if different from building
-+# a shared archive.
-+module_cmds=$lt_module_cmds
-+module_expsym_cmds=$lt_module_expsym_cmds
++# Shared library path variable.
++shlibpath_var=$shlibpath_var
  
 -if test -z "${CRI_DEBUG_TRUE}" && test -z "${CRI_DEBUG_FALSE}"; then
 -  { { echo "$as_me:$LINENO: error: conditional \"CRI_DEBUG\" was never defined.
@@ -101615,8 +105304,30 @@
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
-+# Whether we are building with GNU ld or not.
-+with_gnu_ld=$lt_with_gnu_ld
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Permission mode override for installation of shared libraries.
++install_override_mode=$lt_install_override_mode
++
++# Command to use after installation of a shared archive.
++postinstall_cmds=$lt_postinstall_cmds
++
++# Command to use after uninstallation of a shared archive.
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
  
 -: ${CONFIG_STATUS=./config.status}
 -ac_clean_files_save=$ac_clean_files
@@ -101629,24 +105340,24 @@
 -# Run this file to recreate the current configuration.
 -# Compiler output produced by configure, useful for debugging
 -# configure, is in config.log if it exists.
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
++# As "finish_cmds", except a single script fragment to be evaled but
++# not shown.
++finish_eval=$lt_finish_eval
  
 -debug=false
 -ac_cs_recheck=false
 -ac_cs_silent=false
 -SHELL=\${CONFIG_SHELL-$SHELL}
 -_ACEOF
-+# Flag that enforces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
 -## --------------------- ##
 -## M4sh Initialization.  ##
 -## --------------------- ##
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++# Compile-time system search path for libraries.
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
  
 -# Be Bourne compatible
 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -101659,9 +105370,8 @@
 -  set -o posix
 -fi
 -DUALCASE=1; export DUALCASE # for MKS sh
-+# If ld is used when linking, flag to hardcode \$libdir into a binary
-+# during linking.  This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
++# Run-time system search path for libraries.
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
 -# Support unset when possible.
 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -101669,23 +105379,19 @@
 -else
 -  as_unset=false
 -fi
-+# Whether we need a single "-rpath" flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
  
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary.
-+hardcode_direct=$hardcode_direct
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
  
 -# Work around bugs in pre-3.0 UWIN ksh.
 -$as_unset ENV MAIL MAILPATH
 -PS1='$ '
 -PS2='> '
 -PS4='+ '
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary and the resulting library dependency is
-+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-+# library is relocated.
-+hardcode_direct_absolute=$hardcode_direct_absolute
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
  
 -# NLS nuisances.
 -for as_var in \
@@ -101699,9 +105405,9 @@
 -    $as_unset $as_var
 -  fi
 -done
-+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
  
 -# Required to use basename.
 -if expr a : '\(a\)' >/dev/null 2>&1; then
@@ -101709,23 +105415,18 @@
 -else
 -  as_expr=false
 -fi
-+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
  
 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
 -  as_basename=basename
 -else
 -  as_basename=false
 -fi
-+# Set to "yes" if building a shared library automatically hardcodes DIR
-+# into the library and all subsequent libraries and executables linked
-+# against it.
-+hardcode_automatic=$hardcode_automatic
++# The linker used to build libraries.
++LD=$lt_LD
  
-+# Set to yes if linker adds runtime paths of dependent libraries
-+# to runtime path list.
-+inherit_rpath=$inherit_rpath
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
  
 -# Name of the executable.
 -as_me=`$as_basename "$0" ||
@@ -101738,11 +105439,11 @@
 -  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
++# Commands used to build an old-style archive.
++old_archive_cmds=$lt_old_archive_cmds
  
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path=$lt_fix_srcfile_path
++# A language specific compiler.
++CC=$lt_compiler
  
 -# PATH needs CR, and LINENO needs CR and PATH.
 -# Avoid depending upon Character Ranges.
@@ -101751,8 +105452,8 @@
 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 -as_cr_digits='0123456789'
 -as_cr_alnum=$as_cr_Letters$as_cr_digits
-+# Set to "yes" if exported symbols are required.
-+always_export_symbols=$always_export_symbols
++# Is the compiler the GNU compiler?
++with_gcc=$GCC
  
 -# The user is always right.
 -if test "${PATH_SEPARATOR+set}" != set; then
@@ -101766,11 +105467,11 @@
 -  fi
 -  rm -f conf$$.sh
 -fi
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic
  
 -  as_lineno_1=$LINENO
 -  as_lineno_2=$LINENO
@@ -101788,8 +105489,8 @@
 -  test -z "$as_dir" && as_dir=.
 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 -done
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl
  
 -       ;;
 -  esac
@@ -101830,8 +105531,8 @@
 -done
 -;;
 -  esac
-+# Commands necessary for linking programs (against libraries) with templates.
-+prelink_cmds=$lt_prelink_cmds
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static
  
 -  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
 -  # uniformly replaced by the line number.  The first 'sed' inserts a
@@ -101855,8 +105556,8 @@
 -    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
 -   { (exit 1); exit 1; }; }
-+# Specify filename containing input files.
-+file_list_spec=$lt_file_list_spec
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
 -  # Don't try to exec as it changes $[0], causing all sort of problems
 -  # (the dirname of $[0] is not the place where we might find the
@@ -101865,11 +105566,11 @@
 -  # Exit status is that of the last command.
 -  exit
 -}
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc
  
-+# The directories searched by this compiler when creating a shared library.
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
++# Whether or not to disallow shared libs when runtime libs are static.
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
  
 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
 -  *c*,-n*) ECHO_N= ECHO_C='
@@ -101877,21 +105578,16 @@
 -  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
 -  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 -esac
-+# Dependencies to place before and after the objects being linked to
-+# create a shared library.
-+predep_objects=$lt_predep_objects
-+postdep_objects=$lt_postdep_objects
-+predeps=$lt_predeps
-+postdeps=$lt_postdeps
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
  
 -if expr a : '\(a\)' >/dev/null 2>&1; then
 -  as_expr=expr
 -else
 -  as_expr=false
 -fi
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
  
 -rm -f conf$$ conf$$.exe conf$$.file
 -echo >conf$$.file
@@ -101910,224 +105606,138 @@
 -  as_ln_s='cp -p'
 -fi
 -rm -f conf$$ conf$$.exe conf$$.file
-+# ### END LIBTOOL CONFIG
++# Whether the compiler copes with passing no objects directly.
++compiler_needs_object=$lt_compiler_needs_object
  
 -if mkdir -p . 2>/dev/null; then
 -  as_mkdir_p=:
 -else
 -  test -d ./-p && rmdir ./-p
 -  as_mkdir_p=false
-+_LT_EOF
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\_LT_EOF >> "$cfgfile"
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
- fi
-+_LT_EOF
-+    ;;
-+  esac
+-fi
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
  
 -as_executable_p="test -f"
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
  
 -# Sed expression to map a string onto a valid CPP name.
 -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+ltmain="$ac_aux_dir/ltmain.sh"
++# Commands used to build a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
  
 -# Sed expression to map a string onto a valid variable name.
 -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++# Commands used to build a loadable module if different from building
++# a shared archive.
++module_cmds=$lt_module_cmds
++module_expsym_cmds=$lt_module_expsym_cmds
  
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
++# Whether we are building with GNU ld or not.
++with_gnu_ld=$lt_with_gnu_ld
  
 -# IFS
 -# We need space, tab and new line, in precisely that order.
 -as_nl='
 -'
 -IFS=" 	$as_nl"
-+  case $xsi_shell in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
  
 -# CDPATH.
 -$as_unset CDPATH
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+}
++# Flag that enforces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
  
 -exec 6>&1
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result="${1##*/}"
-+}
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
  
 -# Open the log real soon, to keep \$[0] and so on meaningful, and to
 -# report actual input values of CONFIG_FILES etc. instead of their
 -# values after options handling.  Logging --version etc. is OK.
 -exec 5>>config.log
-+# func_dirname_and_basename file append nondir_replacement
-+# perform func_basename and func_dirname in a single function
-+# call:
-+#   dirname:  Compute the dirname of FILE.  If nonempty,
-+#             add APPEND to the result, otherwise set result
-+#             to NONDIR_REPLACEMENT.
-+#             value returned in "$func_dirname_result"
-+#   basename: Compute filename of FILE.
-+#             value retuned in "$func_basename_result"
-+# Implementation must be kept synchronized with func_dirname
-+# and func_basename. For efficiency, we do not delegate to
-+# those functions but instead duplicate the functionality here.
-+func_dirname_and_basename ()
- {
+-{
 -  echo
 -  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 -## Running $as_me. ##
 -_ASBOX
 -} >&5
 -cat >&5 <<_CSEOF
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+  func_basename_result="${1##*/}"
-+}
++# If ld is used when linking, flag to hardcode \$libdir into a binary
++# during linking.  This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
  
--This file was extended by blcr $as_me 0.8.2, which was
+-This file was extended by blcr $as_me 0.8.4, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+func_stripname ()
-+{
-+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+  # positional parameters, so assign one to ordinary parameter first.
-+  func_stripname_result=${3}
-+  func_stripname_result=${func_stripname_result#"${1}"}
-+  func_stripname_result=${func_stripname_result%"${2}"}
-+}
++# Whether we need a single "-rpath" flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
  
 -  CONFIG_FILES    = $CONFIG_FILES
 -  CONFIG_HEADERS  = $CONFIG_HEADERS
 -  CONFIG_LINKS    = $CONFIG_LINKS
 -  CONFIG_COMMANDS = $CONFIG_COMMANDS
 -  $ $0 $@
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=${1%%=*}
-+  func_opt_split_arg=${1#*=}
-+}
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# DIR into the resulting binary.
++hardcode_direct=$hardcode_direct
  
 -_CSEOF
 -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
 -echo >&5
 -_ACEOF
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  case ${1} in
-+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+    *)    func_lo2o_result=${1} ;;
-+  esac
-+}
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# DIR into the resulting binary and the resulting library dependency is
++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
++# library is relocated.
++hardcode_direct_absolute=$hardcode_direct_absolute
  
 -# Files that config.status was made for.
 -if test -n "$ac_config_files"; then
 -  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
 -fi
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=${1%.*}.lo
-+}
++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
++# into the resulting binary.
++hardcode_minus_L=$hardcode_minus_L
  
 -if test -n "$ac_config_headers"; then
 -  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
 -fi
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $* ))
-+}
++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
++# into the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
  
 -if test -n "$ac_config_links"; then
 -  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
 -fi
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
++# Set to "yes" if building a shared library automatically hardcodes DIR
++# into the library and all subsequent libraries and executables linked
++# against it.
++hardcode_automatic=$hardcode_automatic
  
 -if test -n "$ac_config_commands"; then
 -  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
 -fi
-+_LT_EOF
-+    ;;
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  # Extract subdirectory from the argument.
-+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-+  if test "X$func_dirname_result" = "X${1}"; then
-+    func_dirname_result="${3}"
-+  else
-+    func_dirname_result="$func_dirname_result${2}"
-+  fi
-+}
++# Set to yes if linker adds runtime paths of dependent libraries
++# to runtime path list.
++inherit_rpath=$inherit_rpath
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
  
 -ac_cs_usage="\
 -\`$as_me' instantiates files from templates according to the
 -current configuration.
++# Set to "yes" if exported symbols are required.
++always_export_symbols=$always_export_symbols
  
 -Usage: $0 [OPTIONS] [FILE]...
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+  case ${2} in
-+    .*) func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-+  esac
-+}
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
  
 -  -h, --help       print this help, then exit
 -  -V, --version    print version number, then exit
@@ -102138,54 +105748,36 @@
 -		   instantiate the configuration file FILE
 -  --header=FILE[:TEMPLATE]
 -		   instantiate the configuration header FILE
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[^=]*=//'
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
  
 -Configuration files:
 -$config_files
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-+}
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
  
 -Configuration headers:
 -$config_headers
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-+}
++# Commands necessary for linking programs (against libraries) with templates.
++prelink_cmds=$lt_prelink_cmds
  
 -Configuration commands:
 -$config_commands
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-+}
++# Commands necessary for finishing linking programs.
++postlink_cmds=$lt_postlink_cmds
  
 -Report bugs to <bug-autoconf@gnu.org>."
 -_ACEOF
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=`expr "$@"`
-+}
++# Specify filename containing input files.
++file_list_spec=$lt_file_list_spec
  
 -cat >>$CONFIG_STATUS <<_ACEOF
 -ac_cs_version="\\
--blcr config.status 0.8.2
+-blcr config.status 0.8.4
 -configured by $0, generated by GNU Autoconf 2.59,
 -  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
 -This config.status script is free software; the Free Software Foundation
@@ -102193,8 +105785,8 @@
 -srcdir=$srcdir
 -INSTALL="$INSTALL"
 -_ACEOF
-+_LT_EOF
-+esac
++# The directories searched by this compiler when creating a shared library.
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
 -# If no file are specified by the user, then we need to provide default
@@ -102207,39 +105799,23 @@
 -    ac_option=`expr "x$1" : 'x\([^=]*\)='`
 -    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
 -    ac_shift=:
-+case $lt_shell_append in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$1+=\$2"
-+}
-+_LT_EOF
-     ;;
+-    ;;
 -  -*)
 -    ac_option=$1
 -    ac_optarg=$2
 -    ac_shift=shift
-+  *)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$1=\$$1\$2"
-+}
-+
-+_LT_EOF
-     ;;
+-    ;;
 -  *) # This is not an option, so the user has probably given explicit
 -     # arguments.
 -     ac_option=$1
 -     ac_need_defaults=false;;
-   esac
+-  esac
++# Dependencies to place before and after the objects being linked to
++# create a shared library.
++predep_objects=$lt_predep_objects
++postdep_objects=$lt_postdep_objects
++predeps=$lt_predeps
++postdeps=$lt_postdeps
  
 -  case $ac_option in
 -  # Handling of the options.
@@ -102271,6 +105847,9 @@
 -  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 -  | -silent | --silent | --silen | --sile | --sil | --si | --s)
 -    ac_cs_silent=: ;;
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path
  
 -  # This is an error.
 -  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
@@ -102278,60 +105857,225 @@
 -echo "$as_me: error: unrecognized option: $1
 -Try \`$0 --help' for more information." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
++# ### END LIBTOOL CONFIG
  
 -  *) ac_config_targets="$ac_config_targets $1" ;;
-+  mv -f "$cfgfile" "$ofile" ||
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
++_LT_EOF
  
--  esac
++  case $host_os in
++  aix3*)
++    cat <<\_LT_EOF >> "$cfgfile"
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++_LT_EOF
++    ;;
+   esac
 -  shift
 -done
  
 -ac_configure_extra_args=
-+    cat <<_LT_EOF >> "$ofile"
  
 -if $ac_cs_silent; then
 -  exec 6>/dev/null
 -  ac_configure_extra_args="$ac_configure_extra_args --silent"
 -fi
-+# ### BEGIN LIBTOOL TAG CONFIG: CXX
++ltmain="$ac_aux_dir/ltmain.sh"
  
 -_ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF
 -if \$ac_cs_recheck; then
 -  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
 -  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
--fi
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" \
++     || (rm -f "$cfgfile"; exit 1)
++
++  if test x"$xsi_shell" = xyes; then
++  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
++func_dirname ()\
++{\
++\    case ${1} in\
++\      */*) func_dirname_result="${1%/*}${2}" ;;\
++\      *  ) func_dirname_result="${3}" ;;\
++\    esac\
++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  sed -e '/^func_basename ()$/,/^} # func_basename /c\
++func_basename ()\
++{\
++\    func_basename_result="${1##*/}"\
++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
++func_dirname_and_basename ()\
++{\
++\    case ${1} in\
++\      */*) func_dirname_result="${1%/*}${2}" ;;\
++\      *  ) func_dirname_result="${3}" ;;\
++\    esac\
++\    func_basename_result="${1##*/}"\
++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
++func_stripname ()\
++{\
++\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
++\    # positional parameters, so assign one to ordinary parameter first.\
++\    func_stripname_result=${3}\
++\    func_stripname_result=${func_stripname_result#"${1}"}\
++\    func_stripname_result=${func_stripname_result%"${2}"}\
++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
++func_split_long_opt ()\
++{\
++\    func_split_long_opt_name=${1%%=*}\
++\    func_split_long_opt_arg=${1#*=}\
++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
++func_split_short_opt ()\
++{\
++\    func_split_short_opt_arg=${1#??}\
++\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
++func_lo2o ()\
++{\
++\    case ${1} in\
++\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
++\      *)    func_lo2o_result=${1} ;;\
++\    esac\
++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  sed -e '/^func_xform ()$/,/^} # func_xform /c\
++func_xform ()\
++{\
++    func_xform_result=${1%.*}.lo\
++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  sed -e '/^func_arith ()$/,/^} # func_arith /c\
++func_arith ()\
++{\
++    func_arith_result=$(( $* ))\
++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  sed -e '/^func_len ()$/,/^} # func_len /c\
++func_len ()\
++{\
++    func_len_result=${#1}\
++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++fi
++
++if test x"$lt_shell_append" = xyes; then
++  sed -e '/^func_append ()$/,/^} # func_append /c\
++func_append ()\
++{\
++    eval "${1}+=\\${2}"\
++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
++func_append_quoted ()\
++{\
++\    func_quote_for_eval "${2}"\
++\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++  # Save a `func_append' function call where possible by direct use of '+='
++  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
++    && mv -f "$cfgfile.tmp" "$cfgfile" \
++      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++  test 0 -eq $? || _lt_function_replace_fail=:
++else
++  # Save a `func_append' function call even when '+=' is not available
++  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
++    && mv -f "$cfgfile.tmp" "$cfgfile" \
++      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++  test 0 -eq $? || _lt_function_replace_fail=:
++fi
++
++if test x"$_lt_function_replace_fail" = x":"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+ fi
  
 -_ACEOF
-+# Commands used to build an old-style archive.
-+old_archive_cmds=$lt_old_archive_cmds_CXX
  
 -cat >>$CONFIG_STATUS <<_ACEOF
 -#
 -# INIT-COMMANDS section.
 -#
-+# A language specific compiler.
-+CC=$lt_compiler_CXX
++   mv -f "$cfgfile" "$ofile" ||
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
  
 -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-+# Is the compiler the GNU compiler?
-+with_gcc=$GCC_CXX
  
 -_ACEOF
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++    cat <<_LT_EOF >> "$ofile"
  
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
++# ### BEGIN LIBTOOL TAG CONFIG: CXX
  
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
++# The linker used to build libraries.
++LD=$lt_LD_CXX
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
 -for ac_config_target in $ac_config_targets
@@ -102380,8 +106124,9 @@
 -   { (exit 1); exit 1; }; };;
 -  esac
 -done
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag_CXX
++reload_cmds=$lt_reload_cmds_CXX
  
 -# If the user did not use the arguments to specify the items to instantiate,
 -# then the envvar interface is used.  Set only those that are not.
@@ -102392,8 +106137,8 @@
 -  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
 -  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 -fi
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++# Commands used to build an old-style archive.
++old_archive_cmds=$lt_old_archive_cmds_CXX
  
 -# Have a temporary directory for convenience.  Make it in the build tree
 -# simply because there is no reason to put it here, and in addition,
@@ -102404,12 +106149,12 @@
 -  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
 -  trap '{ (exit 1); exit 1; }' 1 2 13 15
 -}
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++# A language specific compiler.
++CC=$lt_compiler_CXX
  
 -# Create a (secure) tmp directory for tmp files.
-+# Whether or not to disallow shared libs when runtime libs are static.
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++# Is the compiler the GNU compiler?
++with_gcc=$GCC_CXX
  
 -{
 -  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
@@ -102495,7 +106240,6 @@
 -s,@AUTOMAKE@,$AUTOMAKE,;t t
 -s,@AUTOHEADER@,$AUTOHEADER,;t t
 -s,@MAKEINFO@,$MAKEINFO,;t t
--s,@AMTAR@,$AMTAR,;t t
 -s,@install_sh@,$install_sh,;t t
 -s,@STRIP@,$STRIP,;t t
 -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
@@ -102504,6 +106248,9 @@
 -s,@AWK@,$AWK,;t t
 -s,@SET_MAKE@,$SET_MAKE,;t t
 -s,@am__leading_dot@,$am__leading_dot,;t t
+-s,@AMTAR@,$AMTAR,;t t
+-s,@am__tar@,$am__tar,;t t
+-s,@am__untar@,$am__untar,;t t
 -s,@PWD_PROG@,$PWD_PROG,;t t
 -s,@TOP_BUILDDIR@,$TOP_BUILDDIR,;t t
 -s,@TOP_SRCDIR@,$TOP_SRCDIR,;t t
@@ -102555,6 +106302,7 @@
 -s,@CCDEPMODE@,$CCDEPMODE,;t t
 -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+-s,@SED@,$SED,;t t
 -s,@EGREP@,$EGREP,;t t
 -s,@ECHO@,$ECHO,;t t
 -s,@AR@,$AR,;t t
@@ -102593,10 +106341,11 @@
 -s,@CR_KERNEL@,$CR_KERNEL,;t t
 -s,@CR_KERNEL_BASE@,$CR_KERNEL_BASE,;t t
 -s,@CR_MODULE_DIR@,$CR_MODULE_DIR,;t t
--s,@KBUILD_MAKE_ARGS@,$KBUILD_MAKE_ARGS,;t t
 -s,@LINUX_SYMTAB_FILE@,$LINUX_SYMTAB_FILE,;t t
 -s,@LINUX_SYMTAB_CMD@,$LINUX_SYMTAB_CMD,;t t
 -s,@LINUX_SYMTAB_CONF@,$LINUX_SYMTAB_CONF,;t t
+-s,@CR_KARCH@,$CR_KARCH,;t t
+-s,@KBUILD_MAKE_ARGS@,$KBUILD_MAKE_ARGS,;t t
 -s,@CR_HAVE_SYSTEM_MAP_TRUE@,$CR_HAVE_SYSTEM_MAP_TRUE,;t t
 -s,@CR_HAVE_SYSTEM_MAP_FALSE@,$CR_HAVE_SYSTEM_MAP_FALSE,;t t
 -s,@CR_BUILD_MAN_TRUE@,$CR_BUILD_MAN_TRUE,;t t
@@ -102676,8 +106425,8 @@
 -    ac_sed_cmds=cat
 -  fi
 -fi # test -n "$CONFIG_FILES"
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  
 -_ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
@@ -102692,8 +106441,8 @@
 -	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
 -  * )   ac_file_in=$ac_file.in ;;
 -  esac
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
  
 -  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
 -  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
@@ -102732,12 +106481,12 @@
 -  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
 -   { (exit 1); exit 1; }; }; }
-+# Whether the compiler copes with passing no objects directly.
-+compiler_needs_object=$lt_compiler_needs_object_CXX
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
  
 -  ac_builddir=.
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
  
 -if test "$ac_dir" != .; then
 -  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
@@ -102746,8 +106495,8 @@
 -else
 -  ac_dir_suffix= ac_top_builddir=
 -fi
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
 -case $srcdir in
 -  .)  # No --srcdir option.  We are building in place.
@@ -102764,9 +106513,8 @@
 -    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
 -    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 -esac
-+# Commands used to build a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
  
 -# Do not use `cd foo && pwd` to compute absolute paths, because
 -# the directories may not exist.
@@ -102806,20 +106554,18 @@
 -  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 -  esac;;
 -esac
-+# Commands used to build a loadable module if different from building
-+# a shared archive.
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
++# Whether or not to disallow shared libs when runtime libs are static.
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
  
-+# Whether we are building with GNU ld or not.
-+with_gnu_ld=$lt_with_gnu_ld_CXX
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
  
 -  case $INSTALL in
 -  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
 -  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
 -  esac
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
  
 -  if test x"$ac_file" != x-; then
 -    { echo "$as_me:$LINENO: creating $ac_file" >&5
@@ -102890,8 +106636,8 @@
 -    cat $tmp/out
 -    rm -f $tmp/out
 -  fi
-+# Flag that enforces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
++# Whether the compiler copes with passing no objects directly.
++compiler_needs_object=$lt_compiler_needs_object_CXX
  
 -  # Run the commands associated with the file.
 -  case $ac_file in
@@ -102903,16 +106649,14 @@
 -done
 -_ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
  
 -#
 -# CONFIG_HEADER section.
 -#
-+# If ld is used when linking, flag to hardcode \$libdir into a binary
-+# during linking.  This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
  
 -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
 -# NAME is the cpp macro being defined and VALUE is the value it is being given.
@@ -102927,8 +106671,9 @@
 -ac_uB='$,\1#\2define\3'
 -ac_uC=' '
 -ac_uD=',;t'
-+# Whether we need a single "-rpath" flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
++# Commands used to build a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
  
 -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
 -  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
@@ -102975,16 +106720,14 @@
 -    done` || { (exit 1); exit 1; }
 -  # Remove the trailing spaces.
 -  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary.
-+hardcode_direct=$hardcode_direct_CXX
++# Commands used to build a loadable module if different from building
++# a shared archive.
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
  
 -_ACEOF
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary and the resulting library dependency is
-+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-+# library is relocated.
-+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
++# Whether we are building with GNU ld or not.
++with_gnu_ld=$lt_with_gnu_ld_CXX
  
 -# Transform confdefs.h into two sed scripts, `conftest.defines' and
 -# `conftest.undefs', that substitutes the proper values into
@@ -103131,9 +106874,8 @@
 -  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
 -   { (exit 1); exit 1; }; }; }
-+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_CXX
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
  
 -      rm -f $ac_file
 -      mv $tmp/config.h $ac_file
@@ -103210,15 +106952,13 @@
 -  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
 -   { (exit 1); exit 1; }; }; }
-+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
++# Flag that enforces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
  
 -  ac_builddir=.
-+# Set to "yes" if building a shared library automatically hardcodes DIR
-+# into the library and all subsequent libraries and executables linked
-+# against it.
-+hardcode_automatic=$hardcode_automatic_CXX
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
  
 -if test "$ac_dir" != .; then
 -  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
@@ -103227,9 +106967,9 @@
 -else
 -  ac_dir_suffix= ac_top_builddir=
 -fi
-+# Set to yes if linker adds runtime paths of dependent libraries
-+# to runtime path list.
-+inherit_rpath=$inherit_rpath_CXX
++# If ld is used when linking, flag to hardcode \$libdir into a binary
++# during linking.  This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
  
 -case $srcdir in
 -  .)  # No --srcdir option.  We are building in place.
@@ -103246,8 +106986,8 @@
 -    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
 -    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 -esac
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_CXX
++# Whether we need a single "-rpath" flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
  
 -# Do not use `cd foo && pwd` to compute absolute paths, because
 -# the directories may not exist.
@@ -103287,11 +107027,15 @@
 -  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 -  esac;;
 -esac
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path=$lt_fix_srcfile_path_CXX
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# DIR into the resulting binary.
++hardcode_direct=$hardcode_direct_CXX
  
-+# Set to "yes" if exported symbols are required.
-+always_export_symbols=$always_export_symbols_CXX
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# DIR into the resulting binary and the resulting library dependency is
++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
++# library is relocated.
++hardcode_direct_absolute=$hardcode_direct_absolute_CXX
  
 -  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
 -echo "$as_me: executing $ac_dest commands" >&6;}
@@ -103321,27 +107065,21 @@
 -  else
 -    continue
 -  fi
--  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
--  # Extract the definition of DEP_FILES from the Makefile without
--  # running `make'.
+-  # Extract the definition of DEPDIR, am__include, and am__quote
+-  # from the Makefile without running `make'.
 -  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 -  test -z "$DEPDIR" && continue
+-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+-  test -z "am__include" && continue
+-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
 -  # When using ansi2knr, U may be empty or an underscore; expand it
 -  U=`sed -n 's/^U = //p' < "$mf"`
--  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
--  # We invoke sed twice because it is the simplest approach to
--  # changing $(DEPDIR) to its actual value in the expansion.
--  for file in `sed -n '
--    /^DEP_FILES = .*\\\\$/ {
--      s/^DEP_FILES = //
--      :loop
--	s/\\\\$//
--	p
--	n
--	/\\\\$/ b loop
--      p
--    }
--    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+-  # Find all dependency output files, they are included files with
+-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+-  # simplest approach to changing $(DEPDIR) to its actual value in the
+-  # expansion.
+-  for file in `sed -n "
+-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
 -       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
 -    # Make sure the directory exists.
 -    test -f "$dirpart/$file" && continue
@@ -103381,6 +107119,29 @@
 -  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
 -   { (exit 1); exit 1; }; }; }
++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
++# into the resulting binary.
++hardcode_minus_L=$hardcode_minus_L_CXX
++
++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
++# into the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
++
++# Set to "yes" if building a shared library automatically hardcodes DIR
++# into the library and all subsequent libraries and executables linked
++# against it.
++hardcode_automatic=$hardcode_automatic_CXX
++
++# Set to yes if linker adds runtime paths of dependent libraries
++# to runtime path list.
++inherit_rpath=$inherit_rpath_CXX
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_CXX
++
++# Set to "yes" if exported symbols are required.
++always_export_symbols=$always_export_symbols_CXX
++
 +# The commands to list exported symbols.
 +export_symbols_cmds=$lt_export_symbols_cmds_CXX
 +
@@ -103393,6 +107154,9 @@
 +# Commands necessary for linking programs (against libraries) with templates.
 +prelink_cmds=$lt_prelink_cmds_CXX
 +
++# Commands necessary for finishing linking programs.
++postlink_cmds=$lt_postlink_cmds_CXX
++
 +# Specify filename containing input files.
 +file_list_spec=$lt_file_list_spec_CXX
 +
@@ -103445,7 +107209,7 @@
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -55228,7 +42730,11 @@
+@@ -59384,7 +45739,11 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
@@ -103458,17 +107222,17 @@
  fi
  
  
-Index: blcr-0.8.2/contrib/Makefile.in
+Index: blcr-0.8.4/contrib/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/contrib/Makefile.in	2010-10-12 10:44:39.000000000 +0100
-+++ blcr-0.8.2/contrib/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/contrib/Makefile.in	2011-10-11 23:58:52.000000000 +0100
++++ blcr-0.8.4/contrib/Makefile.in	2011-10-12 13:18:42.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -103492,20 +107256,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -34,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = contrib
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-@@ -44,80 +43,36 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -48,78 +46,33 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES = cr_insmod gen_cscope batch_build
 +CONFIG_CLEAN_VPATH_FILES =
@@ -103576,7 +107328,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -103584,11 +107336,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -138,20 +93,20 @@
+@@ -140,20 +93,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -103610,7 +107363,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -159,12 +114,11 @@
+@@ -161,12 +115,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -103624,7 +107377,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -178,70 +132,91 @@
+@@ -180,17 +133,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -103634,6 +107387,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -103650,21 +107404,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -204,16 +166,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -103678,11 +107426,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -225,28 +185,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -103705,7 +107449,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -103724,7 +107467,7 @@
  
  # Maintainer scripts requiring substitutions:
  noinst_SCRIPTS = cr_insmod gen_cscope batch_build 
-@@ -250,18 +225,18 @@
+@@ -255,18 +227,18 @@
  all: all-am
  
  .SUFFIXES:
@@ -103749,7 +107492,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -275,10 +250,11 @@
+@@ -280,10 +252,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103763,7 +107506,7 @@
  cr_insmod: $(top_builddir)/config.status $(srcdir)/cr_insmod.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  gen_cscope: $(top_builddir)/config.status $(srcdir)/gen_cscope.in
-@@ -291,10 +267,6 @@
+@@ -296,10 +269,6 @@
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -103774,7 +107517,7 @@
  tags: TAGS
  TAGS:
  
-@@ -303,29 +275,32 @@
+@@ -308,29 +277,32 @@
  
  
  distdir: $(DISTFILES)
@@ -103825,17 +107568,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -352,7 +327,8 @@
- clean-generic:
+@@ -358,6 +330,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -363,7 +339,7 @@
+@@ -368,7 +341,7 @@
  
  distclean: distclean-am
  	-rm -f Makefile
@@ -103844,7 +107585,7 @@
  
  dvi: dvi-am
  
-@@ -371,18 +347,38 @@
+@@ -376,18 +349,38 @@
  
  html: html-am
  
@@ -103883,7 +107624,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -401,17 +397,21 @@
+@@ -406,17 +399,21 @@
  
  ps-am:
  
@@ -103910,17 +107651,17 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: blcr-0.8.2/cr_module/Makefile.in
+Index: blcr-0.8.4/cr_module/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/cr_module/Makefile.in	2010-10-12 10:44:37.000000000 +0100
-+++ blcr-0.8.2/cr_module/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/cr_module/Makefile.in	2011-10-11 23:58:52.000000000 +0100
++++ blcr-0.8.4/cr_module/Makefile.in	2011-10-12 13:18:42.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -103944,20 +107685,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -33,6 +31,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = cr_module
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -41,88 +40,75 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -45,86 +43,72 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -104071,7 +107800,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -104079,11 +107808,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -143,20 +129,20 @@
+@@ -145,20 +129,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -104105,7 +107835,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -164,12 +150,11 @@
+@@ -166,12 +151,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -104119,7 +107849,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -183,70 +168,91 @@
+@@ -185,17 +169,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -104129,6 +107859,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -104145,21 +107876,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -209,16 +202,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -104173,11 +107898,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -230,28 +221,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -104200,7 +107921,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -104219,22 +107939,7 @@
  
  # Needed by kbuild glue
  my_sources = \
-@@ -281,12 +287,12 @@
- 
- BPROC_VERSION = "4.0.0pre8"
- vmadump_dir = $(top_srcdir)/vmadump4
--vmad_sources = $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_ARCH@.c
-+vmad_sources = $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_KARCH@.c
- vmad_include = -I$(vmadump_dir) -D__NR_vmadump=-1 -DBPROC_VERSION='$(BPROC_VERSION)'
- cr_sources = $(my_sources) $(vmad_sources)
- INCLUDES = -I$(top_builddir)/include	\
- 		-I$(top_srcdir)/include		\
--		-I$(srcdir)/arch/@CR_ARCH@	\
-+		-I$(srcdir)/arch/@CR_KARCH@	\
- 		$(vmad_include)
- 
- EXTRA_DIST = arch license.txt $(my_sources)
-@@ -294,18 +300,18 @@
+@@ -299,18 +302,18 @@
  all: all-recursive
  
  .SUFFIXES:
@@ -104259,7 +107964,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -319,10 +325,11 @@
+@@ -324,10 +327,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104273,7 +107978,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -330,10 +337,6 @@
+@@ -335,10 +339,6 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -104284,29 +107989,22 @@
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
  # To change the values of `make' variables: instead of editing Makefiles,
-@@ -341,7 +344,13 @@
+@@ -346,7 +346,7 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
+-	@failcom='exit 1'; \
 +	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -352,16 +361,21 @@
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -363,16 +363,15 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
 -	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
+ 	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -104314,26 +108012,19 @@
  
 -mostlyclean-recursive clean-recursive distclean-recursive \
 -maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
+-	@failcom='exit 1'; \
 +$(RECURSIVE_CLEAN_TARGETS):
 +	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -381,16 +395,16 @@
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -398,16 +397,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
 -	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
+ 	  || eval $$failcom; \
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -104347,7 +108038,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -398,94 +412,120 @@
+@@ -415,14 +414,14 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -104363,19 +108054,13 @@
 -	tags=; \
 +	set x; \
  	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
+@@ -434,81 +433,101 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
+ 	    test ! -f $$subdir/TAGS || \
 -	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	    test ! -f $$subdir/TAGS || \
 +	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
@@ -104385,14 +108070,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -104400,7 +108085,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -104478,13 +108163,15 @@
  	    || exit 1; \
  	  fi; \
  	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || mkdir "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
 +	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
+-	    distdir=`$(am__cd) $(distdir) && pwd`; \
+-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 -	    (cd $$subdir && \
 +	  fi; \
 +	done
@@ -104500,8 +108187,8 @@
 +	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 +	    ($(am__cd) $$subdir && \
  	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="../$(top_distdir)" \
--	        distdir="../$(distdir)/$$subdir" \
+-	        top_distdir="$$top_distdir" \
+-	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
 +		am__remove_distdir=: \
@@ -104510,17 +108197,15 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -514,7 +554,8 @@
- clean-generic:
+@@ -538,6 +557,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -525,8 +566,7 @@
+@@ -548,8 +568,7 @@
  
  distclean: distclean-recursive
  	-rm -f Makefile
@@ -104530,7 +108215,7 @@
  
  dvi: dvi-recursive
  
-@@ -534,18 +574,38 @@
+@@ -557,18 +576,38 @@
  
  html: html-recursive
  
@@ -104569,7 +108254,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -564,28 +624,31 @@
+@@ -587,28 +626,31 @@
  
  ps-am:
  
@@ -104613,17 +108298,17 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/doc/Makefile.in
+Index: blcr-0.8.4/doc/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/doc/Makefile.in	2010-10-12 10:44:37.000000000 +0100
-+++ blcr-0.8.2/doc/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/doc/Makefile.in	2011-10-11 23:58:52.000000000 +0100
++++ blcr-0.8.4/doc/Makefile.in	2011-10-12 13:18:42.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -104647,20 +108332,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -33,6 +31,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = doc
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -41,79 +40,35 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -45,77 +43,32 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -104730,7 +108403,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -104738,11 +108411,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -134,20 +89,20 @@
+@@ -136,20 +89,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -104764,7 +108438,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -155,12 +110,11 @@
+@@ -157,12 +111,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -104778,7 +108452,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -174,70 +128,91 @@
+@@ -176,17 +129,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -104788,6 +108462,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -104804,21 +108479,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -200,16 +162,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -104832,11 +108501,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -221,28 +181,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -104859,7 +108524,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -104878,7 +108542,7 @@
  
  # List of files to distribute
  EXTRA_DIST = README			\
-@@ -249,18 +224,18 @@
+@@ -254,18 +226,18 @@
  all: all-am
  
  .SUFFIXES:
@@ -104903,7 +108567,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -274,20 +249,17 @@
+@@ -279,20 +251,17 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104927,7 +108591,7 @@
  tags: TAGS
  TAGS:
  
-@@ -296,30 +268,32 @@
+@@ -301,30 +270,32 @@
  
  
  distdir: $(DISTFILES)
@@ -104979,17 +108643,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -346,7 +320,8 @@
- clean-generic:
+@@ -352,6 +323,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -357,7 +332,7 @@
+@@ -362,7 +334,7 @@
  
  distclean: distclean-am
  	-rm -f Makefile
@@ -104998,7 +108660,7 @@
  
  dvi: dvi-am
  
-@@ -365,18 +340,38 @@
+@@ -370,18 +342,38 @@
  
  html: html-am
  
@@ -105037,7 +108699,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -395,17 +390,21 @@
+@@ -400,17 +392,21 @@
  
  ps-am:
  
@@ -105064,17 +108726,17 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: blcr-0.8.2/etc/Makefile.in
+Index: blcr-0.8.4/etc/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/etc/Makefile.in	2010-10-12 10:44:38.000000000 +0100
-+++ blcr-0.8.2/etc/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/etc/Makefile.in	2011-10-11 23:58:52.000000000 +0100
++++ blcr-0.8.4/etc/Makefile.in	2011-10-12 13:18:42.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -105098,20 +108760,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -33,6 +31,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = etc
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -41,79 +40,35 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -45,77 +43,32 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -105181,7 +108831,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -105189,11 +108839,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -134,20 +89,20 @@
+@@ -136,20 +89,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -105215,7 +108866,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -155,12 +110,11 @@
+@@ -157,12 +111,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -105229,7 +108880,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -174,87 +128,108 @@
+@@ -176,17 +129,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -105239,6 +108890,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -105255,21 +108907,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -200,16 +162,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -105283,11 +108929,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -221,45 +181,57 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -105310,7 +108952,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -105352,7 +108993,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -268,20 +243,17 @@
+@@ -273,20 +245,17 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105376,7 +109017,7 @@
  tags: TAGS
  TAGS:
  
-@@ -290,29 +262,32 @@
+@@ -295,29 +264,32 @@
  
  
  distdir: $(DISTFILES)
@@ -105427,17 +109068,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -339,7 +314,8 @@
- clean-generic:
+@@ -345,6 +317,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -350,7 +326,7 @@
+@@ -355,7 +328,7 @@
  
  distclean: distclean-am
  	-rm -f Makefile
@@ -105446,7 +109085,7 @@
  
  dvi: dvi-am
  
-@@ -358,18 +334,38 @@
+@@ -363,18 +336,38 @@
  
  html: html-am
  
@@ -105485,7 +109124,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -388,17 +384,21 @@
+@@ -393,17 +386,21 @@
  
  ps-am:
  
@@ -105511,7 +109150,7 @@
  
  
  install-exec-local:
-@@ -408,6 +408,7 @@
+@@ -413,6 +410,7 @@
  	chmod 755 $(DESTDIR)$(sysconfdir)/init.d/blcr
  uninstall-local:
  	rm -f $(DESTDIR)$(sysconfdir)/init.d/blcr
@@ -105519,17 +109158,17 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/examples/Makefile.in
+Index: blcr-0.8.4/examples/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/examples/Makefile.in	2010-10-12 10:44:40.000000000 +0100
-+++ blcr-0.8.2/examples/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/examples/Makefile.in	2011-10-11 23:58:53.000000000 +0100
++++ blcr-0.8.4/examples/Makefile.in	2011-10-12 13:18:42.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -105553,20 +109192,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -33,6 +31,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = examples
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -41,88 +40,75 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -45,86 +43,72 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -105680,7 +109307,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -105688,11 +109315,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -143,20 +129,20 @@
+@@ -145,20 +129,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -105714,7 +109342,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -164,12 +150,11 @@
+@@ -166,12 +151,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -105728,7 +109356,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -183,88 +168,109 @@
+@@ -185,17 +169,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -105738,6 +109366,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -105754,21 +109383,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -209,16 +202,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -105782,11 +109405,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -230,46 +221,58 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -105809,7 +109428,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -105852,7 +109470,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -278,10 +284,11 @@
+@@ -283,10 +286,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105866,7 +109484,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -289,10 +296,6 @@
+@@ -294,10 +298,6 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -105877,29 +109495,22 @@
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
  # To change the values of `make' variables: instead of editing Makefiles,
-@@ -300,7 +303,13 @@
+@@ -305,7 +305,7 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
+-	@failcom='exit 1'; \
 +	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -311,16 +320,21 @@
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -322,16 +322,15 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
 -	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
+ 	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -105907,26 +109518,19 @@
  
 -mostlyclean-recursive clean-recursive distclean-recursive \
 -maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
+-	@failcom='exit 1'; \
 +$(RECURSIVE_CLEAN_TARGETS):
 +	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -340,16 +354,16 @@
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -357,16 +356,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
 -	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
+ 	  || eval $$failcom; \
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -105940,7 +109544,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -357,94 +371,120 @@
+@@ -374,14 +373,14 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -105956,19 +109560,13 @@
 -	tags=; \
 +	set x; \
  	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
+@@ -393,81 +392,101 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
+ 	    test ! -f $$subdir/TAGS || \
 -	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	    test ! -f $$subdir/TAGS || \
 +	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
@@ -105978,14 +109576,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -105993,7 +109591,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -106071,13 +109669,15 @@
  	    || exit 1; \
  	  fi; \
  	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || mkdir "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
 +	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
+-	    distdir=`$(am__cd) $(distdir) && pwd`; \
+-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 -	    (cd $$subdir && \
 +	  fi; \
 +	done
@@ -106093,8 +109693,8 @@
 +	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 +	    ($(am__cd) $$subdir && \
  	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="../$(top_distdir)" \
--	        distdir="../$(distdir)/$$subdir" \
+-	        top_distdir="$$top_distdir" \
+-	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
 +		am__remove_distdir=: \
@@ -106103,17 +109703,15 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -474,7 +514,8 @@
- clean-generic:
+@@ -498,6 +517,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -485,8 +526,7 @@
+@@ -508,8 +528,7 @@
  
  distclean: distclean-recursive
  	-rm -f Makefile
@@ -106123,7 +109721,7 @@
  
  dvi: dvi-recursive
  
-@@ -494,18 +534,38 @@
+@@ -517,18 +536,38 @@
  
  html: html-recursive
  
@@ -106162,7 +109760,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -524,25 +584,28 @@
+@@ -547,25 +586,28 @@
  
  ps-am:
  
@@ -106204,28 +109802,26 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/examples/counting/Makefile.in
+Index: blcr-0.8.4/examples/counting/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/examples/counting/Makefile.in	2010-10-12 10:44:39.000000000 +0100
-+++ blcr-0.8.2/examples/counting/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/examples/counting/Makefile.in	2011-10-11 23:58:53.000000000 +0100
++++ blcr-0.8.4/examples/counting/Makefile.in	2011-10-12 13:18:42.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,17 +15,12 @@
+@@ -14,15 +15,12 @@
  
  @SET_MAKE@
  
--SOURCES = counting.c
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -106240,20 +109836,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -36,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- noinst_PROGRAMS = counting$(EXEEXT)
- @CR_INSTALLED_LIBCR_TRUE@counting_DEPENDENCIES =  \
-@@ -47,98 +44,55 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -49,95 +47,52 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -106266,18 +109850,17 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/counting.Po
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -106350,7 +109933,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -106358,11 +109941,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -159,20 +113,20 @@
+@@ -158,20 +113,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -106384,7 +109968,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -180,12 +134,11 @@
+@@ -179,12 +135,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -106398,7 +109982,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -199,70 +152,91 @@
+@@ -198,17 +153,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -106408,6 +109992,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -106424,21 +110009,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -222,16 +186,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -106452,11 +110031,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -243,28 +205,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -106479,7 +110054,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -106498,7 +110072,7 @@
  @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr
  @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir)
  @CR_INSTALLED_LIBCR_FALSE@counting_DEPENDENCIES = $(top_builddir)/libcr/libcr.la
-@@ -273,18 +247,18 @@
+@@ -275,18 +249,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -106523,7 +110097,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -298,20 +272,23 @@
+@@ -300,20 +274,23 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106555,7 +110129,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -322,27 +299,24 @@
+@@ -324,22 +301,22 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/counting.Po@am__quote@
  
  .c.o:
@@ -106564,9 +110138,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -106575,9 +110147,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -106586,13 +110156,9 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
-@@ -351,80 +325,85 @@
+@@ -350,82 +327,85 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -106623,14 +110189,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -106638,7 +110204,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -106716,17 +110282,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -452,7 +431,8 @@
- clean-generic:
+@@ -454,6 +434,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -466,7 +446,7 @@
+@@ -467,7 +448,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -106735,7 +110299,7 @@
  
  dvi: dvi-am
  
-@@ -474,18 +454,38 @@
+@@ -475,18 +456,38 @@
  
  html: html-am
  
@@ -106774,7 +110338,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -506,24 +506,28 @@
+@@ -507,24 +508,28 @@
  
  ps-am:
  
@@ -106808,28 +110372,26 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/examples/file_counting/Makefile.in
+Index: blcr-0.8.4/examples/file_counting/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/examples/file_counting/Makefile.in	2010-10-12 10:44:39.000000000 +0100
-+++ blcr-0.8.2/examples/file_counting/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/examples/file_counting/Makefile.in	2011-10-11 23:58:53.000000000 +0100
++++ blcr-0.8.4/examples/file_counting/Makefile.in	2011-10-12 13:18:42.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,17 +15,12 @@
+@@ -14,15 +15,12 @@
  
  @SET_MAKE@
  
--SOURCES = file_counting.c
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -106844,20 +110406,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -36,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- noinst_PROGRAMS = file_counting$(EXEEXT)
- @CR_INSTALLED_LIBCR_TRUE@file_counting_DEPENDENCIES =  \
-@@ -47,98 +44,55 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -49,95 +47,52 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -106870,18 +110420,17 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/file_counting.Po
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -106954,7 +110503,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -106962,11 +110511,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -159,20 +113,20 @@
+@@ -158,20 +113,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -106988,7 +110538,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -180,12 +134,11 @@
+@@ -179,12 +135,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -107002,7 +110552,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -199,70 +152,91 @@
+@@ -198,17 +153,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -107012,6 +110562,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -107028,21 +110579,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -222,16 +186,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -107056,11 +110601,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -243,28 +205,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -107083,7 +110624,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -107102,7 +110642,7 @@
  @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr
  @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir)
  @CR_INSTALLED_LIBCR_FALSE@file_counting_DEPENDENCIES = $(top_builddir)/libcr/libcr.la
-@@ -273,18 +247,18 @@
+@@ -275,18 +249,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -107127,7 +110667,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -298,20 +272,23 @@
+@@ -300,20 +274,23 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107159,7 +110699,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -322,27 +299,24 @@
+@@ -324,22 +301,22 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_counting.Po@am__quote@
  
  .c.o:
@@ -107168,9 +110708,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -107179,9 +110717,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -107190,13 +110726,9 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
-@@ -351,80 +325,85 @@
+@@ -350,82 +327,85 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -107227,14 +110759,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -107242,7 +110774,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -107320,17 +110852,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -452,7 +431,8 @@
- clean-generic:
+@@ -454,6 +434,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -466,7 +446,7 @@
+@@ -467,7 +448,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -107339,7 +110869,7 @@
  
  dvi: dvi-am
  
-@@ -474,18 +454,38 @@
+@@ -475,18 +456,38 @@
  
  html: html-am
  
@@ -107378,7 +110908,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -506,24 +506,28 @@
+@@ -507,24 +508,28 @@
  
  ps-am:
  
@@ -107412,28 +110942,26 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/examples/io_bench/Makefile.in
+Index: blcr-0.8.4/examples/io_bench/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/examples/io_bench/Makefile.in	2010-10-12 10:44:39.000000000 +0100
-+++ blcr-0.8.2/examples/io_bench/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/examples/io_bench/Makefile.in	2011-10-11 23:58:53.000000000 +0100
++++ blcr-0.8.4/examples/io_bench/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,17 +15,12 @@
+@@ -14,15 +15,12 @@
  
  @SET_MAKE@
  
--SOURCES = io_bench.c
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -107448,20 +110976,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -36,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- noinst_PROGRAMS = io_bench$(EXEEXT)
- @CR_INSTALLED_LIBCR_TRUE@io_bench_DEPENDENCIES =  \
-@@ -47,98 +44,55 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -49,95 +47,52 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -107474,18 +110990,17 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/io_bench.Po
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -107558,7 +111073,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -107566,11 +111081,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -159,20 +113,20 @@
+@@ -158,20 +113,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -107592,7 +111108,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -180,12 +134,11 @@
+@@ -179,12 +135,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -107606,7 +111122,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -199,70 +152,91 @@
+@@ -198,17 +153,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -107616,6 +111132,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -107632,21 +111149,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -222,16 +186,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -107660,11 +111171,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -243,28 +205,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -107687,7 +111194,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -107706,7 +111212,7 @@
  @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr
  @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir)
  @CR_INSTALLED_LIBCR_FALSE@libcr_includes = -I$(top_srcdir)/include -I$(top_builddir)/include
-@@ -276,18 +250,18 @@
+@@ -278,18 +252,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -107731,7 +111237,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -301,20 +275,23 @@
+@@ -303,20 +277,23 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107763,7 +111269,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -325,27 +302,24 @@
+@@ -327,22 +304,22 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io_bench.Po@am__quote@
  
  .c.o:
@@ -107772,9 +111278,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -107783,9 +111287,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -107794,13 +111296,9 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
-@@ -354,80 +328,85 @@
+@@ -353,82 +330,85 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -107831,14 +111329,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -107846,7 +111344,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -107924,17 +111422,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -455,7 +434,8 @@
- clean-generic:
+@@ -457,6 +437,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -469,7 +449,7 @@
+@@ -470,7 +451,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -107943,7 +111439,7 @@
  
  dvi: dvi-am
  
-@@ -477,18 +457,38 @@
+@@ -478,18 +459,38 @@
  
  html: html-am
  
@@ -107982,7 +111478,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -509,24 +509,28 @@
+@@ -510,24 +511,28 @@
  
  ps-am:
  
@@ -108016,28 +111512,26 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/examples/pipe_counting/Makefile.in
+Index: blcr-0.8.4/examples/pipe_counting/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/examples/pipe_counting/Makefile.in	2010-10-12 10:44:39.000000000 +0100
-+++ blcr-0.8.2/examples/pipe_counting/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/examples/pipe_counting/Makefile.in	2011-10-11 23:58:53.000000000 +0100
++++ blcr-0.8.4/examples/pipe_counting/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,17 +15,12 @@
+@@ -14,15 +15,12 @@
  
  @SET_MAKE@
  
--SOURCES = pipe_counting.c
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -108052,20 +111546,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -36,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- noinst_PROGRAMS = pipe_counting$(EXEEXT)
- @CR_INSTALLED_LIBCR_TRUE@pipe_counting_DEPENDENCIES =  \
-@@ -47,98 +44,55 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -49,95 +47,52 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -108078,18 +111560,17 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pipe_counting.Po
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -108162,7 +111643,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -108170,11 +111651,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -159,20 +113,20 @@
+@@ -158,20 +113,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -108196,7 +111678,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -180,12 +134,11 @@
+@@ -179,12 +135,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -108210,7 +111692,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -199,70 +152,91 @@
+@@ -198,17 +153,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -108220,6 +111702,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -108236,21 +111719,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -222,16 +186,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -108264,11 +111741,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -243,28 +205,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -108291,7 +111764,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -108310,7 +111782,7 @@
  @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr
  @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir)
  @CR_INSTALLED_LIBCR_FALSE@pipe_counting_DEPENDENCIES = $(top_builddir)/libcr/libcr.la
-@@ -273,18 +247,18 @@
+@@ -275,18 +249,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -108335,7 +111807,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -298,20 +272,23 @@
+@@ -300,20 +274,23 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108367,7 +111839,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -322,27 +299,24 @@
+@@ -324,22 +301,22 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe_counting.Po@am__quote@
  
  .c.o:
@@ -108376,9 +111848,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -108387,9 +111857,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -108398,13 +111866,9 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
-@@ -351,80 +325,85 @@
+@@ -350,82 +327,85 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -108435,14 +111899,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -108450,7 +111914,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -108528,17 +111992,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -452,7 +431,8 @@
- clean-generic:
+@@ -454,6 +434,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -466,7 +446,7 @@
+@@ -467,7 +448,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -108547,7 +112009,7 @@
  
  dvi: dvi-am
  
-@@ -474,18 +454,38 @@
+@@ -475,18 +456,38 @@
  
  html: html-am
  
@@ -108586,7 +112048,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -506,24 +506,28 @@
+@@ -507,24 +508,28 @@
  
  ps-am:
  
@@ -108620,28 +112082,26 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/examples/pthread_counting/Makefile.in
+Index: blcr-0.8.4/examples/pthread_counting/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/examples/pthread_counting/Makefile.in	2010-10-12 10:44:39.000000000 +0100
-+++ blcr-0.8.2/examples/pthread_counting/Makefile.in	2010-10-12 10:44:13.000000000 +0100
+--- blcr-0.8.4.orig/examples/pthread_counting/Makefile.in	2011-10-11 23:58:53.000000000 +0100
++++ blcr-0.8.4/examples/pthread_counting/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,17 +15,12 @@
+@@ -14,15 +15,12 @@
  
  @SET_MAKE@
  
--SOURCES = pthread_counting.c
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -108656,20 +112116,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -36,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- noinst_PROGRAMS = pthread_counting$(EXEEXT)
- @CR_INSTALLED_LIBCR_TRUE@pthread_counting_DEPENDENCIES =  \
-@@ -47,98 +44,55 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -49,95 +47,52 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -108682,18 +112130,17 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pthread_counting.Po
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -108766,7 +112213,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -108774,11 +112221,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -159,20 +113,20 @@
+@@ -158,20 +113,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -108800,7 +112248,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -180,12 +134,11 @@
+@@ -179,12 +135,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -108814,7 +112262,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -199,70 +152,91 @@
+@@ -198,17 +153,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -108824,6 +112272,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -108840,21 +112289,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -222,16 +186,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -108868,11 +112311,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -243,28 +205,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -108895,7 +112334,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -108914,7 +112352,7 @@
  @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr
  @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir)
  @CR_INSTALLED_LIBCR_FALSE@pthread_counting_DEPENDENCIES = $(top_builddir)/libcr/libcr.la
-@@ -274,18 +248,18 @@
+@@ -276,18 +250,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -108939,7 +112377,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -299,20 +273,23 @@
+@@ -301,20 +275,23 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108971,7 +112409,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -323,27 +300,24 @@
+@@ -325,22 +302,22 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_counting.Po@am__quote@
  
  .c.o:
@@ -108980,9 +112418,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -108991,9 +112427,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -109002,13 +112436,9 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
-@@ -352,80 +326,85 @@
+@@ -351,82 +328,85 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -109039,14 +112469,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -109054,7 +112484,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -109132,17 +112562,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -453,7 +432,8 @@
- clean-generic:
+@@ -455,6 +435,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -467,7 +447,7 @@
+@@ -468,7 +449,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -109151,7 +112579,7 @@
  
  dvi: dvi-am
  
-@@ -475,18 +455,38 @@
+@@ -476,18 +457,38 @@
  
  html: html-am
  
@@ -109190,7 +112618,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -507,24 +507,28 @@
+@@ -508,24 +509,28 @@
  
  ps-am:
  
@@ -109224,28 +112652,26 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/examples/pthread_misc/Makefile.in
+Index: blcr-0.8.4/examples/pthread_misc/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/examples/pthread_misc/Makefile.in	2010-10-12 10:44:39.000000000 +0100
-+++ blcr-0.8.2/examples/pthread_misc/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/examples/pthread_misc/Makefile.in	2011-10-11 23:58:53.000000000 +0100
++++ blcr-0.8.4/examples/pthread_misc/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,17 +15,12 @@
+@@ -14,15 +15,12 @@
  
  @SET_MAKE@
  
--SOURCES = pthread_misc.c
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -109260,20 +112686,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -36,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- noinst_PROGRAMS = pthread_misc$(EXEEXT)
- @CR_INSTALLED_LIBCR_TRUE@pthread_misc_DEPENDENCIES =  \
-@@ -47,98 +44,55 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -49,95 +47,52 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -109286,18 +112700,17 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pthread_misc.Po
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -109370,7 +112783,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -109378,11 +112791,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -159,20 +113,20 @@
+@@ -158,20 +113,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -109404,7 +112818,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -180,12 +134,11 @@
+@@ -179,12 +135,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -109418,7 +112832,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -199,70 +152,91 @@
+@@ -198,17 +153,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -109428,6 +112842,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -109444,21 +112859,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -222,16 +186,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -109472,11 +112881,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -243,28 +205,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -109499,7 +112904,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -109518,7 +112922,7 @@
  @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr
  @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir)
  @CR_INSTALLED_LIBCR_FALSE@libcr_includes = -I$(top_srcdir)/include -I$(top_builddir)/include
-@@ -276,18 +250,18 @@
+@@ -278,18 +252,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -109543,7 +112947,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -301,20 +275,23 @@
+@@ -303,20 +277,23 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109575,7 +112979,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -325,27 +302,24 @@
+@@ -327,22 +304,22 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_misc.Po@am__quote@
  
  .c.o:
@@ -109584,9 +112988,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -109595,9 +112997,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -109606,13 +113006,9 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
-@@ -354,80 +328,85 @@
+@@ -353,82 +330,85 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -109643,14 +113039,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -109658,7 +113054,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -109736,17 +113132,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -455,7 +434,8 @@
- clean-generic:
+@@ -457,6 +437,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -469,7 +449,7 @@
+@@ -470,7 +451,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -109755,7 +113149,7 @@
  
  dvi: dvi-am
  
-@@ -477,18 +457,38 @@
+@@ -478,18 +459,38 @@
  
  html: html-am
  
@@ -109794,7 +113188,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -509,24 +509,28 @@
+@@ -510,24 +511,28 @@
  
  ps-am:
  
@@ -109828,17 +113222,17 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/include/Makefile.in
+Index: blcr-0.8.4/include/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/include/Makefile.in	2010-10-12 10:44:37.000000000 +0100
-+++ blcr-0.8.2/include/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/include/Makefile.in	2011-10-11 23:58:53.000000000 +0100
++++ blcr-0.8.4/include/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -109862,32 +113256,19 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -34,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = include
- DIST_COMMON = $(am__include_HEADERS_DIST) $(am__noinst_HEADERS_DIST) \
-@@ -44,16 +43,36 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -48,6 +46,7 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES = blcr_imports.h blcr_common.h
 +CONFIG_CLEAN_VPATH_FILES =
  SOURCES =
  DIST_SOURCES =
  am__include_HEADERS_DIST = blcr_ioctl.h blcr_proc.h blcr_errcodes.h \
- 	libcr.h
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
+@@ -57,10 +56,23 @@
+     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+     *) f=$$p;; \
+   esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
@@ -109910,7 +113291,7 @@
  am__noinst_HEADERS_DIST = blcr_ksyms.h blcr_vmadump.h
  HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \
  	$(nodist_noinst_HEADERS) $(noinst_HEADERS)
-@@ -61,72 +80,27 @@
+@@ -68,73 +80,27 @@
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
@@ -109976,7 +113357,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -109984,11 +113365,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -147,20 +121,20 @@
+@@ -155,20 +121,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -110010,7 +113392,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -168,12 +142,11 @@
+@@ -176,12 +143,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -110024,7 +113406,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -187,70 +160,91 @@
+@@ -195,17 +161,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -110034,6 +113416,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -110050,21 +113433,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -219,16 +194,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -110078,11 +113455,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -240,28 +213,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -110105,7 +113478,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -110124,7 +113496,7 @@
  @CR_BUILD_INCLUDE_TRUE@include_HEADERS = blcr_ioctl.h blcr_proc.h blcr_errcodes.h libcr.h
  @CR_BUILD_INCLUDE_TRUE@nodist_include_HEADERS = blcr_common.h
  @CR_BUILD_INCLUDE_TRUE@noinst_HEADERS = blcr_ksyms.h blcr_vmadump.h
-@@ -259,18 +253,18 @@
+@@ -270,18 +255,18 @@
  all: all-am
  
  .SUFFIXES:
@@ -110149,7 +113521,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -284,10 +278,11 @@
+@@ -295,10 +280,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110163,7 +113535,7 @@
  blcr_imports.h: $(top_builddir)/config.status $(srcdir)/blcr_imports.h.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  blcr_common.h: $(top_builddir)/config.status $(srcdir)/blcr_common.h.in
-@@ -298,115 +293,126 @@
+@@ -309,117 +295,126 @@
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -110179,7 +113551,7 @@
 +	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  f=$(am__strip_dir) \
 -	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
 -	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 +	  echo "$$d$$p"; \
@@ -110192,7 +113564,7 @@
  uninstall-includeHEADERS:
  	@$(NORMAL_UNINSTALL)
 -	@list='$(include_HEADERS)'; for p in $$list; do \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  f=$(am__strip_dir) \
 -	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
 -	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 -	done
@@ -110209,7 +113581,7 @@
 +	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  f=$(am__strip_dir) \
 -	  echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
 -	  $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 +	  echo "$$d$$p"; \
@@ -110222,7 +113594,7 @@
  uninstall-nodist_includeHEADERS:
  	@$(NORMAL_UNINSTALL)
 -	@list='$(nodist_include_HEADERS)'; for p in $$list; do \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  f=$(am__strip_dir) \
 -	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
 -	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 -	done
@@ -110255,14 +113627,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -110270,7 +113642,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -110348,7 +113720,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -415,7 +421,7 @@
+@@ -428,7 +423,7 @@
  all-am: Makefile $(HEADERS) all-local
  installdirs:
  	for dir in "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
@@ -110357,17 +113729,15 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -436,7 +442,8 @@
- clean-generic:
+@@ -450,6 +445,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -447,8 +454,7 @@
+@@ -460,8 +456,7 @@
  
  distclean: distclean-am
  	-rm -f Makefile
@@ -110377,7 +113747,7 @@
  
  dvi: dvi-am
  
-@@ -456,18 +462,38 @@
+@@ -469,18 +464,38 @@
  
  html: html-am
  
@@ -110416,7 +113786,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -486,20 +512,23 @@
+@@ -499,20 +514,23 @@
  
  ps-am:
  
@@ -110445,7 +113815,7 @@
  	uninstall-nodist_includeHEADERS
  
  
-@@ -508,6 +537,7 @@
+@@ -521,6 +539,7 @@
  
  all-local:
  	if test -d $(top_builddir)/libcr32/include; then $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/libcr32/include all; fi
@@ -110453,28 +113823,26 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/libcr/Makefile.in
+Index: blcr-0.8.4/libcr/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/libcr/Makefile.in	2010-10-12 10:44:40.000000000 +0100
-+++ blcr-0.8.2/libcr/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/libcr/Makefile.in	2011-10-11 23:58:54.000000000 +0100
++++ blcr-0.8.4/libcr/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,17 +16,12 @@
+@@ -15,15 +16,12 @@
  @SET_MAKE@
  
  
--SOURCES = $(libcr_la_SOURCES) $(libcr_omit_la_SOURCES) $(libcr_run_la_SOURCES)
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -110489,28 +113857,17 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -37,6 +33,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = libcr
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-@@ -46,11 +43,32 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -48,14 +46,29 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+     *) f=$$p;; \
+   esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
@@ -110532,7 +113889,7 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  libcr_la_DEPENDENCIES =
  am__libcr_la_SOURCES_DIST = cr_ftb.c cr_async.c cr_core.c cr_cs.c \
-@@ -63,47 +81,40 @@
+@@ -68,29 +81,40 @@
  	libcr_la-cr_trace.lo libcr_la-cr_strerror.lo \
  	libcr_la-cr_request.lo libcr_la-cr_omit.lo libcr_la-cr_run.lo
  libcr_la_OBJECTS = $(am_libcr_la_OBJECTS)
@@ -110561,35 +113918,17 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libcr_la-cr_async.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_core.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_cs.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_ftb.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_omit.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_pthread.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_request.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_run.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_sig_sync.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_strerror.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_syscall.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_trace.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_omit_la-cr_omit.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_omit_la-cr_trace.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_run_la-cr_run.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_run_la-cr_sig_sync.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/libcr_run_la-cr_trace.Plo
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -110597,7 +113936,7 @@
  SOURCES = $(libcr_la_SOURCES) $(libcr_omit_la_SOURCES) \
  	$(libcr_run_la_SOURCES)
  DIST_SOURCES = $(am__libcr_la_SOURCES_DIST) \
-@@ -114,72 +125,27 @@
+@@ -101,73 +125,27 @@
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
@@ -110663,7 +114002,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -110671,11 +114010,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -200,20 +166,20 @@
+@@ -188,20 +166,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -110697,7 +114037,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -221,12 +187,11 @@
+@@ -209,12 +188,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -110711,7 +114051,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -240,70 +205,91 @@
+@@ -228,17 +206,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -110721,6 +114061,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -110737,21 +114078,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -252,16 +239,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -110765,11 +114100,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -273,28 +258,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -110792,7 +114123,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -110811,7 +114141,7 @@
  lib_LTLIBRARIES = libcr.la libcr_run.la libcr_omit.la
  CR_LIB_VERSION = -version-info @LIBTOOL_INTERFACE@:@LIBTOOL_REVISION@:@LIBTOOL_AGE@
  noinst_HEADERS = \
-@@ -356,18 +342,18 @@
+@@ -347,18 +344,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -110836,7 +114166,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -381,43 +367,48 @@
+@@ -372,27 +369,32 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110855,7 +114185,7 @@
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	list2=; for p in $$list; do \
  	  if test -f $$p; then \
--	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    f=$(am__strip_dir) \
 -	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
 -	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 +	    list2="$$list2 $$p"; \
@@ -110869,8 +114199,8 @@
  
  uninstall-libLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	  p=$(am__strip_dir) \
 -	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 -	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -110881,12 +114211,7 @@
  	done
  
  clean-libLTLIBRARIES:
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
--	  test "$$dir" = "$$p" && dir=.; \
-+	  test "$$dir" != "$$p" || dir=.; \
- 	  echo "rm -f \"$${dir}/so_locations\""; \
+@@ -404,11 +406,11 @@
  	  rm -f "$${dir}/so_locations"; \
  	done
  libcr.la: $(libcr_la_OBJECTS) $(libcr_la_DEPENDENCIES) 
@@ -110901,7 +114226,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -445,460 +436,151 @@
+@@ -436,151 +438,151 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcr_run_la-cr_trace.Plo@am__quote@
  
  .c.o:
@@ -110910,9 +114235,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -110921,9 +114244,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -110932,518 +114253,192 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
  
--libcr_la-cr_ftb.o: cr_ftb.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.o `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo" "$(DEPDIR)/libcr_la-cr_ftb.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_ftb.c' object='libcr_la-cr_ftb.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_ftb.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_ftb.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.o `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c
--
--libcr_la-cr_ftb.obj: cr_ftb.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.obj `if test -f 'cr_ftb.c'; then $(CYGPATH_W) 'cr_ftb.c'; else $(CYGPATH_W) '$(srcdir)/cr_ftb.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo" "$(DEPDIR)/libcr_la-cr_ftb.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_ftb.c' object='libcr_la-cr_ftb.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_ftb.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_ftb.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.obj `if test -f 'cr_ftb.c'; then $(CYGPATH_W) 'cr_ftb.c'; else $(CYGPATH_W) '$(srcdir)/cr_ftb.c'; fi`
--
  libcr_la-cr_ftb.lo: cr_ftb.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo" "$(DEPDIR)/libcr_la-cr_ftb.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_ftb.Tpo -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_ftb.Tpo $(DEPDIR)/libcr_la-cr_ftb.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_ftb.c' object='libcr_la-cr_ftb.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_ftb.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_ftb.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c
--
--libcr_la-cr_async.o: cr_async.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.o `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_async.Tpo" "$(DEPDIR)/libcr_la-cr_async.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_async.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_async.c' object='libcr_la-cr_async.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_async.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_async.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.o `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c
--
--libcr_la-cr_async.obj: cr_async.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.obj `if test -f 'cr_async.c'; then $(CYGPATH_W) 'cr_async.c'; else $(CYGPATH_W) '$(srcdir)/cr_async.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_async.Tpo" "$(DEPDIR)/libcr_la-cr_async.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_async.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_async.c' object='libcr_la-cr_async.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_async.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_async.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.obj `if test -f 'cr_async.c'; then $(CYGPATH_W) 'cr_async.c'; else $(CYGPATH_W) '$(srcdir)/cr_async.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c
  
  libcr_la-cr_async.lo: cr_async.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_async.Tpo" "$(DEPDIR)/libcr_la-cr_async.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_async.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_async.Tpo -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_async.Tpo $(DEPDIR)/libcr_la-cr_async.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_async.c' object='libcr_la-cr_async.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_async.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_async.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c
--
--libcr_la-cr_core.o: cr_core.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.o `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_core.Tpo" "$(DEPDIR)/libcr_la-cr_core.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_core.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_core.c' object='libcr_la-cr_core.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_core.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_core.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.o `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c
--
--libcr_la-cr_core.obj: cr_core.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.obj `if test -f 'cr_core.c'; then $(CYGPATH_W) 'cr_core.c'; else $(CYGPATH_W) '$(srcdir)/cr_core.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_core.Tpo" "$(DEPDIR)/libcr_la-cr_core.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_core.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_core.c' object='libcr_la-cr_core.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_core.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_core.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.obj `if test -f 'cr_core.c'; then $(CYGPATH_W) 'cr_core.c'; else $(CYGPATH_W) '$(srcdir)/cr_core.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c
  
  libcr_la-cr_core.lo: cr_core.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_core.Tpo" "$(DEPDIR)/libcr_la-cr_core.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_core.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_core.Tpo -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_core.Tpo $(DEPDIR)/libcr_la-cr_core.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_core.c' object='libcr_la-cr_core.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_core.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_core.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c
--
--libcr_la-cr_cs.o: cr_cs.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.o `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_cs.Tpo" "$(DEPDIR)/libcr_la-cr_cs.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_cs.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_cs.c' object='libcr_la-cr_cs.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_cs.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_cs.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.o `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c
--
--libcr_la-cr_cs.obj: cr_cs.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.obj `if test -f 'cr_cs.c'; then $(CYGPATH_W) 'cr_cs.c'; else $(CYGPATH_W) '$(srcdir)/cr_cs.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_cs.Tpo" "$(DEPDIR)/libcr_la-cr_cs.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_cs.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_cs.c' object='libcr_la-cr_cs.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_cs.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_cs.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.obj `if test -f 'cr_cs.c'; then $(CYGPATH_W) 'cr_cs.c'; else $(CYGPATH_W) '$(srcdir)/cr_cs.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c
  
  libcr_la-cr_cs.lo: cr_cs.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_cs.Tpo" "$(DEPDIR)/libcr_la-cr_cs.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_cs.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_cs.Tpo -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_cs.Tpo $(DEPDIR)/libcr_la-cr_cs.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_cs.c' object='libcr_la-cr_cs.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_cs.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_cs.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c
--
--libcr_la-cr_pthread.o: cr_pthread.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.o `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo" "$(DEPDIR)/libcr_la-cr_pthread.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_pthread.c' object='libcr_la-cr_pthread.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_pthread.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_pthread.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.o `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c
--
--libcr_la-cr_pthread.obj: cr_pthread.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.obj `if test -f 'cr_pthread.c'; then $(CYGPATH_W) 'cr_pthread.c'; else $(CYGPATH_W) '$(srcdir)/cr_pthread.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo" "$(DEPDIR)/libcr_la-cr_pthread.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_pthread.c' object='libcr_la-cr_pthread.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_pthread.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_pthread.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.obj `if test -f 'cr_pthread.c'; then $(CYGPATH_W) 'cr_pthread.c'; else $(CYGPATH_W) '$(srcdir)/cr_pthread.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c
  
  libcr_la-cr_pthread.lo: cr_pthread.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo" "$(DEPDIR)/libcr_la-cr_pthread.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_pthread.Tpo -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_pthread.Tpo $(DEPDIR)/libcr_la-cr_pthread.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_pthread.c' object='libcr_la-cr_pthread.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_pthread.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_pthread.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c
--
--libcr_la-cr_sig_sync.o: cr_sig_sync.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_la-cr_sig_sync.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
--
--libcr_la-cr_sig_sync.obj: cr_sig_sync.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_la-cr_sig_sync.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c
  
  libcr_la-cr_sig_sync.lo: cr_sig_sync.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_la-cr_sig_sync.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_sig_sync.Tpo -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_sig_sync.Tpo $(DEPDIR)/libcr_la-cr_sig_sync.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_la-cr_sig_sync.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_sig_sync.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_sig_sync.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
--
--libcr_la-cr_syscall.o: cr_syscall.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.o `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo" "$(DEPDIR)/libcr_la-cr_syscall.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_syscall.c' object='libcr_la-cr_syscall.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_syscall.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_syscall.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.o `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c
--
--libcr_la-cr_syscall.obj: cr_syscall.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.obj `if test -f 'cr_syscall.c'; then $(CYGPATH_W) 'cr_syscall.c'; else $(CYGPATH_W) '$(srcdir)/cr_syscall.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo" "$(DEPDIR)/libcr_la-cr_syscall.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_syscall.c' object='libcr_la-cr_syscall.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_syscall.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_syscall.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.obj `if test -f 'cr_syscall.c'; then $(CYGPATH_W) 'cr_syscall.c'; else $(CYGPATH_W) '$(srcdir)/cr_syscall.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
  
  libcr_la-cr_syscall.lo: cr_syscall.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo" "$(DEPDIR)/libcr_la-cr_syscall.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_syscall.Tpo -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_syscall.Tpo $(DEPDIR)/libcr_la-cr_syscall.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_syscall.c' object='libcr_la-cr_syscall.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_syscall.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_syscall.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c
--
--libcr_la-cr_trace.o: cr_trace.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_trace.Tpo" "$(DEPDIR)/libcr_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_trace.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_la-cr_trace.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_trace.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
--
--libcr_la-cr_trace.obj: cr_trace.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_trace.Tpo" "$(DEPDIR)/libcr_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_trace.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_la-cr_trace.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_trace.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c
  
  libcr_la-cr_trace.lo: cr_trace.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_trace.Tpo" "$(DEPDIR)/libcr_la-cr_trace.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_trace.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_trace.Tpo -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_trace.Tpo $(DEPDIR)/libcr_la-cr_trace.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_la-cr_trace.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_trace.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_trace.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
--
--libcr_la-cr_strerror.o: cr_strerror.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.o `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo" "$(DEPDIR)/libcr_la-cr_strerror.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_strerror.c' object='libcr_la-cr_strerror.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_strerror.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_strerror.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.o `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c
--
--libcr_la-cr_strerror.obj: cr_strerror.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.obj `if test -f 'cr_strerror.c'; then $(CYGPATH_W) 'cr_strerror.c'; else $(CYGPATH_W) '$(srcdir)/cr_strerror.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo" "$(DEPDIR)/libcr_la-cr_strerror.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_strerror.c' object='libcr_la-cr_strerror.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_strerror.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_strerror.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.obj `if test -f 'cr_strerror.c'; then $(CYGPATH_W) 'cr_strerror.c'; else $(CYGPATH_W) '$(srcdir)/cr_strerror.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
  
  libcr_la-cr_strerror.lo: cr_strerror.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo" "$(DEPDIR)/libcr_la-cr_strerror.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_strerror.Tpo -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_strerror.Tpo $(DEPDIR)/libcr_la-cr_strerror.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_strerror.c' object='libcr_la-cr_strerror.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_strerror.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_strerror.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c
--
--libcr_la-cr_request.o: cr_request.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.o `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_request.Tpo" "$(DEPDIR)/libcr_la-cr_request.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_request.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_request.c' object='libcr_la-cr_request.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_request.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_request.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.o `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c
--
--libcr_la-cr_request.obj: cr_request.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.obj `if test -f 'cr_request.c'; then $(CYGPATH_W) 'cr_request.c'; else $(CYGPATH_W) '$(srcdir)/cr_request.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_request.Tpo" "$(DEPDIR)/libcr_la-cr_request.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_request.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_request.c' object='libcr_la-cr_request.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_request.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_request.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.obj `if test -f 'cr_request.c'; then $(CYGPATH_W) 'cr_request.c'; else $(CYGPATH_W) '$(srcdir)/cr_request.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c
  
  libcr_la-cr_request.lo: cr_request.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_request.Tpo" "$(DEPDIR)/libcr_la-cr_request.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_request.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_request.Tpo -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_request.Tpo $(DEPDIR)/libcr_la-cr_request.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_request.c' object='libcr_la-cr_request.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_request.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_request.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c
--
--libcr_la-cr_omit.o: cr_omit.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_omit.Tpo" "$(DEPDIR)/libcr_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_omit.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_la-cr_omit.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_omit.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
--
--libcr_la-cr_omit.obj: cr_omit.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_omit.Tpo" "$(DEPDIR)/libcr_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_omit.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_la-cr_omit.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_omit.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c
  
  libcr_la-cr_omit.lo: cr_omit.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_omit.Tpo" "$(DEPDIR)/libcr_la-cr_omit.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_omit.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_omit.Tpo -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_omit.Tpo $(DEPDIR)/libcr_la-cr_omit.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_la-cr_omit.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_omit.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_omit.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
--
--libcr_la-cr_run.o: cr_run.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_run.Tpo" "$(DEPDIR)/libcr_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_run.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_la-cr_run.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_run.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
--
--libcr_la-cr_run.obj: cr_run.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_run.Tpo" "$(DEPDIR)/libcr_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_run.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_la-cr_run.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_run.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
  
  libcr_la-cr_run.lo: cr_run.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_run.Tpo" "$(DEPDIR)/libcr_la-cr_run.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_run.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_run.Tpo -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_la-cr_run.Tpo $(DEPDIR)/libcr_la-cr_run.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_la-cr_run.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_run.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_run.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
--
--libcr_omit_la-cr_omit.o: cr_omit.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.o -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" "$(DEPDIR)/libcr_omit_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_omit_la-cr_omit.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_omit.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
--
--libcr_omit_la-cr_omit.obj: cr_omit.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.obj -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" "$(DEPDIR)/libcr_omit_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_omit_la-cr_omit.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_omit.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
  
  libcr_omit_la-cr_omit.lo: cr_omit.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" "$(DEPDIR)/libcr_omit_la-cr_omit.Plo"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.lo -MD -MP -MF $(DEPDIR)/libcr_omit_la-cr_omit.Tpo -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_omit_la-cr_omit.Tpo $(DEPDIR)/libcr_omit_la-cr_omit.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_omit_la-cr_omit.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_omit.Plo' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_omit.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
--
--libcr_omit_la-cr_trace.o: cr_trace.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.o -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" "$(DEPDIR)/libcr_omit_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_omit_la-cr_trace.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_trace.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
--
--libcr_omit_la-cr_trace.obj: cr_trace.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.obj -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" "$(DEPDIR)/libcr_omit_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_omit_la-cr_trace.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_trace.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
  
  libcr_omit_la-cr_trace.lo: cr_trace.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" "$(DEPDIR)/libcr_omit_la-cr_trace.Plo"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.lo -MD -MP -MF $(DEPDIR)/libcr_omit_la-cr_trace.Tpo -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_omit_la-cr_trace.Tpo $(DEPDIR)/libcr_omit_la-cr_trace.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_omit_la-cr_trace.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_trace.Plo' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_trace.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
--
--libcr_omit_la-cr_sig_sync.o: cr_sig_sync.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.o -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_omit_la-cr_sig_sync.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
--
--libcr_omit_la-cr_sig_sync.obj: cr_sig_sync.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.obj -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_omit_la-cr_sig_sync.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
  
  libcr_omit_la-cr_sig_sync.lo: cr_sig_sync.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.lo -MD -MP -MF $(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo $(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_omit_la-cr_sig_sync.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
--
--libcr_run_la-cr_run.o: cr_run.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.o -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo" "$(DEPDIR)/libcr_run_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_run_la-cr_run.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_run.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
--
--libcr_run_la-cr_run.obj: cr_run.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.obj -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo" "$(DEPDIR)/libcr_run_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_run_la-cr_run.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_run.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
  
  libcr_run_la-cr_run.lo: cr_run.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo" "$(DEPDIR)/libcr_run_la-cr_run.Plo"; else rm -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.lo -MD -MP -MF $(DEPDIR)/libcr_run_la-cr_run.Tpo -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_run_la-cr_run.Tpo $(DEPDIR)/libcr_run_la-cr_run.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_run_la-cr_run.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_run.Plo' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_run.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
--
--libcr_run_la-cr_trace.o: cr_trace.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.o -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" "$(DEPDIR)/libcr_run_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_run_la-cr_trace.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_trace.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
--
--libcr_run_la-cr_trace.obj: cr_trace.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.obj -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" "$(DEPDIR)/libcr_run_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_run_la-cr_trace.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_trace.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
  
  libcr_run_la-cr_trace.lo: cr_trace.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" "$(DEPDIR)/libcr_run_la-cr_trace.Plo"; else rm -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.lo -MD -MP -MF $(DEPDIR)/libcr_run_la-cr_trace.Tpo -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_run_la-cr_trace.Tpo $(DEPDIR)/libcr_run_la-cr_trace.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_run_la-cr_trace.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_trace.Plo' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_trace.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
--
--libcr_run_la-cr_sig_sync.o: cr_sig_sync.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.o -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_run_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_run_la-cr_sig_sync.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
--
--libcr_run_la-cr_sig_sync.obj: cr_sig_sync.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.obj -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_run_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_run_la-cr_sig_sync.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
  
  libcr_run_la-cr_sig_sync.lo: cr_sig_sync.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_run_la-cr_sig_sync.Plo"; else rm -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.lo -MD -MP -MF $(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo $(DEPDIR)/libcr_run_la-cr_sig_sync.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_run_la-cr_sig_sync.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.Plo' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
 +@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -906,80 +588,85 @@
+@@ -588,82 +590,85 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -111474,14 +114469,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -111489,7 +114484,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -111567,7 +114562,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -991,7 +678,7 @@
+@@ -675,7 +680,7 @@
  all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local
  installdirs:
  	for dir in "$(DESTDIR)$(libdir)"; do \
@@ -111576,17 +114571,15 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -1012,7 +699,8 @@
- clean-generic:
+@@ -697,6 +702,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -1026,7 +714,7 @@
+@@ -710,7 +716,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -111595,7 +114588,7 @@
  
  dvi: dvi-am
  
-@@ -1034,18 +722,38 @@
+@@ -718,18 +724,38 @@
  
  html: html-am
  
@@ -111634,7 +114627,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -1066,20 +774,23 @@
+@@ -750,20 +776,23 @@
  
  ps-am:
  
@@ -111645,8 +114638,7 @@
  
  .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
  	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
--	distclean distclean-compile distclean-generic \
-+	dist-hook distclean distclean-compile distclean-generic \
+ 	dist-hook distclean distclean-compile distclean-generic \
  	distclean-libtool distclean-tags distdir dvi dvi-am html \
  	html-am info info-am install install-am install-data \
 -	install-data-am install-exec install-exec-am install-info \
@@ -111667,7 +114659,7 @@
  
  
  # XXX: should split off arch-specific portions of the symbol filter
-@@ -1092,6 +803,7 @@
+@@ -776,6 +805,7 @@
  	find $(distdir)/arch -name CVS | xargs rm -rf
  all-local: $(cr_lib_check)
  	if test -d $(top_builddir)/libcr32/libcr; then $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/libcr32/libcr all; fi
@@ -111675,17 +114667,17 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/man/Makefile.in
+Index: blcr-0.8.4/man/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/man/Makefile.in	2010-10-12 10:44:37.000000000 +0100
-+++ blcr-0.8.2/man/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/man/Makefile.in	2011-10-11 23:58:54.000000000 +0100
++++ blcr-0.8.4/man/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -111709,20 +114701,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -33,6 +31,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = man
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -41,79 +40,35 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -45,77 +43,32 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -111792,7 +114772,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -111800,11 +114780,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -134,20 +89,20 @@
+@@ -136,20 +89,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -111826,7 +114807,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -155,12 +110,11 @@
+@@ -157,12 +111,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -111840,7 +114821,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -174,86 +128,107 @@
+@@ -176,17 +129,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -111850,6 +114831,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -111866,21 +114848,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -200,16 +162,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -111894,11 +114870,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -221,44 +181,56 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -111921,7 +114893,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -111962,7 +114933,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -267,20 +242,17 @@
+@@ -272,20 +244,17 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111986,7 +114957,7 @@
  tags: TAGS
  TAGS:
  
-@@ -289,29 +261,32 @@
+@@ -294,29 +263,32 @@
  
  
  distdir: $(DISTFILES)
@@ -112037,17 +115008,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -338,7 +313,8 @@
- clean-generic:
+@@ -344,6 +316,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -349,7 +325,7 @@
+@@ -354,7 +327,7 @@
  
  distclean: distclean-am
  	-rm -f Makefile
@@ -112056,7 +115025,7 @@
  
  dvi: dvi-am
  
-@@ -357,18 +333,38 @@
+@@ -362,18 +335,38 @@
  
  html: html-am
  
@@ -112095,7 +115064,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -387,17 +383,21 @@
+@@ -392,17 +385,21 @@
  
  ps-am:
  
@@ -112122,17 +115091,17 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: blcr-0.8.2/rpm/Makefile.in
+Index: blcr-0.8.4/rpm/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/rpm/Makefile.in	2010-10-12 10:44:38.000000000 +0100
-+++ blcr-0.8.2/rpm/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/rpm/Makefile.in	2011-10-11 23:58:54.000000000 +0100
++++ blcr-0.8.4/rpm/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -112156,20 +115125,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -33,6 +31,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = rpm
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-@@ -42,79 +41,35 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -46,77 +44,32 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES = specfile
 +CONFIG_CLEAN_VPATH_FILES =
@@ -112239,7 +115196,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -112247,11 +115204,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -135,20 +90,20 @@
+@@ -137,20 +90,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -112273,7 +115231,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -156,12 +111,11 @@
+@@ -158,12 +112,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -112287,7 +115245,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -175,70 +129,91 @@
+@@ -177,17 +130,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -112297,6 +115255,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -112313,21 +115272,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -201,16 +163,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -112341,11 +115294,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -222,28 +182,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -112368,7 +115317,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -112387,7 +115335,7 @@
  
  # To get a spec file w/ the version in it, we copy 'specfile' to the final name
  # This is also our chance to substitute in an RPM release number and a date.
-@@ -257,18 +232,18 @@
+@@ -262,18 +234,18 @@
  all: all-am
  
  .SUFFIXES:
@@ -112412,7 +115360,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -282,10 +257,11 @@
+@@ -287,10 +259,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -112426,7 +115374,7 @@
  specfile: $(top_builddir)/config.status $(srcdir)/specfile.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  
-@@ -294,10 +270,6 @@
+@@ -299,10 +272,6 @@
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -112437,7 +115385,7 @@
  tags: TAGS
  TAGS:
  
-@@ -306,29 +278,32 @@
+@@ -311,29 +280,32 @@
  
  
  distdir: $(DISTFILES)
@@ -112488,21 +115436,15 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -356,18 +331,20 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -362,6 +334,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
-+@HAVE_RPMBUILD_FALSE@clean-local:
- clean: clean-am
- 
- clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+@@ -373,7 +346,7 @@
  
  distclean: distclean-am
  	-rm -f Makefile
@@ -112511,7 +115453,7 @@
  
  dvi: dvi-am
  
-@@ -375,18 +352,38 @@
+@@ -381,18 +354,38 @@
  
  html: html-am
  
@@ -112550,7 +115492,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -405,17 +402,21 @@
+@@ -411,17 +404,21 @@
  
  ps-am:
  
@@ -112576,7 +115518,7 @@
  
  $(RPM_SPECFILE): specfile
  	@PERL@ -pe 's|\@rpm_release\@|$(RPM_RELEASE)|;' \
-@@ -452,6 +453,7 @@
+@@ -458,6 +455,7 @@
  @HAVE_RPMBUILD_FALSE@	@echo "==========================================="
  @HAVE_RPMBUILD_FALSE@distcheck-hook:
  @HAVE_RPMBUILD_FALSE@	@true
@@ -112584,28 +115526,26 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/tests/Makefile.in
+Index: blcr-0.8.4/tests/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/tests/Makefile.in	2010-10-12 10:44:36.000000000 +0100
-+++ blcr-0.8.2/tests/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/tests/Makefile.in	2011-10-11 23:58:55.000000000 +0100
++++ blcr-0.8.4/tests/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,17 +16,12 @@
+@@ -15,15 +16,12 @@
  @SET_MAKE@
  
  
--SOURCES = $(libtest_a_SOURCES) atomics.c atomics_stress.c bug2003_aux.c bug2524.c cb_exit.c child.c cloexec.c cr_signal.c cr_tryenter_cs.c critical_sections.c crut_wrapper.c cs_enter_leave.c cs_enter_leave2.c cwd.c dev_null.c dlopen_aux.c dpipe.c dup.c edeadlk.c failed_cb.c failed_cb2.c filedescriptors.c forward.c get_info.c hello.c hooks.c hugetlbfs.c hugetlbfs2.c lam.c linked_fifo.c math.c mmaps.c named_fifo.c orphan.c overlap.c pause.c pid_in_use.c pid_restore.c pipe.c prctl.c ptrace.c readdir.c reloc_aux.c replace_cb.c save_aux.c seq_wrapper.c sigaltstack.c sigpending.c simple.c simple_pthread.c stage0001.c stage0002.c stage0003.c stage0004.c stopped.c $(testcxx_SOURCES)
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -112620,12 +115560,7 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -37,10 +33,12 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
+@@ -40,6 +38,7 @@
  @CR_BUILD_TESTSUITE_TRUE@testsexec_PROGRAMS = $(am__EXEEXT_6) \
  @CR_BUILD_TESTSUITE_TRUE@	$(am__EXEEXT_14)
  check_PROGRAMS = $(am__EXEEXT_7) $(am__EXEEXT_13) $(am__EXEEXT_14)
@@ -112633,26 +115568,19 @@
  subdir = tests
  DIST_COMMON = $(check_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/shellinit.in
-@@ -49,9 +47,10 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -51,6 +50,7 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES = shellinit
 +CONFIG_CLEAN_VPATH_FILES =
  ARFLAGS = cru
  libtest_a_AR = $(AR) $(ARFLAGS)
  libtest_a_LIBADD =
-@@ -89,298 +88,297 @@
- am__EXEEXT_13 = $(am__EXEEXT_8) $(am__EXEEXT_10) $(am__EXEEXT_11) \
- 	$(am__EXEEXT_12)
+@@ -90,264 +90,299 @@
  am__EXEEXT_14 = seq_wrapper$(EXEEXT) crut_wrapper$(EXEEXT)
--am__installdirs = "$(DESTDIR)$(testsexecdir)" "$(DESTDIR)$(testsexecdir)"
+ am__installdirs = "$(DESTDIR)$(testsexecdir)" \
+ 	"$(DESTDIR)$(testsexecdir)"
 -testsexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+am__installdirs = "$(DESTDIR)$(testsexecdir)" \
-+	"$(DESTDIR)$(testsexecdir)"
  PROGRAMS = $(testsexec_PROGRAMS)
  atomics_SOURCES = atomics.c
  atomics_OBJECTS = atomics-atomics.$(OBJEXT)
@@ -112833,6 +115761,11 @@
  named_fifo_LDADD = $(LDADD)
 -named_fifo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
 +named_fifo_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2)
+ nscd_SOURCES = nscd.c
+ nscd_OBJECTS = nscd.$(OBJEXT)
+ nscd_LDADD = $(LDADD)
+-nscd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
++nscd_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2)
  orphan_SOURCES = orphan.c
  orphan_OBJECTS = orphan.$(OBJEXT)
  orphan_LDADD = $(LDADD)
@@ -112992,77 +115925,40 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/atomics-atomics.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/atomics_stress-atomics_stress.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/bug2003_aux.Po ./$(DEPDIR)/bug2524.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/cb_exit.Po ./$(DEPDIR)/child.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/cloexec.Po ./$(DEPDIR)/cr_signal.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/cr_tryenter_cs.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/critical_sections.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/crut.Po ./$(DEPDIR)/crut_util.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/crut_util_libcr.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/crut_util_pth.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/crut_wrapper.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/cs_enter_leave.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/cs_enter_leave2.Po ./$(DEPDIR)/cwd.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/dev_null.Po ./$(DEPDIR)/dlopen_aux.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/dpipe.Po ./$(DEPDIR)/dup.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/edeadlk.Po ./$(DEPDIR)/failed_cb.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/failed_cb2.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/filedescriptors.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/forward.Po ./$(DEPDIR)/get_info.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/hello.Po ./$(DEPDIR)/hooks.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/hugetlbfs.Po ./$(DEPDIR)/hugetlbfs2.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/lam.Po ./$(DEPDIR)/linked_fifo.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/math.Po ./$(DEPDIR)/mmaps.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/named_fifo.Po ./$(DEPDIR)/orphan.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/overlap.Po ./$(DEPDIR)/pause.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/pid_in_use.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/pid_restore.Po ./$(DEPDIR)/pipe.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/prctl.Po ./$(DEPDIR)/ptrace.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/readdir.Po ./$(DEPDIR)/reloc_aux.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/replace_cb.Po ./$(DEPDIR)/save_aux.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/seq_wrapper.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/sigaltstack.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/sigpending.Po ./$(DEPDIR)/simple.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/simple_pthread.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/stage0001.Po ./$(DEPDIR)/stage0002.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/stage0003.Po ./$(DEPDIR)/stage0004.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/stopped.Po ./$(DEPDIR)/testcxx.Po
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 +	$(LDFLAGS) -o $@
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +	$(LDFLAGS) -o $@
  SOURCES = $(libtest_a_SOURCES) atomics.c atomics_stress.c \
  	bug2003_aux.c bug2524.c cb_exit.c child.c cloexec.c \
  	cr_signal.c cr_tryenter_cs.c critical_sections.c \
-@@ -407,74 +405,32 @@
- 	stage0003.c stage0004.c stopped.c $(am__testcxx_SOURCES_DIST)
+@@ -376,75 +411,32 @@
+ 	$(am__testcxx_SOURCES_DIST)
  ETAGS = etags
  CTAGS = ctags
 +am__tty_colors = \
@@ -113132,7 +116028,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -113140,11 +116036,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -495,20 +451,20 @@
+@@ -465,20 +457,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -113166,7 +116063,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -516,12 +472,11 @@
+@@ -486,12 +479,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -113180,7 +116077,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -535,70 +490,91 @@
+@@ -505,17 +497,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -113190,6 +116087,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -113206,21 +116104,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -529,16 +530,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -113234,11 +116126,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -550,28 +549,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -113261,7 +116149,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -113280,7 +116167,7 @@
  
  # Files we clean at various times
  CONTEXTS = context.* .context.*.tmp Context[123] .Context[123].tmp
-@@ -771,7 +747,6 @@
+@@ -744,7 +755,6 @@
  check_LIBRARIES = libtest.a
  check_HEADERS = crut.h crut_util.h
  check_SCRIPTS = check_module clean_temps build_util $(check_scripts) $(check_scripts2)
@@ -113288,7 +116175,7 @@
  EXTRA_DIST = license.txt CountingApp.java CountingApp.class RUN_ME.in $(all_scripts_src)
  MOSTLYCLEANFILES = core core.* $(CONTEXTS)
  CLEANFILES = $(SEQ_RUN) $(CRUT_RUN) $(SEQ_RUN2) $(CRUT_RUN2) $(all_scripts) \
-@@ -781,18 +756,18 @@
+@@ -754,18 +764,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -113313,7 +116200,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -806,10 +781,11 @@
+@@ -779,10 +789,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113327,7 +116214,7 @@
  shellinit: $(top_builddir)/config.status $(srcdir)/shellinit.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  
-@@ -821,39 +797,56 @@
+@@ -794,39 +805,56 @@
  	$(RANLIB) libtest.a
  
  clean-checkPROGRAMS:
@@ -113410,17 +116297,7 @@
  
  installcheck-testsexecPROGRAMS: $(testsexec_PROGRAMS)
  	bad=0; pid=$$$$; list="$(testsexec_PROGRAMS)"; for p in $$list; do \
-@@ -863,7 +856,8 @@
- 	  f=`echo "$$p" | \
- 	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- 	  for opt in --help --version; do \
--	    if "$(DESTDIR)$(testsexecdir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
-+	    if "$(DESTDIR)$(testsexecdir)/$$f" $$opt >c$${pid}_.out \
-+	         2>c$${pid}_.err </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-@@ -871,191 +865,206 @@
+@@ -845,194 +873,209 @@
  	done; rm -f c$${pid}_.???; exit $$bad
  atomics$(EXEEXT): $(atomics_OBJECTS) $(atomics_DEPENDENCIES) 
  	@rm -f atomics$(EXEEXT)
@@ -113554,6 +116431,10 @@
  	@rm -f named_fifo$(EXEEXT)
 -	$(LINK) $(named_fifo_LDFLAGS) $(named_fifo_OBJECTS) $(named_fifo_LDADD) $(LIBS)
 +	$(LINK) $(named_fifo_OBJECTS) $(named_fifo_LDADD) $(LIBS)
+ nscd$(EXEEXT): $(nscd_OBJECTS) $(nscd_DEPENDENCIES) 
+ 	@rm -f nscd$(EXEEXT)
+-	$(LINK) $(nscd_LDFLAGS) $(nscd_OBJECTS) $(nscd_LDADD) $(LIBS)
++	$(LINK) $(nscd_OBJECTS) $(nscd_LDADD) $(LIBS)
  orphan$(EXEEXT): $(orphan_OBJECTS) $(orphan_DEPENDENCIES) 
  	@rm -f orphan$(EXEEXT)
 -	$(LINK) $(orphan_LDFLAGS) $(orphan_OBJECTS) $(orphan_LDADD) $(LIBS)
@@ -113696,17 +116577,7 @@
  
  installcheck-testsexecSCRIPTS: $(testsexec_SCRIPTS)
  	bad=0; pid=$$$$; list="$(testsexec_SCRIPTS)"; for p in $$list; do \
-@@ -1064,7 +1073,8 @@
- 	  esac; \
- 	  f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
- 	  for opt in --help --version; do \
--	    if "$(DESTDIR)$(testsexecdir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
-+	    if "$(DESTDIR)$(testsexecdir)/$$f" $$opt >c$${pid}_.out \
-+	         2>c$${pid}_.err </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-@@ -1139,99 +1149,73 @@
+@@ -1118,71 +1161,71 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testcxx.Po@am__quote@
  
  .c.o:
@@ -113715,9 +116586,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -113726,9 +116595,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -113737,9 +116604,7 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
  
  atomics-atomics.o: atomics.c
@@ -113748,9 +116613,7 @@
 +@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.o -MD -MP -MF $(DEPDIR)/atomics-atomics.Tpo -c -o atomics-atomics.o `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/atomics-atomics.Tpo $(DEPDIR)/atomics-atomics.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics.c' object='atomics-atomics.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics-atomics.Po' tmpdepfile='$(DEPDIR)/atomics-atomics.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -c -o atomics-atomics.o `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c
  
  atomics-atomics.obj: atomics.c
@@ -113759,28 +116622,16 @@
 +@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.obj -MD -MP -MF $(DEPDIR)/atomics-atomics.Tpo -c -o atomics-atomics.obj `if test -f 'atomics.c'; then $(CYGPATH_W) 'atomics.c'; else $(CYGPATH_W) '$(srcdir)/atomics.c'; fi`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/atomics-atomics.Tpo $(DEPDIR)/atomics-atomics.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics.c' object='atomics-atomics.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics-atomics.Po' tmpdepfile='$(DEPDIR)/atomics-atomics.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -c -o atomics-atomics.obj `if test -f 'atomics.c'; then $(CYGPATH_W) 'atomics.c'; else $(CYGPATH_W) '$(srcdir)/atomics.c'; fi`
  
--atomics-atomics.lo: atomics.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.lo -MD -MP -MF "$(DEPDIR)/atomics-atomics.Tpo" -c -o atomics-atomics.lo `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atomics-atomics.Tpo" "$(DEPDIR)/atomics-atomics.Plo"; else rm -f "$(DEPDIR)/atomics-atomics.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics.c' object='atomics-atomics.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics-atomics.Plo' tmpdepfile='$(DEPDIR)/atomics-atomics.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -c -o atomics-atomics.lo `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c
--
  atomics_stress-atomics_stress.o: atomics_stress.c
 -@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.o -MD -MP -MF "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" -c -o atomics_stress-atomics_stress.o `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c; \
 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" "$(DEPDIR)/atomics_stress-atomics_stress.Po"; else rm -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo"; exit 1; fi
 +@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.o -MD -MP -MF $(DEPDIR)/atomics_stress-atomics_stress.Tpo -c -o atomics_stress-atomics_stress.o `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/atomics_stress-atomics_stress.Tpo $(DEPDIR)/atomics_stress-atomics_stress.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics_stress.c' object='atomics_stress-atomics_stress.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics_stress-atomics_stress.Po' tmpdepfile='$(DEPDIR)/atomics_stress-atomics_stress.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -c -o atomics_stress-atomics_stress.o `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c
  
  atomics_stress-atomics_stress.obj: atomics_stress.c
@@ -113789,28 +116640,16 @@
 +@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.obj -MD -MP -MF $(DEPDIR)/atomics_stress-atomics_stress.Tpo -c -o atomics_stress-atomics_stress.obj `if test -f 'atomics_stress.c'; then $(CYGPATH_W) 'atomics_stress.c'; else $(CYGPATH_W) '$(srcdir)/atomics_stress.c'; fi`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/atomics_stress-atomics_stress.Tpo $(DEPDIR)/atomics_stress-atomics_stress.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics_stress.c' object='atomics_stress-atomics_stress.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics_stress-atomics_stress.Po' tmpdepfile='$(DEPDIR)/atomics_stress-atomics_stress.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -c -o atomics_stress-atomics_stress.obj `if test -f 'atomics_stress.c'; then $(CYGPATH_W) 'atomics_stress.c'; else $(CYGPATH_W) '$(srcdir)/atomics_stress.c'; fi`
  
--atomics_stress-atomics_stress.lo: atomics_stress.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.lo -MD -MP -MF "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" -c -o atomics_stress-atomics_stress.lo `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" "$(DEPDIR)/atomics_stress-atomics_stress.Plo"; else rm -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics_stress.c' object='atomics_stress-atomics_stress.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics_stress-atomics_stress.Plo' tmpdepfile='$(DEPDIR)/atomics_stress-atomics_stress.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -c -o atomics_stress-atomics_stress.lo `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c
--
  .cc.o:
 -@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 -@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 +@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
@@ -113819,9 +116658,7 @@
 +@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
@@ -113830,13 +116667,9 @@
 +@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
-@@ -1240,52 +1224,54 @@
+@@ -1193,54 +1236,54 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -113867,14 +116700,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -113882,7 +116715,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -113911,7 +116744,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -1293,7 +1279,8 @@
+@@ -1248,7 +1291,8 @@
  check-TESTS: $(TESTS)
  	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
  	srcdir=$(srcdir); export srcdir; \
@@ -113921,7 +116754,7 @@
  	if test -n "$$list"; then \
  	  for tst in $$list; do \
  	    if test -f ./$$tst; then dir=./; \
-@@ -1302,91 +1289,112 @@
+@@ -1257,49 +1301,63 @@
  	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
  	      all=`expr $$all + 1`; \
  	      case " $(XFAIL_TESTS) " in \
@@ -113989,20 +116822,15 @@
  	  skipped=""; \
  	  if test "$$skip" -ne 0; then \
 -	    skipped="($$skip tests were not run)"; \
--	    test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
 +	    if test "$$skip" -eq 1; then \
 +	      skipped="($$skip test was not run)"; \
 +	    else \
 +	      skipped="($$skip tests were not run)"; \
 +	    fi; \
-+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
  	      dashes="$$skipped"; \
  	  fi; \
- 	  report=""; \
- 	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
- 	    report="Please report to $(PACKAGE_BUGREPORT)"; \
--	    test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \
-+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+@@ -1310,38 +1368,45 @@
  	      dashes="$$report"; \
  	  fi; \
  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -114013,11 +116841,9 @@
 +	    echo "$$red$$dashes"; \
 +	  fi; \
  	  echo "$$banner"; \
--	  test -n "$$skipped" && echo "$$skipped"; \
--	  test -n "$$report" && echo "$$report"; \
+ 	  test -z "$$skipped" || echo "$$skipped"; \
+ 	  test -z "$$report" || echo "$$report"; \
 -	  echo "$$dashes"; \
-+	  test -z "$$skipped" || echo "$$skipped"; \
-+	  test -z "$$report" || echo "$$report"; \
 +	  echo "$$dashes$$std"; \
  	  test "$$failed" -eq 0; \
  	else :; fi
@@ -114070,7 +116896,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -1398,7 +1406,7 @@
+@@ -1353,7 +1418,7 @@
  all-am: Makefile $(PROGRAMS) $(SCRIPTS)
  installdirs:
  	for dir in "$(DESTDIR)$(testsexecdir)" "$(DESTDIR)$(testsexecdir)"; do \
@@ -114079,23 +116905,15 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -1421,11 +1429,14 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -1377,6 +1442,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
-+@CR_BUILD_TESTSUITE_FALSE@uninstall-local:
-+@CR_BUILD_TESTSUITE_FALSE@install-exec-local:
- clean: clean-am
- 
- clean-am: clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
-@@ -1436,7 +1447,7 @@
+@@ -1393,7 +1459,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -114104,7 +116922,7 @@
  
  dvi: dvi-am
  
-@@ -1444,19 +1455,39 @@
+@@ -1401,19 +1467,39 @@
  
  html: html-am
  
@@ -114144,7 +116962,7 @@
  installcheck-am: installcheck-testsexecPROGRAMS \
  	installcheck-testsexecSCRIPTS
  
-@@ -1478,8 +1509,10 @@
+@@ -1435,8 +1521,10 @@
  
  ps-am:
  
@@ -114157,7 +116975,7 @@
  
  .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
  	clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
-@@ -1487,16 +1520,18 @@
+@@ -1444,16 +1532,18 @@
  	distclean distclean-compile distclean-generic \
  	distclean-libtool distclean-tags distdir dvi dvi-am html \
  	html-am info info-am install install-am install-data \
@@ -114180,7 +116998,7 @@
  
  
  # Special target (run before tests) ensures the kernel modules are loaded
-@@ -1590,6 +1625,7 @@
+@@ -1547,6 +1637,7 @@
  FORCE:
  
  # Preserve the empty line above!
@@ -114188,17 +117006,17 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/util/Makefile.in
+Index: blcr-0.8.4/util/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/util/Makefile.in	2010-10-12 10:44:41.000000000 +0100
-+++ blcr-0.8.2/util/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/util/Makefile.in	2011-10-11 23:58:55.000000000 +0100
++++ blcr-0.8.4/util/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -114222,20 +117040,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -33,6 +31,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = util
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -41,88 +40,75 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -45,86 +43,72 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -114349,7 +117155,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -114357,11 +117163,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -143,20 +129,20 @@
+@@ -145,20 +129,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -114383,7 +117190,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -164,12 +150,11 @@
+@@ -166,12 +151,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -114397,7 +117204,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -183,70 +168,91 @@
+@@ -185,17 +169,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -114407,6 +117214,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -114423,21 +117231,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -209,16 +202,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -114451,11 +117253,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -230,28 +221,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -114478,7 +117276,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -114497,7 +117294,7 @@
  @BUILD_CR_INFO_FALSE@cr_info = 
  
  # cr_info is disabled since vmadcheck is currently broken -PHH 12.5.03
-@@ -256,18 +262,18 @@
+@@ -261,18 +264,18 @@
  all: all-recursive
  
  .SUFFIXES:
@@ -114522,7 +117319,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -281,10 +287,11 @@
+@@ -286,10 +289,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -114536,7 +117333,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -292,10 +299,6 @@
+@@ -297,10 +301,6 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -114547,29 +117344,22 @@
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
  # To change the values of `make' variables: instead of editing Makefiles,
-@@ -303,7 +306,13 @@
+@@ -308,7 +308,7 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
+-	@failcom='exit 1'; \
 +	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -314,16 +323,21 @@
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -325,16 +325,15 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
 -	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
+ 	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -114577,26 +117367,19 @@
  
 -mostlyclean-recursive clean-recursive distclean-recursive \
 -maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
+-	@failcom='exit 1'; \
 +$(RECURSIVE_CLEAN_TARGETS):
 +	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -343,16 +357,16 @@
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -360,16 +359,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
 -	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
+ 	  || eval $$failcom; \
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -114610,7 +117393,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -360,94 +374,120 @@
+@@ -377,14 +376,14 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -114626,19 +117409,13 @@
 -	tags=; \
 +	set x; \
  	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
+@@ -396,81 +395,101 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
+ 	    test ! -f $$subdir/TAGS || \
 -	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	    test ! -f $$subdir/TAGS || \
 +	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
@@ -114648,14 +117425,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -114663,7 +117440,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -114745,9 +117522,11 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || mkdir "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
 +	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
+-	    distdir=`$(am__cd) $(distdir) && pwd`; \
+-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 -	    (cd $$subdir && \
 +	  fi; \
 +	done
@@ -114763,8 +117542,8 @@
 +	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 +	    ($(am__cd) $$subdir && \
  	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="../$(top_distdir)" \
--	        distdir="../$(distdir)/$$subdir" \
+-	        top_distdir="$$top_distdir" \
+-	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
 +		am__remove_distdir=: \
@@ -114773,17 +117552,15 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -476,7 +516,8 @@
- clean-generic:
+@@ -500,6 +519,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -487,8 +528,7 @@
+@@ -510,8 +530,7 @@
  
  distclean: distclean-recursive
  	-rm -f Makefile
@@ -114793,7 +117570,7 @@
  
  dvi: dvi-recursive
  
-@@ -496,18 +536,38 @@
+@@ -519,18 +538,38 @@
  
  html: html-recursive
  
@@ -114832,7 +117609,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -526,22 +586,25 @@
+@@ -549,22 +588,25 @@
  
  ps-am:
  
@@ -114870,28 +117647,26 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: blcr-0.8.2/util/cr_checkpoint/Makefile.in
+Index: blcr-0.8.4/util/cr_checkpoint/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/util/cr_checkpoint/Makefile.in	2010-10-12 10:44:41.000000000 +0100
-+++ blcr-0.8.2/util/cr_checkpoint/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/util/cr_checkpoint/Makefile.in	2011-10-11 23:58:55.000000000 +0100
++++ blcr-0.8.4/util/cr_checkpoint/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,17 +15,12 @@
+@@ -14,15 +15,12 @@
  
  @SET_MAKE@
  
--SOURCES = cr_checkpoint.c
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -114906,20 +117681,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -36,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- bin_PROGRAMS = cr_checkpoint$(EXEEXT)
- @CR_INSTALLED_LIBCR_TRUE@cr_checkpoint_DEPENDENCIES =
-@@ -46,29 +43,51 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -48,25 +46,48 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -114933,18 +117696,17 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cr_checkpoint.Po
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -114975,7 +117737,7 @@
  man1dir = $(mandir)/man1
  NROFF = nroff
  MANS = $(man_MANS)
-@@ -76,72 +95,27 @@
+@@ -74,73 +95,27 @@
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
@@ -115041,7 +117803,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -115049,11 +117811,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -162,20 +136,20 @@
+@@ -161,20 +136,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -115075,7 +117838,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -183,12 +157,11 @@
+@@ -182,12 +158,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -115089,7 +117852,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -202,70 +175,91 @@
+@@ -201,17 +176,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -115099,6 +117862,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -115115,21 +117879,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -225,16 +209,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -115143,11 +117901,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -246,28 +228,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -115170,7 +117924,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -115189,7 +117942,7 @@
  @CR_INSTALLED_LIBCR_FALSE@LDADD = -L$(top_builddir)/libcr -lcr @CR_CLIENT_LDADD@
  @CR_INSTALLED_LIBCR_TRUE@LDADD = -L$(libdir) -lcr @CR_CLIENT_LDADD@
  @CR_INSTALLED_LIBCR_FALSE@INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-@@ -284,18 +278,18 @@
+@@ -286,18 +280,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -115214,7 +117967,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -309,38 +303,54 @@
+@@ -311,38 +305,54 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -115292,17 +118045,7 @@
  
  installcheck-binPROGRAMS: $(bin_PROGRAMS)
  	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
-@@ -350,7 +360,8 @@
- 	  f=`echo "$$p" | \
- 	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- 	  for opt in --help --version; do \
--	    if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
-+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
-+	         2>c$${pid}_.err </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-@@ -358,7 +369,7 @@
+@@ -361,7 +371,7 @@
  	done; rm -f c$${pid}_.???; exit $$bad
  cr_checkpoint$(EXEEXT): $(cr_checkpoint_OBJECTS) $(cr_checkpoint_DEPENDENCIES) 
  	@rm -f cr_checkpoint$(EXEEXT)
@@ -115311,7 +118054,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -369,27 +380,24 @@
+@@ -372,22 +382,22 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cr_checkpoint.Po@am__quote@
  
  .c.o:
@@ -115320,9 +118063,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -115331,9 +118072,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -115342,13 +118081,9 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
-@@ -397,126 +405,137 @@
+@@ -397,128 +407,137 @@
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -115459,14 +118194,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -115474,7 +118209,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -115565,7 +118300,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -525,7 +544,7 @@
+@@ -527,7 +546,7 @@
  all-am: Makefile $(PROGRAMS) $(MANS)
  installdirs:
  	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
@@ -115574,17 +118309,15 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -547,7 +566,8 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -550,6 +569,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,7 +580,7 @@
+@@ -562,7 +582,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -115593,7 +118326,7 @@
  
  dvi: dvi-am
  
-@@ -568,18 +588,38 @@
+@@ -570,18 +590,38 @@
  
  html: html-am
  
@@ -115632,7 +118365,7 @@
  installcheck-am: installcheck-binPROGRAMS
  
  maintainer-clean: maintainer-clean-am
-@@ -600,22 +640,26 @@
+@@ -602,22 +642,26 @@
  
  ps-am:
  
@@ -115664,7 +118397,7 @@
  
  @CR_INSTALLED_LIBCR_FALSE@$(LIBCR):
  @CR_INSTALLED_LIBCR_FALSE@	@$(MAKE) $(AM_MAKEFLAGS) --no-print-directory -C $(@D)
-@@ -635,6 +679,7 @@
+@@ -637,6 +681,7 @@
  
  @CR_BUILD_MAN_TRUE@dev-clean:
  @CR_BUILD_MAN_TRUE@	-rm -rf man1 $(manfiles)
@@ -115672,17 +118405,17 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/util/cr_info/Makefile.in
+Index: blcr-0.8.4/util/cr_info/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/util/cr_info/Makefile.in	2010-10-12 10:44:41.000000000 +0100
-+++ blcr-0.8.2/util/cr_info/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/util/cr_info/Makefile.in	2011-10-11 23:58:55.000000000 +0100
++++ blcr-0.8.4/util/cr_info/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -115706,20 +118439,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -34,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = util/cr_info
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -42,82 +41,58 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -46,80 +44,55 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -115813,7 +118534,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -115821,11 +118542,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -138,20 +113,20 @@
+@@ -140,20 +113,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -115847,7 +118569,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -159,12 +134,11 @@
+@@ -161,12 +135,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -115861,7 +118583,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -178,70 +152,91 @@
+@@ -180,17 +153,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -115871,6 +118593,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -115887,21 +118610,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -204,16 +186,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -115915,11 +118632,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -225,28 +205,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -115942,7 +118655,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -115961,7 +118673,7 @@
  vmadump_dir = @TOP_BUILDDIR@/vmadump4
  bin_SCRIPTS = cr_info
  CLEANFILES = cr_info
-@@ -249,18 +244,18 @@
+@@ -254,18 +246,18 @@
  all: all-am
  
  .SUFFIXES:
@@ -115986,7 +118698,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -274,29 +269,45 @@
+@@ -279,29 +271,45 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -116047,17 +118759,7 @@
  
  installcheck-binSCRIPTS: $(bin_SCRIPTS)
  	bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \
-@@ -305,7 +316,8 @@
- 	  esac; \
- 	  f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
- 	  for opt in --help --version; do \
--	    if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
-+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
-+	         2>c$${pid}_.err </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-@@ -317,10 +329,6 @@
+@@ -323,10 +331,6 @@
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -116068,7 +118770,7 @@
  tags: TAGS
  TAGS:
  
-@@ -329,29 +337,32 @@
+@@ -335,29 +339,32 @@
  
  
  distdir: $(DISTFILES)
@@ -116119,7 +118821,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -360,7 +371,7 @@
+@@ -366,7 +373,7 @@
  all-am: Makefile $(SCRIPTS)
  installdirs:
  	for dir in "$(DESTDIR)$(bindir)"; do \
@@ -116128,17 +118830,15 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -382,7 +393,8 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -389,6 +396,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -393,7 +405,7 @@
+@@ -399,7 +407,7 @@
  
  distclean: distclean-am
  	-rm -f Makefile
@@ -116147,7 +118847,7 @@
  
  dvi: dvi-am
  
-@@ -401,20 +413,39 @@
+@@ -407,20 +415,39 @@
  
  html: html-am
  
@@ -116187,7 +118887,7 @@
  installcheck-am: installcheck-binSCRIPTS
  
  maintainer-clean: maintainer-clean-am
-@@ -433,18 +464,22 @@
+@@ -439,18 +466,22 @@
  
  ps-am:
  
@@ -116200,8 +118900,8 @@
  	distclean distclean-generic distclean-libtool distdir dvi \
  	dvi-am html html-am info info-am install install-am \
 -	install-binSCRIPTS install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-strip installcheck installcheck-am \
+-	install-exec-am install-exec-hook install-info install-info-am \
+-	install-man install-strip installcheck installcheck-am \
 +	install-binSCRIPTS install-data install-data-am install-dvi \
 +	install-dvi-am install-exec install-exec-am install-exec-hook \
 +	install-html install-html-am install-info install-info-am \
@@ -116215,7 +118915,7 @@
  
  cr_info: cr_info.in Makefile
  	@PERL@ -pe 's|\@vmadump_dir\@|$(vmadump_dir)|;\
-@@ -457,6 +492,7 @@
+@@ -463,6 +494,7 @@
  	@PERL@ -ni -e 's|\@libexecdir\@|$(libexecdir)|; \
  		     print unless /###do_not_install###/' \
  				$(DESTDIR)$(bindir)/cr_info
@@ -116223,28 +118923,26 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/util/cr_restart/Makefile.in
+Index: blcr-0.8.4/util/cr_restart/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/util/cr_restart/Makefile.in	2010-10-12 10:44:41.000000000 +0100
-+++ blcr-0.8.2/util/cr_restart/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/util/cr_restart/Makefile.in	2011-10-11 23:58:55.000000000 +0100
++++ blcr-0.8.4/util/cr_restart/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,17 +15,12 @@
+@@ -14,15 +15,12 @@
  
  @SET_MAKE@
  
--SOURCES = cr_restart.c
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -116259,20 +118957,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -36,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- bin_PROGRAMS = cr_restart$(EXEEXT)
- @CR_INSTALLED_LIBCR_TRUE@cr_restart_DEPENDENCIES =
-@@ -46,29 +43,51 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -48,25 +46,48 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -116286,18 +118972,17 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cr_restart.Po
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -116328,7 +119013,7 @@
  man1dir = $(mandir)/man1
  NROFF = nroff
  MANS = $(man_MANS)
-@@ -76,72 +95,27 @@
+@@ -74,73 +95,27 @@
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
@@ -116394,7 +119079,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -116402,11 +119087,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -162,20 +136,20 @@
+@@ -161,20 +136,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -116428,7 +119114,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -183,12 +157,11 @@
+@@ -182,12 +158,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -116442,7 +119128,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -202,70 +175,91 @@
+@@ -201,17 +176,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -116452,6 +119138,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -116468,21 +119155,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -225,16 +209,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -116496,11 +119177,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -246,28 +228,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -116523,7 +119200,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -116542,7 +119218,7 @@
  @CR_INSTALLED_LIBCR_FALSE@LDADD = -L$(top_builddir)/libcr -lcr @CR_CLIENT_LDADD@
  @CR_INSTALLED_LIBCR_TRUE@LDADD = -L$(libdir) -lcr @CR_CLIENT_LDADD@
  @CR_INSTALLED_LIBCR_FALSE@INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-@@ -284,18 +278,18 @@
+@@ -286,18 +280,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -116567,7 +119243,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -309,38 +303,54 @@
+@@ -311,38 +305,54 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -116645,17 +119321,7 @@
  
  installcheck-binPROGRAMS: $(bin_PROGRAMS)
  	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
-@@ -350,7 +360,8 @@
- 	  f=`echo "$$p" | \
- 	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- 	  for opt in --help --version; do \
--	    if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
-+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
-+	         2>c$${pid}_.err </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-@@ -358,7 +369,7 @@
+@@ -361,7 +371,7 @@
  	done; rm -f c$${pid}_.???; exit $$bad
  cr_restart$(EXEEXT): $(cr_restart_OBJECTS) $(cr_restart_DEPENDENCIES) 
  	@rm -f cr_restart$(EXEEXT)
@@ -116664,7 +119330,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -369,27 +380,24 @@
+@@ -372,22 +382,22 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cr_restart.Po@am__quote@
  
  .c.o:
@@ -116673,9 +119339,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -116684,9 +119348,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -116695,13 +119357,9 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
-@@ -397,126 +405,137 @@
+@@ -397,128 +407,137 @@
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -116812,14 +119470,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -116827,7 +119485,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -116918,7 +119576,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -525,7 +544,7 @@
+@@ -527,7 +546,7 @@
  all-am: Makefile $(PROGRAMS) $(MANS)
  installdirs:
  	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
@@ -116927,17 +119585,15 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -547,7 +566,8 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -550,6 +569,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,7 +580,7 @@
+@@ -562,7 +582,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -116946,7 +119602,7 @@
  
  dvi: dvi-am
  
-@@ -568,18 +588,38 @@
+@@ -570,18 +590,38 @@
  
  html: html-am
  
@@ -116985,7 +119641,7 @@
  installcheck-am: installcheck-binPROGRAMS
  
  maintainer-clean: maintainer-clean-am
-@@ -600,22 +640,26 @@
+@@ -602,22 +642,26 @@
  
  ps-am:
  
@@ -117017,7 +119673,7 @@
  
  @CR_INSTALLED_LIBCR_FALSE@$(LIBCR):
  @CR_INSTALLED_LIBCR_FALSE@	@$(MAKE) $(AM_MAKEFLAGS) --no-print-directory -C $(@D)
-@@ -635,6 +679,7 @@
+@@ -637,6 +681,7 @@
  
  @CR_BUILD_MAN_TRUE@dev-clean:
  @CR_BUILD_MAN_TRUE@	-rm -rf man1 $(manfiles)
@@ -117025,17 +119681,17 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/util/cr_run/Makefile.in
+Index: blcr-0.8.4/util/cr_run/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/util/cr_run/Makefile.in	2010-10-12 10:44:41.000000000 +0100
-+++ blcr-0.8.2/util/cr_run/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/util/cr_run/Makefile.in	2011-10-11 23:58:55.000000000 +0100
++++ blcr-0.8.4/util/cr_run/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
@@ -117059,20 +119715,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -34,6 +32,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- subdir = util/cr_run
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -42,11 +41,32 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -46,8 +44,29 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -117102,7 +119746,7 @@
  SCRIPTS = $(bin_SCRIPTS)
  SOURCES =
  DIST_SOURCES =
-@@ -55,72 +75,27 @@
+@@ -56,73 +75,27 @@
  MANS = $(man_MANS)
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
@@ -117168,7 +119812,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -117176,11 +119820,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -141,20 +116,20 @@
+@@ -143,20 +116,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -117202,7 +119847,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -162,12 +137,11 @@
+@@ -164,12 +138,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -117216,7 +119861,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -181,70 +155,91 @@
+@@ -183,17 +156,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -117226,6 +119871,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -117242,21 +119888,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -207,16 +189,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -117270,11 +119910,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -228,28 +208,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -117297,7 +119933,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -117316,7 +119951,7 @@
  bin_SCRIPTS = cr_run
  CLEANFILES = cr_run
  EXTRA_DIST = cr_run.in cr_run.1
-@@ -252,18 +247,18 @@
+@@ -257,18 +249,18 @@
  all: all-am
  
  .SUFFIXES:
@@ -117341,7 +119976,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -277,29 +272,45 @@
+@@ -282,29 +274,45 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -117402,17 +120037,7 @@
  
  installcheck-binSCRIPTS: $(bin_SCRIPTS)
  	bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \
-@@ -308,7 +319,8 @@
- 	  esac; \
- 	  f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
- 	  for opt in --help --version; do \
--	    if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
-+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
-+	         2>c$${pid}_.err </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-@@ -320,55 +332,44 @@
+@@ -326,55 +334,44 @@
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -117502,7 +120127,7 @@
  tags: TAGS
  TAGS:
  
-@@ -377,29 +378,45 @@
+@@ -383,29 +380,45 @@
  
  
  distdir: $(DISTFILES)
@@ -117566,7 +120191,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -408,7 +425,7 @@
+@@ -414,7 +427,7 @@
  all-am: Makefile $(SCRIPTS) $(MANS)
  installdirs:
  	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
@@ -117575,17 +120200,15 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -430,7 +447,8 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -437,6 +450,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -441,7 +459,7 @@
+@@ -447,7 +461,7 @@
  
  distclean: distclean-am
  	-rm -f Makefile
@@ -117594,7 +120217,7 @@
  
  dvi: dvi-am
  
-@@ -449,20 +467,39 @@
+@@ -455,20 +469,39 @@
  
  html: html-am
  
@@ -117634,7 +120257,7 @@
  installcheck-am: installcheck-binSCRIPTS
  
  maintainer-clean: maintainer-clean-am
-@@ -481,21 +518,24 @@
+@@ -487,21 +520,24 @@
  
  ps-am:
  
@@ -117649,23 +120272,26 @@
  	distclean distclean-generic distclean-libtool distdir dvi \
  	dvi-am html html-am info info-am install install-am \
 -	install-binSCRIPTS install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-man1 install-strip installcheck installcheck-am \
+-	install-exec-am install-exec-hook install-info install-info-am \
+-	install-man install-man1 install-strip installcheck \
+-	installcheck-am installcheck-binSCRIPTS installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \
+-	uninstall-man uninstall-man1
 +	install-binSCRIPTS install-data install-data-am install-dvi \
 +	install-dvi-am install-exec install-exec-am install-exec-hook \
 +	install-html install-html-am install-info install-info-am \
 +	install-man install-man1 install-pdf install-pdf-am install-ps \
 +	install-ps-am install-strip installcheck installcheck-am \
- 	installcheck-binSCRIPTS installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
- 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-binSCRIPTS uninstall-info-am uninstall-man \
--	uninstall-man1
++	installcheck-binSCRIPTS installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
 +	uninstall-binSCRIPTS uninstall-man uninstall-man1
  
  cr_run: cr_run.in Makefile
  	@PERL@ -pe 's|\@top_builddir\@|@TOP_BUILDDIR@|g;\
-@@ -514,6 +554,7 @@
+@@ -520,6 +556,7 @@
  
  @CR_BUILD_MAN_TRUE@dev-clean:
  @CR_BUILD_MAN_TRUE@	-rm -rf man1 
@@ -117673,28 +120299,26 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: blcr-0.8.2/vmadump4/Makefile.in
+Index: blcr-0.8.4/vmadump4/Makefile.in
 ===================================================================
---- blcr-0.8.2.orig/vmadump4/Makefile.in	2010-10-12 10:44:41.000000000 +0100
-+++ blcr-0.8.2/vmadump4/Makefile.in	2010-10-12 10:44:14.000000000 +0100
+--- blcr-0.8.4.orig/vmadump4/Makefile.in	2011-10-11 23:58:55.000000000 +0100
++++ blcr-0.8.4/vmadump4/Makefile.in	2011-10-12 13:18:43.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -17,17 +18,12 @@
+@@ -17,15 +18,12 @@
  # Note: build is done via cr_module/kbuild/Makefile.in
  
  
--SOURCES = vmadcheck.c vmadlib.c vmadstress.c vmadtest.c
--
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -117709,20 +120333,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -39,6 +35,7 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
- libexec_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
- check_PROGRAMS = vmadtest$(EXEEXT) vmadstress$(EXEEXT)
-@@ -50,13 +47,13 @@
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(mkdir_p)
-+mkinstalldirs = $(install_sh) -d
+@@ -52,10 +50,10 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/blcr_config.h
  CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
@@ -117733,7 +120345,7 @@
  PROGRAMS = $(libexec_PROGRAMS)
  vmadcheck_SOURCES = vmadcheck.c
  vmadcheck_OBJECTS = vmadcheck.$(OBJEXT)
-@@ -70,20 +67,19 @@
+@@ -69,17 +67,19 @@
  vmadtest_SOURCES = vmadtest.c
  vmadtest_OBJECTS = vmadtest.$(OBJEXT)
  vmadtest_LDADD = $(LDADD)
@@ -117741,20 +120353,17 @@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
  am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/vmadcheck.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/vmadlib.Po ./$(DEPDIR)/vmadstress.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/vmadtest.Po
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -117762,7 +120371,7 @@
  SOURCES = vmadcheck.c vmadlib.c vmadstress.c vmadtest.c
  DIST_SOURCES = vmadcheck.c vmadlib.c vmadstress.c vmadtest.c
  HEADERS = $(noinst_HEADERS)
-@@ -91,72 +87,27 @@
+@@ -87,73 +87,27 @@
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
@@ -117828,7 +120437,7 @@
 -CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 -CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 -CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
-+CR_KARCH = @CR_KARCH@
+ CR_KARCH = @CR_KARCH@
  CR_KERNEL = @CR_KERNEL@
  CR_KERNEL_BASE = @CR_KERNEL_BASE@
 -CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -117836,11 +120445,12 @@
  CR_LIBARCH = @CR_LIBARCH@
  CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@
  CR_MODULE_DIR = @CR_MODULE_DIR@
-@@ -177,20 +128,20 @@
+@@ -174,20 +128,21 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
 -ECHO = @ECHO@
++DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
  ECHO_C = @ECHO_C@
@@ -117862,7 +120472,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -198,12 +149,11 @@
+@@ -195,12 +150,11 @@
  KBUILD_MAK = @KBUILD_MAK@
  KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@
  KCC = @KCC@
@@ -117876,7 +120486,7 @@
  LIBCR_VERSION = @LIBCR_VERSION@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -217,70 +167,91 @@
+@@ -214,17 +168,26 @@
  LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@
  LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@
  LINUX_VER = @LINUX_VER@
@@ -117886,6 +120496,7 @@
 +MAINT = @MAINT@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
  NM = @NM@
 +NMEDIT = @NMEDIT@
@@ -117902,21 +120513,15 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PERL = @PERL@
- PWD_PROG = @PWD_PROG@
- RANLIB = @RANLIB@
- RPMBUILD = @RPMBUILD@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -238,16 +201,14 @@
  TOP_BUILDDIR = @TOP_BUILDDIR@
  TOP_SRCDIR = @TOP_SRCDIR@
  VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
 -ac_ct_F77 = @ac_ct_F77@
@@ -117930,11 +120535,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
+@@ -259,28 +220,40 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -117957,7 +120558,6 @@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
@@ -117976,7 +120576,7 @@
  EXTRA_DIST = license.txt vmadump_common.c \
  	     vmadump_i386.c vmadump_x86_64.c \
  	     vmadump_ppc.c vmadump_ppc64.c \
-@@ -304,18 +275,18 @@
+@@ -304,18 +277,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -118001,7 +120601,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -329,45 +300,63 @@
+@@ -329,45 +302,63 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -118093,17 +120693,7 @@
  
  installcheck-libexecPROGRAMS: $(libexec_PROGRAMS)
  	bad=0; pid=$$$$; list="$(libexec_PROGRAMS)"; for p in $$list; do \
-@@ -377,7 +366,8 @@
- 	  f=`echo "$$p" | \
- 	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- 	  for opt in --help --version; do \
--	    if "$(DESTDIR)$(libexecdir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
-+	    if "$(DESTDIR)$(libexecdir)/$$f" $$opt >c$${pid}_.out \
-+	         2>c$${pid}_.err </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-@@ -385,16 +375,16 @@
+@@ -386,16 +377,16 @@
  	done; rm -f c$${pid}_.???; exit $$bad
  vmadcheck$(EXEEXT): $(vmadcheck_OBJECTS) $(vmadcheck_DEPENDENCIES) 
  	@rm -f vmadcheck$(EXEEXT)
@@ -118124,7 +120714,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -408,27 +398,24 @@
+@@ -409,22 +400,22 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmadtest.Po@am__quote@
  
  .c.o:
@@ -118133,9 +120723,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -118144,9 +120732,7 @@
 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -118155,13 +120741,9 @@
 +@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
-@@ -437,80 +424,85 @@
+@@ -435,82 +426,85 @@
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -118192,14 +120774,14 @@
  	  done | \
 -	  $(AWK) '    { files[$$0] = 1; } \
 -	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
@@ -118207,7 +120789,7 @@
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
-+	fi
+ 	fi
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -118285,7 +120867,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -520,7 +512,7 @@
+@@ -520,7 +514,7 @@
  all-am: Makefile $(PROGRAMS) $(HEADERS)
  installdirs:
  	for dir in "$(DESTDIR)$(libexecdir)"; do \
@@ -118294,17 +120876,15 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -541,7 +533,8 @@
- clean-generic:
+@@ -542,6 +536,7 @@
  
  distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -555,7 +548,7 @@
+@@ -555,7 +550,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -118313,7 +120893,7 @@
  
  dvi: dvi-am
  
-@@ -563,18 +556,38 @@
+@@ -563,18 +558,38 @@
  
  html: html-am
  
@@ -118352,7 +120932,7 @@
  installcheck-am: installcheck-libexecPROGRAMS
  
  maintainer-clean: maintainer-clean-am
-@@ -595,21 +608,25 @@
+@@ -595,21 +610,25 @@
  
  ps-am:
  
diff -Nru blcr-0.8.2/debian/patches/series blcr-0.8.4/debian/patches/series
--- blcr-0.8.2/debian/patches/series	2010-12-15 13:44:12.000000000 +0000
+++ blcr-0.8.4/debian/patches/series	2011-10-12 12:18:23.000000000 +0000
@@ -1,12 +1,7 @@
-01_fix_recent.diff
-02_fix_i386_on_amd64.diff
-03_fix_2.6.32
 04_arm_v7
+04_arm_it_instruction
 05_arm_always_kuser
-06_ubuntu_linux-rt_support
 07_fix_cross_pbuilder
-08_fix_to_2.6.34
 10_am_maint_mode
 11_bashisms
 99_rerun_autoconf
-04_arm_it_instruction.patch
diff -Nru blcr-0.8.2/debian/watch blcr-0.8.4/debian/watch
--- blcr-0.8.2/debian/watch	2010-04-11 13:47:35.000000000 +0000
+++ blcr-0.8.4/debian/watch	2011-10-12 11:54:39.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-https://ftg.lbl.gov/CheckpointRestart/downloads/blcr-(\d\.\d\.\d).tar.gz
+http://ftg.lbl.gov/CheckpointRestart/downloads/blcr-(\d\.\d\.\d).tar.gz
diff -Nru blcr-0.8.2/doc/html/BLCR_Admin_Guide.html blcr-0.8.4/doc/html/BLCR_Admin_Guide.html
--- blcr-0.8.2/doc/html/BLCR_Admin_Guide.html	2009-06-15 22:33:58.000000000 +0000
+++ blcr-0.8.4/doc/html/BLCR_Admin_Guide.html	2011-10-11 00:04:23.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <title>BLCR Admin Guide - version 0.8.2</title>
+  <title>BLCR Admin Guide - version 0.8.4</title>
   <meta http-equiv="Content-Type"
  content="text/html; charset=ISO-8859-1">
 </head>
@@ -24,7 +24,7 @@
   <li>Many "vanilla" Linux 2.6.x kernels (from <a
  href="http://www.kernel.org/">kernel.org</a>) have also been tested
 with many glibc versions (2.2 through 2.9).<br>
-We believe vanilla versions 2.6.0 through 2.6.30 all work.
+We believe vanilla versions 2.6.0 through 2.6.38 all work.
   <li>BLCR uses a set of autoconf-based feature tests to probe the
 kernels it builds against. It is thus likely that a custom kernel based
 on one of the above kernel sources will work with BLCR, provided that
@@ -35,11 +35,14 @@
 CPU
 registers). This means that the BLCR kernel modules are not portable
 across CPU
-architectures "out of the box". <b>Currently only x86 and x86_64
-systems are fully tested with
-BLCR</b>. The 0.6.0 release was the first to include <em>experimental</em>
+architectures "out of the box".
+BLCR has long supported the x86 and x86_64 architectures.&nbsp;
+The 0.6.0 release was the first to include <em>experimental</em>
 support for PowerPC64 and for ARM, while the 0.7.0 release added
 <em>experimental</em> support for 32-bit PowerPC.&nbsp;
+<b>Currently x86 and x86_64 systems are the most fully tested with BLCR,
+with the other architectures tested heavily only at release time</b>.
+
 Porting BLCR to a different CPU is not a large software effort <b>if</b>
 one has sufficient Linux kernel experience and knowledge of the target
 CPU's ABI and instructions.&nbsp;
@@ -434,11 +437,11 @@
 RPMs in the last few lines of output from <tt>rpmbuild</tt> - 
 something like this:
 </p><pre>
-    Wrote: /usr/src/redhat/RPMS/i686/blcr-0.8.2-1.i686.rpm
-    Wrote: /usr/src/redhat/RPMS/i686/blcr-libs-0.8.2-1.i686.rpm
-    Wrote: /usr/src/redhat/RPMS/i686/blcr-devel-0.8.2-1.i686.rpm
-    Wrote: /usr/src/redhat/RPMS/i686/blcr-modules_2.6.12_1.234-0.8.2-1.i686.rpm
-    Wrote: /usr/src/redhat/RPMS/i686/blcr-testsuite-0.8.2-1.i686.rpm
+    Wrote: /usr/src/redhat/RPMS/i686/blcr-0.8.4-1.i686.rpm
+    Wrote: /usr/src/redhat/RPMS/i686/blcr-libs-0.8.4-1.i686.rpm
+    Wrote: /usr/src/redhat/RPMS/i686/blcr-devel-0.8.4-1.i686.rpm
+    Wrote: /usr/src/redhat/RPMS/i686/blcr-modules_2.6.12_1.234-0.8.4-1.i686.rpm
+    Wrote: /usr/src/redhat/RPMS/i686/blcr-testsuite-0.8.4-1.i686.rpm
 </pre>
 You should note that the kernel version <tt>2.6.12-1.234</tt> has
 become
diff -Nru blcr-0.8.2/doc/html/BLCR_Users_Guide.html blcr-0.8.4/doc/html/BLCR_Users_Guide.html
--- blcr-0.8.2/doc/html/BLCR_Users_Guide.html	2009-06-15 22:33:58.000000000 +0000
+++ blcr-0.8.4/doc/html/BLCR_Users_Guide.html	2011-10-11 00:04:23.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <title>Berkeley Lab Checkpoint/Restart User's Guide - version 0.8.2</title>
+  <title>Berkeley Lab Checkpoint/Restart User's Guide - version 0.8.4</title>
   <meta http-equiv="Content-Type"
  content="text/html; charset=ISO-8859-1">
 </head>
@@ -437,7 +437,7 @@
 met:
 <ul>
   <li> The PIDs of processes in the context file must not be in use, <em>OR</em> you
-may specify <tt>--no-restore-pid</tt> to obtain new pids (but see the <tt>cr_restart<tt> man
+may specify <tt>--no-restore-pid</tt> to obtain new pids (but see the <tt>cr_restart</tt> man
 page for limitations of this approach).</li>
   <li> The original executable must be available: either it must exist with its contents 
 unchanged, <em>OR</em> you may specify any of
diff -Nru blcr-0.8.2/doc/html/FAQ.html blcr-0.8.4/doc/html/FAQ.html
--- blcr-0.8.2/doc/html/FAQ.html	2009-06-15 22:33:58.000000000 +0000
+++ blcr-0.8.4/doc/html/FAQ.html	2011-10-11 22:13:38.000000000 +0000
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-    <title>BLCR Frequently Asked Questions (for version 0.8.2)</title>
+    <title>BLCR Frequently Asked Questions (for version 0.8.4)</title>
  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 </head>
 <body bgcolor="#ffffff">
 
-<h1>BLCR Frequently Asked Questions (for version 0.8.2)</h1>
+<h1>BLCR Frequently Asked Questions (for version 0.8.4)</h1>
 
 
 <h3>General Questions</h3>
@@ -22,7 +22,7 @@
     <li><a href="#callbacks">What if I want to checkpoint a program that uses resources that BLCR can't checkpoint?</a>
     <li><a href="#mpi">Does BLCR support checkpointing parallel/distributed applications?</a>
     <li><a href="#rootbuild">Do I need root access in order to use BLCR?</a>
-    <li><a href="#batch">Is BLCR integrated with any batch systems, like PBS, Sun Grid Engine, Torque, LoadLeveler, etc? </a>
+    <li><a href="#batch">Is BLCR integrated with any batch systems? </a>
     <li><a href="#porting">How hard is it to port BLCR to an architecture that isn't currently supported?</a>
 </ul>
 
@@ -54,6 +54,7 @@
     <li><a href="#lam_cr_base_dir">When I checkpoint LAM MPI jobs, all the
     checkpoints wind up in my $HOME directory.  Can I use a different
     directory?</a>
+    <li><a href="#auditing">Can I use Linux kernel auditing support with BLCR?</a>
 </ul>
 
 <h3>Additional Resources</h3>
@@ -105,9 +106,9 @@
 <h4><a name="platforms">What kinds of Linux systems does BLCR support?</a></h4>
 <blockquote>
     BLCR runs on x86 and x86_64 (Opteron/EM64T) systems running Linux 2.6.x kernels.
-    With the 0.8.2 release, we believe the following to work:
+    With the 0.8.4 release, we believe the following to work:
     <ul>
-      <li>2.6.0 through 2.6.30 on x86 and x86_64.
+      <li>2.6.0 through 2.6.38 on x86 and x86_64.
     </ul>
     <p>BLCR 0.7.0 added experimental support for PPC (32-bit), and 0.6.0 added experimental
        support for PPC64 and ARM.  These three architectures have been tested as follows:
@@ -214,7 +215,7 @@
     on after the checkpoint).  This is how MPI communication can be handled
     (see <a href="#mpi">next FAQ</a>).
 
-    <p>Full documentation of the callback interface is not yet documented because some of
+    <p>Full documentation of the callback interface has not yet been written because some of
     the interfaces are still subject to change.  However, the comments in the file
     <tt>libcr.h</tt> should provide enough to get started.
 </blockquote>
@@ -222,14 +223,27 @@
 <h4><a name="mpi">Does BLCR support checkpointing parallel/distributed applications?</a></h4>
 <blockquote>
     Not by itself.  But by using checkpoint callbacks (see <a href="#callbacks">previous FAQ</a>).
-    some MPI implementations, including LAM/MPI 7.x, MVAPICH2 0.9.8 and MPICH-V 1.0.x, have made themselves
+    some MPI implementations have made themselves
     checkpointable by BLCR.  You can checkpoint/restart an MPI application running
     across an entire cluster of machines with BLCR, without any application code
-    modifications, if you use one of these MPI implementations.
-
-    <p>As of late November 2008, support in OpenMPI (the successor to LAM/MPI) is not available in
-    a released version, but has been announced as a feature intended for the 1.3 release (and
-    <em>is</em> available in the development branch).
+    modifications, if you use one of these MPI implementations (listed alphabetically):
+  <ul>
+    <li> LAM/MPI 7.x or later
+    <li> MPICH-V 1.0.x
+    <li> MVAPICH2 0.9.8 or later
+    <li> Open MPI 1.3 or later
+  </ul>
+    See the documentation of your specific MPI for usage instructions.  In almost
+    all cases you will need to use a tool provided by the MPI implementation
+    to request a checkpoint or restart, rather then using BLCR's <tt>cr_checkpoint</tt>
+    and <tt>cr_restart</tt> utilities.
+    <p>
+    At this time we are aware of at least three other MPI implementations that are
+    working on BLCR support, but surprisingly our information is not always the latest.
+    If in doubt, check the support channels of your favorite MPI implementation
+    <p> Note that any questions about using these MPI implementations with BLCR is more likely
+    to receive a useful response if directed to the support channels of the specific
+    MPI implementation than to the checkpoint@lbl.gov list.
 </blockquote>
 
 <h4><a name="rootbuild">Do I need root access in order to use BLCR?</a></h4>
@@ -239,17 +253,44 @@
     without needing root permission.
 </blockquote>
 
-<h4><a name="batch">Is BLCR integrated with any batch systems, like PBS, Sun Grid Engine, Torque, LoadLeveler, etc? </a></h4>
+<h4><a name="batch">Is BLCR integrated with any batch systems? </a></h4>
 <blockquote>
-    <p>Support for serial and parallel jobs is available in TORQUE, since in their 2.3 release.
-
-    <p> Information on integration with SGE can be found
-       <a href="http://gridengine.sunsource.net/howto/APSTC-TB-2004-005.pdf">here</a>.
-
-    <p> Work is ongoing by third
+    We are aware of the following, but we are not always informed of new efforts
+    to integrate with BLCR.  For the most up-to-date information you should consult
+    the support channels of your favorite batch system.
+    <dl>
+    <dt> TORQUE version 2.3 and later</dt><dd>
+	Support for serial and parallel jobs, including periodic checkpoints and
+        <tt>qhold</tt>/<tt>qrls</tt>.
+	</dd>
+    <dt> SLURM version 2.0 and later</dt><dd>
+	Support for automatic (periodic) and manually requested checkpoints.
+	</dd>
+    <dt> SGE (aka Sun Grid Engine)</dt><dd>
+	Information on configuring SGE to use BLCR can be found
+	<a href="http://gridengine.sunsource.net/howto/APSTC-TB-2004-005.pdf">here</a>.
+	There is also a thread on the checkpoint@lbl.gov list about modifications
+	to those instructions.  The thread begins with
+	<a href="http://mantis.lbl.gov/hypermail/checkpoint/0952.html">this</a> posting.
+	</dd>
+    <dt> LSF</dt><dd>
+	Information on configuring LSF to use BLCR can be found in
+	<a href="http://mantis.lbl.gov/hypermail/checkpoint/1211.html">this</a> posting
+        on the checkpoint@lbl.gov list.
+	</dd>
+    <dt> Condor</dt><dd>
+	Information on configuring Condor to use BLCR to checkpoint "Vanilla Universe"
+	jobs with the help of Parrot can be found 
+	<a href="http://www.escience.cam.ac.uk/projects/camgrid/blcr.html">here</a>.
+	</dd>
+     </dl>
+    Work is ongoing by third
     parties to integrate BLCR into other batch systems.  If you are
     interested in adding BLCR support to a job launcher/scheduler, please
     contact us!
+    <p> Note that any questions about using these batch systems with BLCR is more likely
+    to receive a useful response if directed to the support channels of the specific
+    batch system than to the checkpoint@lbl.gov list.
 </blockquote>
 
 <h4><a name="porting">How hard is it to port BLCR to an architecture that isn't currently supported?</a></h4>
@@ -487,12 +528,34 @@
 <pre>  # /usr/sbin/prelink --undo --all</pre>
     Automating this process for an entire cluster depends on your specific environment.
 
-    <p>Finally, be aware that BLCR 0.7.0 introduced the <tt>--save-*</tt> family
+    <p>BLCR 0.7.0 introduced the <tt>--save-*</tt> family
     of options to <tt>cr_checkpoint</tt> to cause the executable and/or shared
     libraries to be included in the context file.  This may significantly increase
     the size of the context files.  Therefore we recommend this approach only
-    if you cannot ensure uniform library vesions (w/o prelinking) across the
+    if you cannot ensure uniform library versions (w/o prelinking) across the
     machines you wish to migrate among.
+
+    <p>Some versions of <tt>glibc</tt> use <tt>mmap()</tt> to load locale data.
+    CentOS 5 and Scientific Linux 5, for example, store the locale information
+    in the file <tt>/usr/lib/locale/locale-archive</tt>.  This file is 
+    generated when <tt>glibc</tt> (specifically, the <tt>glibc-common</tt> RPM)
+    is installed, and contains archived versions of all of the localization 
+    databases.  Since the <tt>locale-archive</tt> file is not included in
+    the RPM, but is generated at install time, the contents of this file
+    can differ between your compute nodes.  This causes problems migrating
+    programs that use <tt>glibc</tt>'s locale support, <tt>bash</tt> being
+    the most notable.  If you see problems migrating <tt>bash</tt> scripts
+    between nodes, you might have this problem.
+
+    <p>You can fix this problem in one of three ways.  First, you can use the
+    <tt>--save-all</tt> option to <tt>cr_checkpoint</tt> to ensure that the
+    correct localization data is loaded at restart time.  Second, you can
+    disable localization support completely by using <tt>export LANG=C</tt>
+    in your shell environment.  Finally, we've been successful in copying
+    one version of the <tt>/usr/lib/locale/locale-archive</tt> across all of
+    your compute nodes.  You'll need to update this file every time you
+    update your <tt>glibc-common</tt> RPM.
+
 </blockquote>
 
 <h4><a name="enoent">Why do I get the error "Restart failed: No such file or directory"?</a></h4>
@@ -504,7 +567,7 @@
     file that caused the problem.  You will probably find a message like one of the following:
     <pre>    vmadump: mmap failed: /tmp/hsperfdata_[user]/[pid]<br>    Failed to open file '/tmp/foobar'<br></pre>
     In the case of files in a directory of the form  <tt>/tmp/hsperfdata_[user]</tt> see
-    <a href="#hsperfdata">the hsdperfdata FAQ entry</a>.  For other files, there are a
+    <a href="#hsperfdata">the hsperfdata FAQ entry</a>.  For other files, there are a
     a couple of things you might try.
     <p> If the file is a temporary created by your application, it is
     possible that it has been removed when the application terminated.  For instance, if
@@ -560,37 +623,79 @@
     The files in the directory <tt>/var/db/nscd/</tt> are created by the Name Service
     Cache Daemon (NSCD, for short) and are protected against normal file accesses.
     When the NSCD is enabled, certain C library operations talk to the daemon which uses
-    filedescriptor passing to allow the application to mmap these files.  Unfortunately, BLCR
+    filedescriptor passing to allow the application to <tt>mmap()</tt> these files.  Unfortunately, BLCR
     cannot replay the filedescriptor passing (there is no way to know that a given filedescriptor
     was obtained in this way).  This leaves BLCR to rely on normal filesystem permissions when
     trying to reestablish the <tt>mmap()</tt>, which in this case finds insufficient permissions.
     <p>
     C library functions that may use NSCD include host database lookups (such as
     <tt>gethostbyname()</tt>), user database lookups (such as <tt>getpwuid()</tt>) and
-    other database lookup functions.
+    other database lookup functions.  Since use of NSCD may speed these lookups relative
+    to network-based lookups such as NIS, LDAP or DNS, this is generally a good thing.
     <p>
-    There is no BLCR-level work-around for this type of failure, and we don't know of
-    any way to disable use of NSCD on a per-process basis.  Therefore, we recommend that
-    if you encounter this problem, you should disable (or preferable just uninstall)
-    NSCD on your system.  You should consult the documentation for your specific
-    Linux distribution for instructions.
+    If you are experiencing the "mmap failed: /var/db/nscd/..." error, you have at
+    least the following three options:
+  <ul>
+    <li> You may choose to disable NSCD or remove it from you system entirely.  If you
+    choose this option then consult the documentation for your specific Linux distribution
+    for instructions on disabling services or removing packages.</li>
+    <li> You may choose to keep NSCD enabled, but disable the <tt>mmap()</tt> mechanism.
+    This will still allow NSCD to cache lookups, but the interaction between the
+    application and NSCD will be slower.  If the database lookups are primarily
+    resolved by network services such as NIS, LDAP and DNS then this is still a net
+    win when compared to disabling or removing NSCD entirely.<br>
+    To disable the <tt>mmap()</tt> mechanism add the following lines (or modify
+    similar ones) in the file <tt>/etc/nscd.conf</tt>:
+<pre>
+	shared	passwd	no
+	shared	group	no
+	shared	hosts	no
+</pre>
+    You will need to restart NSCD for the change to take effect (consult the
+    documentation for your specific Linux distribution for instructions on 
+    restarting services).</li>
+    <li> Since 0.8.3, BLCR has the option to disable NSCD per-process when <tt>libcr</tt> is
+    initialized.  This option has the benefit of avoiding this error in many cases, while
+    allowing the full benefit of NSCD for applications that run without <tt>libcr</tt>.
+    To enable this behavior set the environment variable <tt>LIBCR_DISABLE_NSCD</tt> to any
+    non-empty value.
+    Unlike the previous two options, this approach does not require one to have root permission.
+    However there is one weakness: if NSCD is used by a process prior to <tt>libcr</tt>'s
+    initialization, then one could still experience this problem.  If this happens to
+    you then you will need to apply one of the other two options.</li>
+  </ul>
+    Our thanks to Guy Coates <tt>&lt;gmpc AT sanger DOT ac DOT uk&gt;</tt>
+    for information on the <tt>/etc/nscd.conf</tt> settings.<br>
+    Our thanks to Hongjia Cao <tt>&lt;hjcao AT nudt DOT edu DOT cn&gt;</tt> for information leading to the
+    implementation of <tt>LIBCR_DISABLE_NSCD</tt>.
 </blockquote>
 
 <h4><a name="hsperfdata">Why do I get "vmadump: mmap failed: /tmp/hsperfdata_[user]/[pid]" in the system logs?</a></h4>
 <blockquote>
     Directories of the form <tt>/tmp/hsperfdata_[user]/</tt> are created by Sun's Java
     runtime environment (JRE), and the individual files in this directory are removed
-    when the application exits.  This includes exits due to fatal signals, so if one
-    checkpoints a Java application with the <tt>--term</tt> option to the <tt>cr_checkpoint</tt>
-    utility, then <tt>SIGTERM</tt> was sent to the application, causing it to cleanup its
-    <tt>hsperfdata</tt> file before terminating.  In this case, passing <tt>--kill</tt> will
-    cause the uncatchable signal <tt>SIGKILL</tt> to be sent, thus preventing any cleanups by
-    the JRE.
-    <p> If you are trying to perform migration of a process from one machine to another, then
+    when the application exits.  This includes exits due to catchable fatal signals, so if a
+    checkpointed Java application is terminated by such a signal these files will be
+    unavailable for a subsequent restart.  You have several options to deal with this issue:
+  <ul>
+    <li> If you are trying to perform migration of a process from one machine to another, then
     you may try manually copying the file from one machine to another.  While this is not a
-    safe practice in general, we have had reports of success from users who have tried this.
-    <p> If you are running Matlab but don't need the Java features, you can avoid this issue
-    entirely by passing <tt>--nojre</tt> when launching Matlab.
+    safe practice in general, we have had reports of success from users who have tried this.</li>
+    <li> If you experiencing this problem when running Matlab but don't need the Java features,
+    you can avoid this issue entirely by passing <tt>--nojre</tt> when launching Matlab.</li>
+    <li> You may disable creation of hsperfdata files by passing <tt>-XX:-UsePerfData</tt>
+    when starting the Java application.  Note, however, that certain performance monitoring
+    or debugging tools may require the hsperfdata files.</li>
+    <li> If the signal causing termination of the Java application is due to the <tt>--term</tt>
+    option to the <tt>cr_checkpoint</tt> utility, passing <tt>--kill</tt> instead will
+    cause the uncatchable signal <tt>SIGKILL</tt> to be sent, thus preventing any cleanups by
+    the JRE.</li>
+    <li> If the signal is due to the <tt>cr_signal</tt> value in the arguments to the
+    <tt>cr_request_checkpoint()</tt> function, then use of <tt>SIGKILL</tt> will prevent
+    cleanups, as above.</li>
+  </ul>
+    Our thanks to Guy Coates <tt>&lt;gmpc AT sanger DOT ac DOT uk&gt;</tt>
+    for information on the <tt>-XX:-UsePerfData</tt> JRE option.
 </blockquote>
 
 <h4><a name="sig31">Why does my application dies with "Real-time signal 31" (or 32, etc.) when I try to checkpoint it?</a></h4>
@@ -679,6 +784,28 @@
     of MPI Jobs" section in the User's Guide.
 </blockquote>
 
+<h4><a name="auditing">Can I use Linux kernel auditing support with BLCR?</a></h4>
+<blockquote>
+    We recommend that you avoid auditing when using BLCR.  In particular, we've
+    seen odd restart failures (on return to user space) when migrating processes
+    between nodes where auditing is enabled (with <tt>/sbin/auditctl -e1</tt>) to nodes
+    where auditing is disabled.  The migrating processes themselves were not being
+    audited, neither at checkpoint time nor during restart.  In some cases, but not
+    all, these restart failures produce warning messages about leaked audit
+    contexts.
+
+    <p>More importantly, BLCR does not generate audit records
+    during checkpoint or restart.  As far as the auditing code is concerned, all of
+    the BLCR kernel calls are described by <tt>ioctl()</tt> records.  You don't see audit
+    records describing the creation of the context file, the <tt>mmap()</tt> established
+    during restart, or the file descriptors that are restored.  Please contact the
+    mailing list if you need auditing support <em>during</em> checkpoint/restart calls.
+
+    <p>Prior to version 0.8.4, the <tt>linked_fifo</tt> test caused a kernel BUG when audited
+    during restart.  If you encounter any other problems, please report a bug
+    to the mailing list.
+</blockquote>
+
 <hr>
 <h3>Additional Resources</h3>
 
@@ -694,12 +821,15 @@
 <blockquote>
     There is a mailing list of BLCR developers and some of the users
     at <a href="mailto:checkpoint@lbl.gov">checkpoint@lbl.gov</a> and
-    which is
-    archived <a href="http://www.nersc.gov/hypermail/checkpoint/">here</a>.
+    which is archived:
+    <ul>
+    <li><a href="http://hpcrdm.lbl.gov/pipermail/checkpoint/">Current messages</a></li>
+    <li><a href="http://mantis.lbl.gov/hypermail/checkpoint/">Messages prior to May 1, 2010</a></li>
+    </ul>
 
-    <p> This list is managed my majordomo.  So, to subscribe just e-mail
-    "<tt>subscribe checkpoint</tt>" (in the message <em>body</em> and without the quotes)
-    to <a href="mailto:majordomo@lbl.gov">majordomo@lbl.gov</a>.
+    <p> This list is managed by Mailman.  So, to subscribe (or unsubscribe)
+    visit <a href='https://hpcrdm.lbl.gov/cgi-bin/mailman/listinfo/checkpoint'>
+    https://hpcrdm.lbl.gov/cgi-bin/mailman/listinfo/checkpoint</a>.
 </blockquote>
 
 <h4><a name="bugzilla">Where can I report BLCR bugs?</a></h4>
diff -Nru blcr-0.8.2/doc/Makefile.in blcr-0.8.4/doc/Makefile.in
--- blcr-0.8.2/doc/Makefile.in	2009-06-17 03:56:46.000000000 +0000
+++ blcr-0.8.4/doc/Makefile.in	2011-10-11 22:58:52.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = doc
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -41,7 +42,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -110,6 +111,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -191,6 +193,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -210,6 +213,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -346,7 +351,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/etc/Makefile.in blcr-0.8.4/etc/Makefile.in
--- blcr-0.8.2/etc/Makefile.in	2009-06-17 03:56:46.000000000 +0000
+++ blcr-0.8.4/etc/Makefile.in	2011-10-11 22:58:52.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = etc
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -41,7 +42,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -110,6 +111,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -191,6 +193,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -210,6 +213,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -339,7 +344,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/examples/counting/Makefile.in blcr-0.8.4/examples/counting/Makefile.in
--- blcr-0.8.2/examples/counting/Makefile.in	2009-06-17 03:56:46.000000000 +0000
+++ blcr-0.8.4/examples/counting/Makefile.in	2011-10-11 22:58:53.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = counting.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -36,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = counting$(EXEEXT)
 @CR_INSTALLED_LIBCR_TRUE@counting_DEPENDENCIES =  \
@@ -47,7 +46,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
@@ -58,14 +57,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/counting.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = counting.c
 DIST_SOURCES = counting.c
@@ -135,6 +133,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -216,6 +215,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -235,6 +235,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -325,24 +327,21 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -375,9 +374,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -452,7 +453,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/examples/file_counting/Makefile.in blcr-0.8.4/examples/file_counting/Makefile.in
--- blcr-0.8.2/examples/file_counting/Makefile.in	2009-06-17 03:56:46.000000000 +0000
+++ blcr-0.8.4/examples/file_counting/Makefile.in	2011-10-11 22:58:53.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = file_counting.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -36,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = file_counting$(EXEEXT)
 @CR_INSTALLED_LIBCR_TRUE@file_counting_DEPENDENCIES =  \
@@ -47,7 +46,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
@@ -58,14 +57,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/file_counting.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = file_counting.c
 DIST_SOURCES = file_counting.c
@@ -135,6 +133,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -216,6 +215,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -235,6 +235,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -325,24 +327,21 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -375,9 +374,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -452,7 +453,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/examples/io_bench/Makefile.in blcr-0.8.4/examples/io_bench/Makefile.in
--- blcr-0.8.2/examples/io_bench/Makefile.in	2009-06-17 03:56:46.000000000 +0000
+++ blcr-0.8.4/examples/io_bench/Makefile.in	2011-10-11 22:58:53.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = io_bench.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -36,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = io_bench$(EXEEXT)
 @CR_INSTALLED_LIBCR_TRUE@io_bench_DEPENDENCIES =  \
@@ -47,7 +46,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
@@ -58,14 +57,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/io_bench.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = io_bench.c
 DIST_SOURCES = io_bench.c
@@ -135,6 +133,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -216,6 +215,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -235,6 +235,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -328,24 +330,21 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -378,9 +377,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -455,7 +456,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/examples/Makefile.in blcr-0.8.4/examples/Makefile.in
--- blcr-0.8.2/examples/Makefile.in	2009-06-17 03:56:46.000000000 +0000
+++ blcr-0.8.4/examples/Makefile.in	2011-10-11 22:58:53.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = examples
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -41,7 +42,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -119,6 +120,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -200,6 +202,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -219,6 +222,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -300,7 +305,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -312,7 +323,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -320,7 +331,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -341,7 +358,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -366,14 +383,16 @@
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -383,9 +402,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -436,15 +457,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -474,7 +497,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/examples/pipe_counting/Makefile.in blcr-0.8.4/examples/pipe_counting/Makefile.in
--- blcr-0.8.2/examples/pipe_counting/Makefile.in	2009-06-17 03:56:46.000000000 +0000
+++ blcr-0.8.4/examples/pipe_counting/Makefile.in	2011-10-11 22:58:53.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = pipe_counting.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -36,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = pipe_counting$(EXEEXT)
 @CR_INSTALLED_LIBCR_TRUE@pipe_counting_DEPENDENCIES =  \
@@ -47,7 +46,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
@@ -58,14 +57,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pipe_counting.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = pipe_counting.c
 DIST_SOURCES = pipe_counting.c
@@ -135,6 +133,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -216,6 +215,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -235,6 +235,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -325,24 +327,21 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -375,9 +374,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -452,7 +453,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/examples/pthread_counting/Makefile.in blcr-0.8.4/examples/pthread_counting/Makefile.in
--- blcr-0.8.2/examples/pthread_counting/Makefile.in	2009-06-17 03:56:46.000000000 +0000
+++ blcr-0.8.4/examples/pthread_counting/Makefile.in	2011-10-11 22:58:53.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = pthread_counting.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -36,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = pthread_counting$(EXEEXT)
 @CR_INSTALLED_LIBCR_TRUE@pthread_counting_DEPENDENCIES =  \
@@ -47,7 +46,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
@@ -58,14 +57,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pthread_counting.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = pthread_counting.c
 DIST_SOURCES = pthread_counting.c
@@ -135,6 +133,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -216,6 +215,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -235,6 +235,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -326,24 +328,21 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -376,9 +375,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -453,7 +454,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/examples/pthread_misc/Makefile.in blcr-0.8.4/examples/pthread_misc/Makefile.in
--- blcr-0.8.2/examples/pthread_misc/Makefile.in	2009-06-17 03:56:47.000000000 +0000
+++ blcr-0.8.4/examples/pthread_misc/Makefile.in	2011-10-11 22:58:53.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = pthread_misc.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -36,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = pthread_misc$(EXEEXT)
 @CR_INSTALLED_LIBCR_TRUE@pthread_misc_DEPENDENCIES =  \
@@ -47,7 +46,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
@@ -58,14 +57,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pthread_misc.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = pthread_misc.c
 DIST_SOURCES = pthread_misc.c
@@ -135,6 +133,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -216,6 +215,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -235,6 +235,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -328,24 +330,21 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -378,9 +377,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -455,7 +456,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/include/blcr_common.h.in blcr-0.8.4/include/blcr_common.h.in
--- blcr-0.8.2/include/blcr_common.h.in	2009-02-14 01:50:12.000000000 +0000
+++ blcr-0.8.4/include/blcr_common.h.in	2011-09-30 20:33:30.000000000 +0000
@@ -21,7 +21,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: blcr_common.h.in,v 1.50.4.1 2009/02/14 01:50:12 phargrov Exp $
+ * $Id: blcr_common.h.in,v 1.50.4.2 2011/09/30 20:33:30 phargrov Exp $
  *
  * This file contains definitions of BLCR types and constants that are
  * common to both user-space and kernel-space.
@@ -220,7 +220,11 @@
 struct cr_rstrt_relocate {
 	unsigned int    count;
 	struct cr_rstrt_relocate_pair
+#if defined(__GNUC__) && (__GNUC__ < 3)
 			path[0]; // GNU (not ISO C99) variable length array
+#else
+			path[]; // ISO C99 variable length array
+#endif
 };
 // Bytes to allocate for struct cr_rstrt_relocate with _cnt path entries:
 #define CR_RSTRT_RELOCATE_SIZE(_cnt) (sizeof(struct cr_rstrt_relocate) + \
diff -Nru blcr-0.8.2/include/blcr_imports.h.in blcr-0.8.4/include/blcr_imports.h.in
--- blcr-0.8.2/include/blcr_imports.h.in	2009-06-12 20:37:05.000000000 +0000
+++ blcr-0.8.4/include/blcr_imports.h.in	2010-08-12 21:58:34.000000000 +0000
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: blcr_imports.h.in,v 1.14.14.1 2009/06/12 20:37:05 phargrov Exp $
+ * $Id: blcr_imports.h.in,v 1.14.14.2 2010/08/12 21:58:34 phargrov Exp $
  *
  * This file provides otherwise missing declarations for functions
  * and data which BLCR imports via the blcr_imports kernel module.
@@ -33,7 +33,9 @@
 #ifndef _BLCR_IMPORTS_H
 #define _BLCR_IMPORTS_H	1
 
+#ifdef CR_NEED_AUTOCONF_H
 #include <linux/autoconf.h>
+#endif
 #if defined(CONFIG_SMP) && ! defined(__SMP__)
   #define __SMP__
 #endif
diff -Nru blcr-0.8.2/include/blcr_ksyms.h blcr-0.8.4/include/blcr_ksyms.h
--- blcr-0.8.2/include/blcr_ksyms.h	2008-12-02 00:17:42.000000000 +0000
+++ blcr-0.8.4/include/blcr_ksyms.h	2010-03-08 20:39:44.000000000 +0000
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: blcr_ksyms.h,v 1.18 2008/12/02 00:17:42 phargrov Exp $
+ * $Id: blcr_ksyms.h,v 1.18.8.2 2010/03/08 20:39:44 phargrov Exp $
  */
 
 #ifndef _CR_KSYMS_H
@@ -55,7 +55,11 @@
 
 #if defined(__i386__) || defined(__x86_64__)
   #ifdef CONFIG_RELOCATABLE
-    #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE_register_chrdev + register_chrdev)
+    #ifndef CR_EXPORTED_KCODE___register_chrdev
+      #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE_register_chrdev + register_chrdev)
+    #else
+      #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE___register_chrdev + __register_chrdev)
+    #endif
   #else
     #define _CR_RELOC_KSYM(_addr) _addr
   #endif
diff -Nru blcr-0.8.2/include/Makefile.in blcr-0.8.4/include/Makefile.in
--- blcr-0.8.2/include/Makefile.in	2009-06-17 03:56:47.000000000 +0000
+++ blcr-0.8.4/include/Makefile.in	2011-10-11 22:58:53.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = include
 DIST_COMMON = $(am__include_HEADERS_DIST) $(am__noinst_HEADERS_DIST) \
@@ -44,13 +45,19 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES = blcr_imports.h blcr_common.h
 SOURCES =
 DIST_SOURCES =
 am__include_HEADERS_DIST = blcr_ioctl.h blcr_proc.h blcr_errcodes.h \
 	libcr.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
 nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -123,6 +130,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -204,6 +212,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -223,6 +232,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -307,7 +318,7 @@
 	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
 	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
@@ -315,7 +326,7 @@
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
@@ -324,7 +335,7 @@
 	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
 	@list='$(nodist_include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
 	  $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
@@ -332,7 +343,7 @@
 uninstall-nodist_includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(nodist_include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
@@ -357,9 +368,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -436,7 +449,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/libcr/cr_cs.c blcr-0.8.4/libcr/cr_cs.c
--- blcr-0.8.2/libcr/cr_cs.c	2009-02-18 03:41:27.000000000 +0000
+++ blcr-0.8.4/libcr/cr_cs.c	2011-08-24 02:35:39.000000000 +0000
@@ -21,7 +21,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_cs.c,v 1.67.14.2 2009/02/18 03:41:27 phargrov Exp $
+ * $Id: cr_cs.c,v 1.67.14.3 2011/08/24 02:35:39 phargrov Exp $
  */
 
 #include <errno.h>
@@ -270,7 +270,7 @@
 		     int		flags)
 {
     cri_info_t *info = CRI_INFO_OR_RETURN(-1);	// thread-specific
-    int context;
+    int context = 0; // silence a "used uninitialized" warning
     int retval = -1; // assume failure
     int state;
 
diff -Nru blcr-0.8.2/libcr/cr_libinit.c blcr-0.8.4/libcr/cr_libinit.c
--- blcr-0.8.2/libcr/cr_libinit.c	2009-03-11 20:58:02.000000000 +0000
+++ blcr-0.8.4/libcr/cr_libinit.c	2011-08-15 22:27:46.000000000 +0000
@@ -21,7 +21,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_libinit.c,v 1.14.6.2 2009/03/11 20:58:02 phargrov Exp $
+ * $Id: cr_libinit.c,v 1.14.6.4 2011/08/15 22:27:46 phargrov Exp $
  */
 
 #include <stdlib.h>
@@ -182,6 +182,28 @@
     if (rc != 0) {
 	CRI_ABORT("sigaction() failed: %s", strerror(errno));
     }
+
+#ifdef CR_BUILDING_OMIT
+    // Don't try to disable NSCD
+#else
+    // Disable NSCD if requested (bugs 1962 and 2560)
+    {
+	const char *val = getenv("LIBCR_DISABLE_NSCD");
+	if (val && val[0]) { // Exists and not the empty string
+    #if HAVE___NSS_DISABLE_NSCD && 0 // Cannot use a GLIBC_PRIVATE symbol w/ RPMS
+	    __nss_disable_nscd();
+    #else
+    	    // If not found at configure time, try via dynamic linker
+	    void *dlhandle = dlopen(NULL, RTLD_LAZY);
+	    if (dlhandle) {
+		void (*disable_nscd)(void) = dlsym(dlhandle, "__nss_disable_nscd");
+		if (disable_nscd) disable_nscd();
+		dlclose(dlhandle);
+	    }
+    #endif
+	}
+    }
+#endif
 }
 
 /* One symbol (different name in each lib) to help with linking the .a
diff -Nru blcr-0.8.2/libcr/cr_omit.c blcr-0.8.4/libcr/cr_omit.c
--- blcr-0.8.2/libcr/cr_omit.c	2008-09-05 21:01:19.000000000 +0000
+++ blcr-0.8.4/libcr/cr_omit.c	2011-08-03 19:24:28.000000000 +0000
@@ -21,7 +21,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_omit.c,v 1.12 2008/09/05 21:01:19 phargrov Exp $
+ * $Id: cr_omit.c,v 1.12.8.1 2011/08/03 19:24:28 eroman Exp $
  *
  * This file builds the "libcr_omit" target library.
  */
@@ -44,6 +44,7 @@
 
 #ifdef LIBCR_SIGNAL_ONLY
   /* Initialization logic. */
+  #define CR_BUILDING_OMIT
   #include "cr_libinit.c"
 #endif /* LIBCR_SIGNAL_ONLY */
 
diff -Nru blcr-0.8.2/libcr/cr_private.h blcr-0.8.4/libcr/cr_private.h
--- blcr-0.8.2/libcr/cr_private.h	2009-02-18 03:41:27.000000000 +0000
+++ blcr-0.8.4/libcr/cr_private.h	2011-08-03 19:24:28.000000000 +0000
@@ -21,7 +21,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: cr_private.h,v 1.107.4.2 2009/02/18 03:41:27 phargrov Exp $
+ * $Id: cr_private.h,v 1.107.4.3 2011/08/03 19:24:28 eroman Exp $
  */
 
 #ifndef _CR_PRIVATE_H
@@ -223,6 +223,7 @@
 extern int __libc_current_sigrtmax(void);
 extern int __libc_allocate_rtsig(int);
 extern pid_t __fork(void);
+extern void __nss_disable_nscd(void);
 
 // Alternate signal handlers
 extern void cri_run_sig_handler(int, siginfo_t *, void *);
diff -Nru blcr-0.8.2/libcr/Makefile.in blcr-0.8.4/libcr/Makefile.in
--- blcr-0.8.2/libcr/Makefile.in	2009-06-17 03:56:47.000000000 +0000
+++ blcr-0.8.4/libcr/Makefile.in	2011-10-11 22:58:54.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +15,6 @@
 @SET_MAKE@
 
 
-SOURCES = $(libcr_la_SOURCES) $(libcr_omit_la_SOURCES) $(libcr_run_la_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -37,6 +35,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = libcr
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -46,9 +45,15 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -78,31 +83,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libcr_la-cr_async.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_core.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_cs.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_ftb.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_omit.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_pthread.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_request.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_run.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_sig_sync.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_strerror.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_syscall.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_la-cr_trace.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_omit_la-cr_omit.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_omit_la-cr_trace.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_run_la-cr_run.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_run_la-cr_sig_sync.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcr_run_la-cr_trace.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libcr_la_SOURCES) $(libcr_omit_la_SOURCES) \
 	$(libcr_run_la_SOURCES)
@@ -176,6 +163,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -257,6 +245,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -276,6 +265,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -390,7 +381,7 @@
 	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+	    f=$(am__strip_dir) \
 	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
 	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
@@ -398,8 +389,8 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
@@ -408,7 +399,7 @@
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -448,457 +439,148 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-libcr_la-cr_ftb.o: cr_ftb.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.o `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo" "$(DEPDIR)/libcr_la-cr_ftb.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_ftb.c' object='libcr_la-cr_ftb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_ftb.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_ftb.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.o `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c
-
-libcr_la-cr_ftb.obj: cr_ftb.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.obj `if test -f 'cr_ftb.c'; then $(CYGPATH_W) 'cr_ftb.c'; else $(CYGPATH_W) '$(srcdir)/cr_ftb.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo" "$(DEPDIR)/libcr_la-cr_ftb.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_ftb.c' object='libcr_la-cr_ftb.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_ftb.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_ftb.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.obj `if test -f 'cr_ftb.c'; then $(CYGPATH_W) 'cr_ftb.c'; else $(CYGPATH_W) '$(srcdir)/cr_ftb.c'; fi`
-
 libcr_la-cr_ftb.lo: cr_ftb.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo" "$(DEPDIR)/libcr_la-cr_ftb.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_ftb.c' object='libcr_la-cr_ftb.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_ftb.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_ftb.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c
-
-libcr_la-cr_async.o: cr_async.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.o `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_async.Tpo" "$(DEPDIR)/libcr_la-cr_async.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_async.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_async.c' object='libcr_la-cr_async.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_async.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_async.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.o `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c
-
-libcr_la-cr_async.obj: cr_async.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.obj `if test -f 'cr_async.c'; then $(CYGPATH_W) 'cr_async.c'; else $(CYGPATH_W) '$(srcdir)/cr_async.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_async.Tpo" "$(DEPDIR)/libcr_la-cr_async.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_async.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_async.c' object='libcr_la-cr_async.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_async.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_async.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.obj `if test -f 'cr_async.c'; then $(CYGPATH_W) 'cr_async.c'; else $(CYGPATH_W) '$(srcdir)/cr_async.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c
 
 libcr_la-cr_async.lo: cr_async.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_async.Tpo" "$(DEPDIR)/libcr_la-cr_async.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_async.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_async.c' object='libcr_la-cr_async.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_async.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_async.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c
-
-libcr_la-cr_core.o: cr_core.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.o `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_core.Tpo" "$(DEPDIR)/libcr_la-cr_core.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_core.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_core.c' object='libcr_la-cr_core.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_core.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_core.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.o `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c
-
-libcr_la-cr_core.obj: cr_core.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.obj `if test -f 'cr_core.c'; then $(CYGPATH_W) 'cr_core.c'; else $(CYGPATH_W) '$(srcdir)/cr_core.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_core.Tpo" "$(DEPDIR)/libcr_la-cr_core.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_core.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_core.c' object='libcr_la-cr_core.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_core.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_core.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.obj `if test -f 'cr_core.c'; then $(CYGPATH_W) 'cr_core.c'; else $(CYGPATH_W) '$(srcdir)/cr_core.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c
 
 libcr_la-cr_core.lo: cr_core.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_core.Tpo" "$(DEPDIR)/libcr_la-cr_core.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_core.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_core.c' object='libcr_la-cr_core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_core.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_core.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c
-
-libcr_la-cr_cs.o: cr_cs.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.o `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_cs.Tpo" "$(DEPDIR)/libcr_la-cr_cs.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_cs.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_cs.c' object='libcr_la-cr_cs.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_cs.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_cs.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.o `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c
-
-libcr_la-cr_cs.obj: cr_cs.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.obj `if test -f 'cr_cs.c'; then $(CYGPATH_W) 'cr_cs.c'; else $(CYGPATH_W) '$(srcdir)/cr_cs.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_cs.Tpo" "$(DEPDIR)/libcr_la-cr_cs.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_cs.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_cs.c' object='libcr_la-cr_cs.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_cs.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_cs.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.obj `if test -f 'cr_cs.c'; then $(CYGPATH_W) 'cr_cs.c'; else $(CYGPATH_W) '$(srcdir)/cr_cs.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c
 
 libcr_la-cr_cs.lo: cr_cs.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_cs.Tpo" "$(DEPDIR)/libcr_la-cr_cs.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_cs.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_cs.c' object='libcr_la-cr_cs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_cs.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_cs.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c
-
-libcr_la-cr_pthread.o: cr_pthread.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.o `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo" "$(DEPDIR)/libcr_la-cr_pthread.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_pthread.c' object='libcr_la-cr_pthread.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_pthread.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_pthread.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.o `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c
-
-libcr_la-cr_pthread.obj: cr_pthread.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.obj `if test -f 'cr_pthread.c'; then $(CYGPATH_W) 'cr_pthread.c'; else $(CYGPATH_W) '$(srcdir)/cr_pthread.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo" "$(DEPDIR)/libcr_la-cr_pthread.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_pthread.c' object='libcr_la-cr_pthread.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_pthread.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_pthread.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.obj `if test -f 'cr_pthread.c'; then $(CYGPATH_W) 'cr_pthread.c'; else $(CYGPATH_W) '$(srcdir)/cr_pthread.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c
 
 libcr_la-cr_pthread.lo: cr_pthread.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo" "$(DEPDIR)/libcr_la-cr_pthread.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_pthread.c' object='libcr_la-cr_pthread.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_pthread.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_pthread.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c
-
-libcr_la-cr_sig_sync.o: cr_sig_sync.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_la-cr_sig_sync.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
-
-libcr_la-cr_sig_sync.obj: cr_sig_sync.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_la-cr_sig_sync.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c
 
 libcr_la-cr_sig_sync.lo: cr_sig_sync.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_la-cr_sig_sync.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_la-cr_sig_sync.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_sig_sync.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_sig_sync.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
-
-libcr_la-cr_syscall.o: cr_syscall.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.o `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo" "$(DEPDIR)/libcr_la-cr_syscall.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_syscall.c' object='libcr_la-cr_syscall.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_syscall.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_syscall.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.o `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c
-
-libcr_la-cr_syscall.obj: cr_syscall.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.obj `if test -f 'cr_syscall.c'; then $(CYGPATH_W) 'cr_syscall.c'; else $(CYGPATH_W) '$(srcdir)/cr_syscall.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo" "$(DEPDIR)/libcr_la-cr_syscall.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_syscall.c' object='libcr_la-cr_syscall.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_syscall.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_syscall.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.obj `if test -f 'cr_syscall.c'; then $(CYGPATH_W) 'cr_syscall.c'; else $(CYGPATH_W) '$(srcdir)/cr_syscall.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
 
 libcr_la-cr_syscall.lo: cr_syscall.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo" "$(DEPDIR)/libcr_la-cr_syscall.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_syscall.c' object='libcr_la-cr_syscall.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_syscall.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_syscall.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c
-
-libcr_la-cr_trace.o: cr_trace.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_trace.Tpo" "$(DEPDIR)/libcr_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_trace.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_la-cr_trace.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_trace.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
-
-libcr_la-cr_trace.obj: cr_trace.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_trace.Tpo" "$(DEPDIR)/libcr_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_trace.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_la-cr_trace.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_trace.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c
 
 libcr_la-cr_trace.lo: cr_trace.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_trace.Tpo" "$(DEPDIR)/libcr_la-cr_trace.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_trace.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_la-cr_trace.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_trace.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_trace.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
-
-libcr_la-cr_strerror.o: cr_strerror.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.o `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo" "$(DEPDIR)/libcr_la-cr_strerror.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_strerror.c' object='libcr_la-cr_strerror.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_strerror.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_strerror.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.o `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c
-
-libcr_la-cr_strerror.obj: cr_strerror.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.obj `if test -f 'cr_strerror.c'; then $(CYGPATH_W) 'cr_strerror.c'; else $(CYGPATH_W) '$(srcdir)/cr_strerror.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo" "$(DEPDIR)/libcr_la-cr_strerror.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_strerror.c' object='libcr_la-cr_strerror.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_strerror.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_strerror.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.obj `if test -f 'cr_strerror.c'; then $(CYGPATH_W) 'cr_strerror.c'; else $(CYGPATH_W) '$(srcdir)/cr_strerror.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
 
 libcr_la-cr_strerror.lo: cr_strerror.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo" "$(DEPDIR)/libcr_la-cr_strerror.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_strerror.c' object='libcr_la-cr_strerror.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_strerror.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_strerror.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c
-
-libcr_la-cr_request.o: cr_request.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.o `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_request.Tpo" "$(DEPDIR)/libcr_la-cr_request.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_request.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_request.c' object='libcr_la-cr_request.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_request.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_request.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.o `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c
-
-libcr_la-cr_request.obj: cr_request.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.obj `if test -f 'cr_request.c'; then $(CYGPATH_W) 'cr_request.c'; else $(CYGPATH_W) '$(srcdir)/cr_request.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_request.Tpo" "$(DEPDIR)/libcr_la-cr_request.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_request.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_request.c' object='libcr_la-cr_request.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_request.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_request.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.obj `if test -f 'cr_request.c'; then $(CYGPATH_W) 'cr_request.c'; else $(CYGPATH_W) '$(srcdir)/cr_request.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c
 
 libcr_la-cr_request.lo: cr_request.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_request.Tpo" "$(DEPDIR)/libcr_la-cr_request.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_request.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_request.c' object='libcr_la-cr_request.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_request.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_request.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c
-
-libcr_la-cr_omit.o: cr_omit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_omit.Tpo" "$(DEPDIR)/libcr_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_omit.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_la-cr_omit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_omit.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
-
-libcr_la-cr_omit.obj: cr_omit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_omit.Tpo" "$(DEPDIR)/libcr_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_omit.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_la-cr_omit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_omit.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c
 
 libcr_la-cr_omit.lo: cr_omit.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_omit.Tpo" "$(DEPDIR)/libcr_la-cr_omit.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_omit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_la-cr_omit.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_omit.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_omit.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
-
-libcr_la-cr_run.o: cr_run.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_run.Tpo" "$(DEPDIR)/libcr_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_run.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_la-cr_run.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_run.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
-
-libcr_la-cr_run.obj: cr_run.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_run.Tpo" "$(DEPDIR)/libcr_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_run.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_la-cr_run.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_run.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
 
 libcr_la-cr_run.lo: cr_run.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_la-cr_run.Tpo" "$(DEPDIR)/libcr_la-cr_run.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_run.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_la-cr_run.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_la-cr_run.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_run.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
-
-libcr_omit_la-cr_omit.o: cr_omit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.o -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" "$(DEPDIR)/libcr_omit_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_omit_la-cr_omit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_omit.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
-
-libcr_omit_la-cr_omit.obj: cr_omit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.obj -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" "$(DEPDIR)/libcr_omit_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_omit_la-cr_omit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_omit.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
 
 libcr_omit_la-cr_omit.lo: cr_omit.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" "$(DEPDIR)/libcr_omit_la-cr_omit.Plo"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_omit.c' object='libcr_omit_la-cr_omit.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_omit.Plo' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_omit.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
-
-libcr_omit_la-cr_trace.o: cr_trace.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.o -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" "$(DEPDIR)/libcr_omit_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_omit_la-cr_trace.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_trace.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
-
-libcr_omit_la-cr_trace.obj: cr_trace.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.obj -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" "$(DEPDIR)/libcr_omit_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_omit_la-cr_trace.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_trace.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c
 
 libcr_omit_la-cr_trace.lo: cr_trace.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" "$(DEPDIR)/libcr_omit_la-cr_trace.Plo"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_omit_la-cr_trace.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_trace.Plo' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_trace.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
-
-libcr_omit_la-cr_sig_sync.o: cr_sig_sync.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.o -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_omit_la-cr_sig_sync.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
-
-libcr_omit_la-cr_sig_sync.obj: cr_sig_sync.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.obj -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_omit_la-cr_sig_sync.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
 
 libcr_omit_la-cr_sig_sync.lo: cr_sig_sync.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_omit_la-cr_sig_sync.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
-
-libcr_run_la-cr_run.o: cr_run.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.o -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo" "$(DEPDIR)/libcr_run_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_run_la-cr_run.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_run.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
-
-libcr_run_la-cr_run.obj: cr_run.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.obj -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo" "$(DEPDIR)/libcr_run_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_run_la-cr_run.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_run.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
 
 libcr_run_la-cr_run.lo: cr_run.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo" "$(DEPDIR)/libcr_run_la-cr_run.Plo"; else rm -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_run.c' object='libcr_run_la-cr_run.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_run.Plo' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_run.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
-
-libcr_run_la-cr_trace.o: cr_trace.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.o -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" "$(DEPDIR)/libcr_run_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_run_la-cr_trace.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_trace.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
-
-libcr_run_la-cr_trace.obj: cr_trace.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.obj -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" "$(DEPDIR)/libcr_run_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_run_la-cr_trace.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_trace.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c
 
 libcr_run_la-cr_trace.lo: cr_trace.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" "$(DEPDIR)/libcr_run_la-cr_trace.Plo"; else rm -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_trace.c' object='libcr_run_la-cr_trace.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_trace.Plo' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_trace.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
-
-libcr_run_la-cr_sig_sync.o: cr_sig_sync.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.o -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_run_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_run_la-cr_sig_sync.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
-
-libcr_run_la-cr_sig_sync.obj: cr_sig_sync.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.obj -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_run_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_run_la-cr_sig_sync.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c
 
 libcr_run_la-cr_sig_sync.lo: cr_sig_sync.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_run_la-cr_sig_sync.Plo"; else rm -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cr_sig_sync.c' object='libcr_run_la-cr_sig_sync.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.Plo' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -930,9 +612,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -1012,7 +696,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1070,7 +754,7 @@
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
 	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
+	dist-hook distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
diff -Nru blcr-0.8.2/LICENSE.txt blcr-0.8.4/LICENSE.txt
--- blcr-0.8.2/LICENSE.txt	2008-04-29 18:53:37.000000000 +0000
+++ blcr-0.8.4/LICENSE.txt	2011-08-14 20:15:37.000000000 +0000
@@ -1,5 +1,5 @@
 Berkeley Lab Checkpoint/Restart (BLCR) for Linux is Copyright (c)
-2008, The Regents of the University of California, through Lawrence
+2011, The Regents of the University of California, through Lawrence
 Berkeley National Laboratory (subject to receipt of any required
 approvals from the U.S. Dept. of Energy).  All rights reserved.
 
diff -Nru blcr-0.8.2/Makefile.in blcr-0.8.4/Makefile.in
--- blcr-0.8.2/Makefile.in	2009-06-17 03:56:45.000000000 +0000
+++ blcr-0.8.4/Makefile.in	2011-10-11 22:58:56.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/blcr_config.h.in \
@@ -50,7 +51,7 @@
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = blcr_config.h
 CONFIG_CLEAN_FILES = cr_module/kbuild/Makefile \
 	blcr_imports/kbuild/Makefile config/kbuild.mak
@@ -138,6 +139,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -221,6 +223,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -240,6 +243,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -408,7 +413,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -420,7 +431,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -428,7 +439,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -449,7 +466,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -474,14 +491,16 @@
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -491,9 +510,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) blcr_config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -550,12 +571,14 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -563,21 +586,21 @@
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-find $(distdir) -type d ! -perm -755 -exec chmod a+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
 
 dist-shar: distdir
@@ -590,7 +613,7 @@
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -599,13 +622,13 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -685,7 +708,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -746,20 +769,20 @@
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \
 	am--refresh check check-am check-local clean clean-generic \
 	clean-libtool clean-local clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-libtool distclean-local \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am \
-	install-exec-local install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-local distclean-recursive distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-exec \
+	install-exec-am install-exec-local install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am uninstall-local
 
 
 # Clean out CVS droppings
diff -Nru blcr-0.8.2/man/Makefile.in blcr-0.8.4/man/Makefile.in
--- blcr-0.8.2/man/Makefile.in	2009-06-17 03:56:47.000000000 +0000
+++ blcr-0.8.4/man/Makefile.in	2011-10-11 22:58:54.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = man
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -41,7 +42,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -110,6 +111,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -191,6 +193,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -210,6 +213,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -338,7 +343,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/NEWS blcr-0.8.4/NEWS
--- blcr-0.8.2/NEWS	2009-06-15 22:33:56.000000000 +0000
+++ blcr-0.8.4/NEWS	2011-10-11 00:08:20.000000000 +0000
@@ -1,6 +1,44 @@
 This file lists the significant user-visible changes between releases
 of BLCR, including main features and bug fixes.
 
+0.8.4
+-----------
+October 11, 2011
+Bug fix and expanded-support release.
+ - This release fixes the following user-visible bugs and "issues"
+   + This release adds support for "vanilla" Linux kernels up to 2.6.38.
+   + This release adds support for recent RHEL5 kernels.
+   + Occasional "random" failures on x86 have been identified and fixed.
+
+0.8.3
+-----------
+August 15, 2011
+Bug fix and expanded-support release.
+ - This release fixes the following user-visible bugs and "issues"
+   + More options for dealing with BLCR-vs-NSCD conflicts.  See the BLCR
+     FAQ entry 'Why do I get "vmadump: mmap failed: /var/db/nscd/[something]"
+     in the system logs?' for a list of one's options.
+   + This release adds support for "vanilla" Linux kernels up to 2.6.34.
+   + bug 2594 - dpipe.ct and forward.ct fail "while restoring external pipe"
+ - This release has known issues some RHEL5-derived kernels.  Specifically,
+   + auditing cr_restart can cause a kernel BUG() message to be issued
+   + the vdso page is misidentified during restart of 32-bit
+     processes on x86_64 kernels.  You'll see the following error:
+     do_mmap(0, ffffe000, 00001000, ...) = 0xfffffffffffffff4 (failed)
+   + --save-all is not supported for restart of 32-bit processes on x86_64
+     kernels.  If you try to restore such a process, you'll see cr_restart
+     will fail with the error:
+     Failed to locate newborn mmap()ed space
+   A patch for the RHEL5 kernels that addresses these issues is available on 
+   the web site:
+   https://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.3+kernel-2.6.18.el5.patch01
+   We haven't fully tested the rhel5 patch on non-el5 kernels (that's why it's 
+   not in the release), so we recommend you apply the RHEL5 patch ONLY if you
+   are running a 2.6.18 el5 kernel.
+
+The next release, BLCR 0.8.4, will merge support for RHEL5 kernels, and add
+support for 2.6.35 kernels.
+
 0.8.2
 -----------
 June 16, 2009
diff -Nru blcr-0.8.2/rpm/blcr-0.8.2.spec blcr-0.8.4/rpm/blcr-0.8.2.spec
--- blcr-0.8.2/rpm/blcr-0.8.2.spec	2009-06-17 04:09:16.000000000 +0000
+++ blcr-0.8.4/rpm/blcr-0.8.2.spec	1970-01-01 00:00:00.000000000 +0000
@@ -1,352 +0,0 @@
-Name: blcr
-Version: 0.8.2
-Release: 1
-Summary: Berkeley Lab Checkpoint/Restart for Linux
-Url: http://ftg.lbl.gov/checkpoint
-
-# You can "--define 'with_autoreconf 1'" on the rpmbuild commandline
-# to force use of site-specific or distro-specific autotools.
-%define run_autoreconf %{?with_autoreconf:1}%{!?with_autoreconf:0}
-
-# If not building against the running kernel, then you'll need to
-# add exactly one of the following two mutually exclusive options
-# to your rpmbuild (or rpm) command line:
-# 1) "--define 'kernel_ver <SOME_VERSION>'"
-# 2) "--define 'kernel_obj /lib/modules/<SOME_VERSION>/build'",
-# When using either of these, you may also  want/need to add
-# "--define 'kernel_src /usr/src/linux-<SOME_VERSION>'".
-# Of course the values assigned to kernel_obj and kernel_src
-# above are just examples.
-# Use of "--define 'kernel_type <SOMETHING>'" will allow one to
-# override /boot/kernel.h, where SOMETHING=SMP, UP, etc. if using
-# kernel sources configured via that file.
-
-# Read next line as "kernel = defined(kernel_ver) ? kernel_ver : `uname -r`"
-%define kernel %{?kernel_ver:%{kernel_ver}}%{!?kernel_ver:%(uname -r)}
-
-# Name the kernel modules package w/o dashes in the kernel version:
-%define modsubpkg modules_%(echo %{kernel} | tr - _)
-%define moduledir /lib/modules/%{kernel}/extra
-
-# Name of the unpacked source directory and stem of the tarball name
-%define distname %{name}-%{version}
-
-# Disable RedHat's automatic build of a debuginfo subpackage:
-%define debug_package %{nil}
-
-# Macro for scanning configure arguments
-# First arg is default value, second is option name.
-%define is_enabled() %(X=%1; eval set -- ; for x in "$@"; do if [ x"$x" = "x--disable-%2" -o x"$x" = "x--enable-%2=no" ]; then X=0; elif [ x"$x" = "x--enable-%2" -o x"$x" = "x--enable-%2=yes" ]; then X=1; fi; done; echo $X)
-
-# Are we building shared and/or static libs?
-%define build_shared %{is_enabled 1 shared}
-%if %{build_shared}
-%define build_static %{is_enabled 0 static}
-%else
-%define build_static 1
-%endif
-
-# Are we building static executables
-%define build_all_static %{is_enabled 0 all-static}
-
-# Are we installing the test-suite
-%define build_testsuite %{is_enabled 1 testsuite}
-
-# Are we building both 32- and 64-bit libcr?
-%define build_libdir32 0
-%ifarch x86_64 ppc64
-  %define build_libdir32 %{is_enabled 1 multilib}
-%endif
-
-# Where to put 32-bit libs on a 64-bit platform
-%if %{build_libdir32}
-  %define libdir32 %(echo %{_libdir} | sed -e s/lib64/lib/)
-%endif
-
-Group: System Environment/Base
-License: GPLv2+
-Source: %{distname}.tar.gz
-BuildRoot: %{_tmppath}/buildroot-%{name}-%{version}
-BuildRequires: perl sed
-Requires(Post): /sbin/chkconfig
-Requires(Preun): /sbin/chkconfig
-# Kernel and asm support only ported to certain architectures
-# i386 is omitted because it lacks required atomic instructions
-ExclusiveArch: i486 i586 i686 athlon x86_64 ppc ppc64 arm
-ExclusiveOs: Linux
-Requires: %{name}-modules >= %{version}-%{release}
-
-# DON'T require since many clusters are built w/ non-RPM kernels:
-# BuildPreReq: kernel-source = %{kernel}
-
-%description
-Berkeley Lab Checkpoint/Restart for Linux (BLCR)
-
-This package implements system-level checkpointing of scientific applications
-in a manner suitable for implementing preemption, migration and fault recovery
-by a batch scheduler.
-
-BLCR includes documented interfaces for a cooperating applications or
-libraries to implement extensions to the checkpoint system, such as
-consistent checkpointing of distributed MPI applications.
-Using this package with an appropriate MPI implementation, the vast majority
-of scientific applications which use MPI for communication on Linux clusters
-are checkpointable without any modifications to the application source code.
-
-You must also install the %{name}-libs package and a %{name}-modules_* package
-matching your kernel version.
-%prep
-%setup -q -n %{distname}
-
-%build
-
-# Work with rpm's various botched ideas of host vs. target
-%define _host_cpu %{_target_cpu}
-%define _host %{_target}
-%define _build_cpu %{_target_cpu}
-%define _build %{_target}
-
-# Allow user to request use of local autotools
-%if %{run_autoreconf}
-autoreconf --force --install
-%endif
-
-# VPATH build required to ensure --enable-multilib will work
-mkdir -p builddir
-cd builddir
-ln -s ../configure .
-
-# Configure the thing
-# Order arguments such that user's configure arguments can disable multilib, and
-# enable the config-report, but doesn't clobber kernel version info from the
-# rpmbuild command line
-%configure  \
-	--srcdir=.. \
-	%{?libdir32:--enable-multilib} \
-	--enable-testsuite \
-	--disable-config-report \
-	 \
-	%{!?kernel_obj:--with-linux=%{kernel}}%{?kernel_obj:--with-linux=%{kernel_obj}} \
-	%{?kernel_src:--with-linux-src=%{kernel_src}} \
-	%{?kernel_type:--with-kernel-type=%{kernel_type}}
-
-# Now build it
-make
-
-%clean
-rm -Rf ${RPM_BUILD_ROOT}
-
-%install
-cd builddir
-rm -Rf ${RPM_BUILD_ROOT}
-make install-strip DESTDIR=${RPM_BUILD_ROOT}
-# Ensure man pages are gzipped, regardless of brp-compress
-if [ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ]; then
-  find ${RPM_BUILD_ROOT}/%{_mandir} -name '*.[1-9]' | xargs gzip -9
-fi
-# Install the init script
-make -C etc install DESTDIR=${RPM_BUILD_ROOT}
-
-# On some systems rpmbuild dislikes having an RPATH that points
-# to a system directory.  Some versions of libtool get this right
-# on their own, while others don't.
-# So, we try to clean it up here if we have chrpath.
-if chrpath --version >& /dev/null; then
-%if !%{build_all_static}
-  chrpath -d ${RPM_BUILD_ROOT}/%{_bindir}/cr_checkpoint
-  chrpath -d ${RPM_BUILD_ROOT}/%{_bindir}/cr_restart
-%endif
-%if !%{build_all_static} && %{build_testsuite}
-  list=`make -C tests --no-print-directory echoval VARNAME=testsexec_PROGRAMS`
-  ( cd ${RPM_BUILD_ROOT}/%{_libexecdir}/blcr-testsuite && chrpath -d $list )
-%endif
-  : # ensure non-empty body
-fi
-
-%post
-if [ $1 = 1 ]; then
-  /sbin/chkconfig --add blcr
-fi
-exit 0
-
-%preun
-if [ $1 = 0 ]; then
-  /sbin/chkconfig --del blcr
-fi
-exit 0
-
-%files
-%defattr(-,root,root)
-%doc util/license.txt
-%doc COPYING
-%doc NEWS
-%doc doc/README
-%doc doc/html
-%doc %{_mandir}/man1/cr_checkpoint.1.gz
-%doc %{_mandir}/man1/cr_restart.1.gz
-%doc %{_mandir}/man1/cr_run.1.gz
-%{_bindir}/cr_checkpoint
-#%{_bindir}/cr_info
-%{_bindir}/cr_restart
-%{_bindir}/cr_run
-#%{_libexecdir}/vmadcheck
-%{_sysconfdir}/init.d/blcr
-
-%if %{build_shared}
-#
-# Libs in a separate package
-#
-%package libs
-Group: System Environment/Libraries
-Summary: Libraries for Berkeley Lab Checkpoint/Restart for Linux
-License: LGPLv2+
-Requires(Post): /sbin/ldconfig
-Requires(Postun): /sbin/ldconfig
-
-%description libs
-Runtime libraries for Berkeley Lab Checkpoint/Restart for Linux (BLCR)
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%files libs
-%defattr(-,root,root)
-%doc libcr/license.txt
-%doc COPYING.LIB
-%doc NEWS
-%{_libdir}/libcr.so.0
-%{_libdir}/libcr.so.0.5.2
-%{_libdir}/libcr_run.so.0
-%{_libdir}/libcr_run.so.0.5.2
-%{_libdir}/libcr_omit.so.0
-%{_libdir}/libcr_omit.so.0.5.2
-%endif
-%if %{build_shared} && %{build_libdir32}
-%{libdir32}/libcr.so.0
-%{libdir32}/libcr.so.0.5.2
-%{libdir32}/libcr_run.so.0
-%{libdir32}/libcr_run.so.0.5.2
-%{libdir32}/libcr_omit.so.0
-%{libdir32}/libcr_omit.so.0.5.2
-%endif
-
-#
-# Separate -devel package
-#
-%package devel
-%if %{build_shared}
-Requires: %{name}-libs = %{version}-%{release}
-%endif
-Group: Development/Libraries
-Summary: Header and object files for Berkeley Lab Checkpoint/Restart for Linux
-License: LGPLv2+
-
-%description devel
-Header and object files for Berkeley Lab Checkpoint/Restart for Linux
-You must also install the %{name}-libs package.
-
-%files devel
-%defattr(-,root,root)
-%doc README.devel
-%doc libcr/license.txt
-%doc COPYING.LIB
-%{_includedir}/blcr_common.h
-%{_includedir}/blcr_errcodes.h
-%{_includedir}/blcr_ioctl.h
-%{_includedir}/blcr_proc.h
-%{_includedir}/libcr.h
-# .la files
-%{_libdir}/libcr.la
-%{_libdir}/libcr_run.la
-%{_libdir}/libcr_omit.la
-%if %{build_libdir32}
-%{libdir32}/libcr.la
-%{libdir32}/libcr_run.la
-%{libdir32}/libcr_omit.la
-%endif
-# .so files
-%if %{build_shared}
-%{_libdir}/libcr.so
-%{_libdir}/libcr_run.so
-%{_libdir}/libcr_omit.so
-%endif
-%if %{build_shared} && %{build_libdir32}
-%{libdir32}/libcr.so
-%{libdir32}/libcr_run.so
-%{libdir32}/libcr_omit.so
-%endif
-# .a files
-%if %{build_static}
-%{_libdir}/libcr.a
-%{_libdir}/libcr_run.a
-%{_libdir}/libcr_omit.a
-%endif
-%if %{build_static} && %{build_libdir32}
-%{libdir32}/libcr.a
-%{libdir32}/libcr_run.a
-%{libdir32}/libcr_omit.a
-%endif
-
-#
-# Kernel modules as a separate package
-#
-%package %{modsubpkg}
-Group: System Environment/Kernel
-Summary: Kernel modules for Berkeley Lab Checkpoint/Restart for Linux
-Provides: %{name}-modules = %{version}-%{release}
-Requires: %{name} = %{version}
-# DON'T require since many clusters are built w/ non-RPM kernels:
-# Requires: kernel = %{kernel}
-
-%description %{modsubpkg}
-Kernel modules for Berkeley Lab Checkpoint/Restart for Linux (BLCR)
-These kernel modules are built for Linux %{kernel}.
-
-You must also install the base %{name} package.
-%post %{modsubpkg}
-/sbin/depmod -a -F /boot/System.map-%{kernel} %{kernel}
-if [ $1 = 2 ]; then
- # conditional reload on upgrade
- /etc/init.d/blcr reload >& /dev/null
-fi
-exit 0
-%preun %{modsubpkg}
-if [ $1 = 0 ]; then
- /etc/init.d/blcr stop >& /dev/null
-fi
-exit 0
-%postun %{modsubpkg}
-if [ $1 = 0 ]; then
- /sbin/depmod -a -F /boot/System.map-%{kernel} %{kernel}
-fi
-exit 0
-
-%files %{modsubpkg}
-%defattr(-,root,root)
-%doc cr_module/license.txt
-%doc COPYING
-%dir %{moduledir}
-%{moduledir}/blcr.ko
-%{moduledir}/blcr_imports.ko
-
-##
-## testsuite as an additional package if configured in
-##
-%if %{build_testsuite}
-%package testsuite
-Group: System Environment/Base
-Summary: Test suite for Berkeley Lab Checkpoint/Restart for Linux
-License: GPLv2+
-Requires: %{name} = %{version}
-%description testsuite
-This package includes tests for Berkeley Lab Checkpoint/Restart for Linux
-%files testsuite
-%defattr(-,root,root)
-%doc tests/license.txt
-%doc COPYING
-%{_libexecdir}/blcr-testsuite
-%endif
-
-%changelog
-* Tue Jun 16 2009 Paul H. Hargrove <PHHargrove@lbl.gov> 0.8.2-1
-- Add this autogenerated %%changelog to quiet rpmlint
diff -Nru blcr-0.8.2/rpm/blcr-0.8.4.spec blcr-0.8.4/rpm/blcr-0.8.4.spec
--- blcr-0.8.2/rpm/blcr-0.8.4.spec	1970-01-01 00:00:00.000000000 +0000
+++ blcr-0.8.4/rpm/blcr-0.8.4.spec	2011-10-11 23:16:03.000000000 +0000
@@ -0,0 +1,352 @@
+Name: blcr
+Version: 0.8.4
+Release: 1
+Summary: Berkeley Lab Checkpoint/Restart for Linux
+Url: http://ftg.lbl.gov/checkpoint
+
+# You can "--define 'with_autoreconf 1'" on the rpmbuild commandline
+# to force use of site-specific or distro-specific autotools.
+%define run_autoreconf %{?with_autoreconf:1}%{!?with_autoreconf:0}
+
+# If not building against the running kernel, then you'll need to
+# add exactly one of the following two mutually exclusive options
+# to your rpmbuild (or rpm) command line:
+# 1) "--define 'kernel_ver <SOME_VERSION>'"
+# 2) "--define 'kernel_obj /lib/modules/<SOME_VERSION>/build'",
+# When using either of these, you may also  want/need to add
+# "--define 'kernel_src /usr/src/linux-<SOME_VERSION>'".
+# Of course the values assigned to kernel_obj and kernel_src
+# above are just examples.
+# Use of "--define 'kernel_type <SOMETHING>'" will allow one to
+# override /boot/kernel.h, where SOMETHING=SMP, UP, etc. if using
+# kernel sources configured via that file.
+
+# Read next line as "kernel = defined(kernel_ver) ? kernel_ver : `uname -r`"
+%define kernel %{?kernel_ver:%{kernel_ver}}%{!?kernel_ver:%(uname -r)}
+
+# Name the kernel modules package w/o dashes in the kernel version:
+%define modsubpkg modules_%(echo %{kernel} | tr - _)
+%define moduledir /lib/modules/%{kernel}/extra
+
+# Name of the unpacked source directory and stem of the tarball name
+%define distname %{name}-%{version}
+
+# Disable RedHat's automatic build of a debuginfo subpackage:
+%define debug_package %{nil}
+
+# Macro for scanning configure arguments
+# First arg is default value, second is option name.
+%define is_enabled() %(X=%1; eval set -- ; for x in "$@"; do if [ x"$x" = "x--disable-%2" -o x"$x" = "x--enable-%2=no" ]; then X=0; elif [ x"$x" = "x--enable-%2" -o x"$x" = "x--enable-%2=yes" ]; then X=1; fi; done; echo $X)
+
+# Are we building shared and/or static libs?
+%define build_shared %{is_enabled 1 shared}
+%if %{build_shared}
+%define build_static %{is_enabled 0 static}
+%else
+%define build_static 1
+%endif
+
+# Are we building static executables
+%define build_all_static %{is_enabled 0 all-static}
+
+# Are we installing the test-suite
+%define build_testsuite %{is_enabled 1 testsuite}
+
+# Are we building both 32- and 64-bit libcr?
+%define build_libdir32 0
+%ifarch x86_64 ppc64
+  %define build_libdir32 %{is_enabled 1 multilib}
+%endif
+
+# Where to put 32-bit libs on a 64-bit platform
+%if %{build_libdir32}
+  %define libdir32 %(echo %{_libdir} | sed -e s/lib64/lib/)
+%endif
+
+Group: System Environment/Base
+License: GPLv2+
+Source: %{distname}.tar.gz
+BuildRoot: %{_tmppath}/buildroot-%{name}-%{version}
+BuildRequires: perl sed
+Requires(Post): /sbin/chkconfig
+Requires(Preun): /sbin/chkconfig
+# Kernel and asm support only ported to certain architectures
+# i386 is omitted because it lacks required atomic instructions
+ExclusiveArch: i486 i586 i686 athlon x86_64 ppc ppc64 arm
+ExclusiveOs: Linux
+Requires: %{name}-modules >= %{version}-%{release}
+
+# DON'T require since many clusters are built w/ non-RPM kernels:
+# BuildPreReq: kernel-source = %{kernel}
+
+%description
+Berkeley Lab Checkpoint/Restart for Linux (BLCR)
+
+This package implements system-level checkpointing of scientific applications
+in a manner suitable for implementing preemption, migration and fault recovery
+by a batch scheduler.
+
+BLCR includes documented interfaces for a cooperating applications or
+libraries to implement extensions to the checkpoint system, such as
+consistent checkpointing of distributed MPI applications.
+Using this package with an appropriate MPI implementation, the vast majority
+of scientific applications which use MPI for communication on Linux clusters
+are checkpointable without any modifications to the application source code.
+
+You must also install the %{name}-libs package and a %{name}-modules_* package
+matching your kernel version.
+%prep
+%setup -q -n %{distname}
+
+%build
+
+# Work with rpm's various botched ideas of host vs. target
+%define _host_cpu %{_target_cpu}
+%define _host %{_target}
+%define _build_cpu %{_target_cpu}
+%define _build %{_target}
+
+# Allow user to request use of local autotools
+%if %{run_autoreconf}
+autoreconf --force --install
+%endif
+
+# VPATH build required to ensure --enable-multilib will work
+mkdir -p builddir
+cd builddir
+ln -s ../configure .
+
+# Configure the thing
+# Order arguments such that user's configure arguments can disable multilib, and
+# enable the config-report, but doesn't clobber kernel version info from the
+# rpmbuild command line
+%configure  \
+	--srcdir=.. \
+	%{?libdir32:--enable-multilib} \
+	--enable-testsuite \
+	--disable-config-report \
+	 \
+	%{!?kernel_obj:--with-linux=%{kernel}}%{?kernel_obj:--with-linux=%{kernel_obj}} \
+	%{?kernel_src:--with-linux-src=%{kernel_src}} \
+	%{?kernel_type:--with-kernel-type=%{kernel_type}}
+
+# Now build it
+make
+
+%clean
+rm -Rf ${RPM_BUILD_ROOT}
+
+%install
+cd builddir
+rm -Rf ${RPM_BUILD_ROOT}
+make install-strip DESTDIR=${RPM_BUILD_ROOT}
+# Ensure man pages are gzipped, regardless of brp-compress
+if [ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ]; then
+  find ${RPM_BUILD_ROOT}/%{_mandir} -name '*.[1-9]' | xargs gzip -9
+fi
+# Install the init script
+make -C etc install DESTDIR=${RPM_BUILD_ROOT}
+
+# On some systems rpmbuild dislikes having an RPATH that points
+# to a system directory.  Some versions of libtool get this right
+# on their own, while others don't.
+# So, we try to clean it up here if we have chrpath.
+if chrpath --version >& /dev/null; then
+%if !%{build_all_static}
+  chrpath -d ${RPM_BUILD_ROOT}/%{_bindir}/cr_checkpoint
+  chrpath -d ${RPM_BUILD_ROOT}/%{_bindir}/cr_restart
+%endif
+%if !%{build_all_static} && %{build_testsuite}
+  list=`make -C tests --no-print-directory echoval VARNAME=testsexec_PROGRAMS`
+  ( cd ${RPM_BUILD_ROOT}/%{_libexecdir}/blcr-testsuite && chrpath -d $list )
+%endif
+  : # ensure non-empty body
+fi
+
+%post
+if [ $1 = 1 ]; then
+  /sbin/chkconfig --add blcr
+fi
+exit 0
+
+%preun
+if [ $1 = 0 ]; then
+  /sbin/chkconfig --del blcr
+fi
+exit 0
+
+%files
+%defattr(-,root,root)
+%doc util/license.txt
+%doc COPYING
+%doc NEWS
+%doc doc/README
+%doc doc/html
+%doc %{_mandir}/man1/cr_checkpoint.1.gz
+%doc %{_mandir}/man1/cr_restart.1.gz
+%doc %{_mandir}/man1/cr_run.1.gz
+%{_bindir}/cr_checkpoint
+#%{_bindir}/cr_info
+%{_bindir}/cr_restart
+%{_bindir}/cr_run
+#%{_libexecdir}/vmadcheck
+%{_sysconfdir}/init.d/blcr
+
+%if %{build_shared}
+#
+# Libs in a separate package
+#
+%package libs
+Group: System Environment/Libraries
+Summary: Libraries for Berkeley Lab Checkpoint/Restart for Linux
+License: LGPLv2+
+Requires(Post): /sbin/ldconfig
+Requires(Postun): /sbin/ldconfig
+
+%description libs
+Runtime libraries for Berkeley Lab Checkpoint/Restart for Linux (BLCR)
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%files libs
+%defattr(-,root,root)
+%doc libcr/license.txt
+%doc COPYING.LIB
+%doc NEWS
+%{_libdir}/libcr.so.0
+%{_libdir}/libcr.so.0.5.3
+%{_libdir}/libcr_run.so.0
+%{_libdir}/libcr_run.so.0.5.3
+%{_libdir}/libcr_omit.so.0
+%{_libdir}/libcr_omit.so.0.5.3
+%endif
+%if %{build_shared} && %{build_libdir32}
+%{libdir32}/libcr.so.0
+%{libdir32}/libcr.so.0.5.3
+%{libdir32}/libcr_run.so.0
+%{libdir32}/libcr_run.so.0.5.3
+%{libdir32}/libcr_omit.so.0
+%{libdir32}/libcr_omit.so.0.5.3
+%endif
+
+#
+# Separate -devel package
+#
+%package devel
+%if %{build_shared}
+Requires: %{name}-libs = %{version}-%{release}
+%endif
+Group: Development/Libraries
+Summary: Header and object files for Berkeley Lab Checkpoint/Restart for Linux
+License: LGPLv2+
+
+%description devel
+Header and object files for Berkeley Lab Checkpoint/Restart for Linux
+You must also install the %{name}-libs package.
+
+%files devel
+%defattr(-,root,root)
+%doc README.devel
+%doc libcr/license.txt
+%doc COPYING.LIB
+%{_includedir}/blcr_common.h
+%{_includedir}/blcr_errcodes.h
+%{_includedir}/blcr_ioctl.h
+%{_includedir}/blcr_proc.h
+%{_includedir}/libcr.h
+# .la files
+%{_libdir}/libcr.la
+%{_libdir}/libcr_run.la
+%{_libdir}/libcr_omit.la
+%if %{build_libdir32}
+%{libdir32}/libcr.la
+%{libdir32}/libcr_run.la
+%{libdir32}/libcr_omit.la
+%endif
+# .so files
+%if %{build_shared}
+%{_libdir}/libcr.so
+%{_libdir}/libcr_run.so
+%{_libdir}/libcr_omit.so
+%endif
+%if %{build_shared} && %{build_libdir32}
+%{libdir32}/libcr.so
+%{libdir32}/libcr_run.so
+%{libdir32}/libcr_omit.so
+%endif
+# .a files
+%if %{build_static}
+%{_libdir}/libcr.a
+%{_libdir}/libcr_run.a
+%{_libdir}/libcr_omit.a
+%endif
+%if %{build_static} && %{build_libdir32}
+%{libdir32}/libcr.a
+%{libdir32}/libcr_run.a
+%{libdir32}/libcr_omit.a
+%endif
+
+#
+# Kernel modules as a separate package
+#
+%package %{modsubpkg}
+Group: System Environment/Kernel
+Summary: Kernel modules for Berkeley Lab Checkpoint/Restart for Linux
+Provides: %{name}-modules = %{version}-%{release}
+Requires: %{name} = %{version}
+# DON'T require since many clusters are built w/ non-RPM kernels:
+# Requires: kernel = %{kernel}
+
+%description %{modsubpkg}
+Kernel modules for Berkeley Lab Checkpoint/Restart for Linux (BLCR)
+These kernel modules are built for Linux %{kernel}.
+
+You must also install the base %{name} package.
+%post %{modsubpkg}
+/sbin/depmod -a -F /boot/System.map-%{kernel} %{kernel}
+if [ $1 = 2 ]; then
+ # conditional reload on upgrade
+ /etc/init.d/blcr reload >& /dev/null
+fi
+exit 0
+%preun %{modsubpkg}
+if [ $1 = 0 ]; then
+ /etc/init.d/blcr stop >& /dev/null
+fi
+exit 0
+%postun %{modsubpkg}
+if [ $1 = 0 ]; then
+ /sbin/depmod -a -F /boot/System.map-%{kernel} %{kernel}
+fi
+exit 0
+
+%files %{modsubpkg}
+%defattr(-,root,root)
+%doc cr_module/license.txt
+%doc COPYING
+%dir %{moduledir}
+%{moduledir}/blcr.ko
+%{moduledir}/blcr_imports.ko
+
+##
+## testsuite as an additional package if configured in
+##
+%if %{build_testsuite}
+%package testsuite
+Group: System Environment/Base
+Summary: Test suite for Berkeley Lab Checkpoint/Restart for Linux
+License: GPLv2+
+Requires: %{name} = %{version}
+%description testsuite
+This package includes tests for Berkeley Lab Checkpoint/Restart for Linux
+%files testsuite
+%defattr(-,root,root)
+%doc tests/license.txt
+%doc COPYING
+%{_libexecdir}/blcr-testsuite
+%endif
+
+%changelog
+* Tue Oct 11 2011 Paul H. Hargrove <PHHargrove@lbl.gov> 0.8.4-1
+- Add this autogenerated %%changelog to quiet rpmlint
diff -Nru blcr-0.8.2/rpm/Makefile.in blcr-0.8.4/rpm/Makefile.in
--- blcr-0.8.2/rpm/Makefile.in	2009-06-17 03:56:47.000000000 +0000
+++ blcr-0.8.4/rpm/Makefile.in	2011-10-11 22:58:54.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = rpm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -42,7 +43,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES = specfile
 SOURCES =
@@ -111,6 +112,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -192,6 +194,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -211,6 +214,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -356,11 +361,12 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@HAVE_RPMBUILD_FALSE@clean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local mostlyclean-am
diff -Nru blcr-0.8.2/tests/Makefile.am blcr-0.8.4/tests/Makefile.am
--- blcr-0.8.2/tests/Makefile.am	2009-02-27 08:36:24.000000000 +0000
+++ blcr-0.8.4/tests/Makefile.am	2011-08-03 19:24:29.000000000 +0000
@@ -65,7 +65,7 @@
 	simple simple_pthread cwd dup filedescriptors pipe named_fifo \
 	cloexec get_info orphan overlap child mmaps hugetlbfs readdir dev_null \
 	cr_signal linked_fifo sigpending dpipe forward hooks math sigaltstack \
-	prctl lam
+	prctl lam nscd
 # hugetlbfs2 moved to "bonus" list due to leak of MAP_PRIVATE pages in some kernels
 CRUT_TESTS = $(CRUT_progs)
 
@@ -271,7 +271,7 @@
 check_scripts2 = $(SIMPLE_scripts2) $(SEQ_scripts2) $(helper_scripts2)
 
 # Environment variables visible to the test programs
-TESTS_ENVIRONMENT = top_srcdir="$(TOP_SRCDIR)"
+TESTS_ENVIRONMENT = top_srcdir="$(TOP_SRCDIR)" LIBCR_DISABLE_NSCD=1
 # Automake magic here...
 check_LIBRARIES = libtest.a
 check_HEADERS = crut.h crut_util.h
diff -Nru blcr-0.8.2/tests/Makefile.in blcr-0.8.4/tests/Makefile.in
--- blcr-0.8.2/tests/Makefile.in	2009-06-17 03:56:48.000000000 +0000
+++ blcr-0.8.4/tests/Makefile.in	2011-10-11 22:58:55.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +15,6 @@
 @SET_MAKE@
 
 
-SOURCES = $(libtest_a_SOURCES) atomics.c atomics_stress.c bug2003_aux.c bug2524.c cb_exit.c child.c cloexec.c cr_signal.c cr_tryenter_cs.c critical_sections.c crut_wrapper.c cs_enter_leave.c cs_enter_leave2.c cwd.c dev_null.c dlopen_aux.c dpipe.c dup.c edeadlk.c failed_cb.c failed_cb2.c filedescriptors.c forward.c get_info.c hello.c hooks.c hugetlbfs.c hugetlbfs2.c lam.c linked_fifo.c math.c mmaps.c named_fifo.c orphan.c overlap.c pause.c pid_in_use.c pid_restore.c pipe.c prctl.c ptrace.c readdir.c reloc_aux.c replace_cb.c save_aux.c seq_wrapper.c sigaltstack.c sigpending.c simple.c simple_pthread.c stage0001.c stage0002.c stage0003.c stage0004.c stopped.c $(testcxx_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -37,6 +35,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 @CR_BUILD_TESTSUITE_TRUE@testsexec_PROGRAMS = $(am__EXEEXT_6) \
 @CR_BUILD_TESTSUITE_TRUE@	$(am__EXEEXT_14)
@@ -49,7 +48,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES = shellinit
 ARFLAGS = cru
@@ -73,7 +72,7 @@
 	hugetlbfs$(EXEEXT) readdir$(EXEEXT) dev_null$(EXEEXT) \
 	cr_signal$(EXEEXT) linked_fifo$(EXEEXT) sigpending$(EXEEXT) \
 	dpipe$(EXEEXT) forward$(EXEEXT) hooks$(EXEEXT) math$(EXEEXT) \
-	sigaltstack$(EXEEXT) prctl$(EXEEXT) lam$(EXEEXT)
+	sigaltstack$(EXEEXT) prctl$(EXEEXT) lam$(EXEEXT) nscd$(EXEEXT)
 @CR_ENABLE_SHARED_TRUE@am__EXEEXT_4 = hello$(EXEEXT) \
 @CR_ENABLE_SHARED_TRUE@	dlopen_aux$(EXEEXT)
 am__EXEEXT_5 = $(am__EXEEXT_4) bug2003_aux$(EXEEXT) pause$(EXEEXT) \
@@ -89,7 +88,8 @@
 am__EXEEXT_13 = $(am__EXEEXT_8) $(am__EXEEXT_10) $(am__EXEEXT_11) \
 	$(am__EXEEXT_12)
 am__EXEEXT_14 = seq_wrapper$(EXEEXT) crut_wrapper$(EXEEXT)
-am__installdirs = "$(DESTDIR)$(testsexecdir)" "$(DESTDIR)$(testsexecdir)"
+am__installdirs = "$(DESTDIR)$(testsexecdir)" \
+	"$(DESTDIR)$(testsexecdir)"
 testsexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(testsexec_PROGRAMS)
 atomics_SOURCES = atomics.c
@@ -229,6 +229,10 @@
 named_fifo_OBJECTS = named_fifo.$(OBJEXT)
 named_fifo_LDADD = $(LDADD)
 named_fifo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
+nscd_SOURCES = nscd.c
+nscd_OBJECTS = nscd.$(OBJEXT)
+nscd_LDADD = $(LDADD)
+nscd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
 orphan_SOURCES = orphan.c
 orphan_OBJECTS = orphan.$(OBJEXT)
 orphan_LDADD = $(LDADD)
@@ -328,59 +332,22 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/atomics-atomics.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/atomics_stress-atomics_stress.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bug2003_aux.Po ./$(DEPDIR)/bug2524.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cb_exit.Po ./$(DEPDIR)/child.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cloexec.Po ./$(DEPDIR)/cr_signal.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cr_tryenter_cs.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/critical_sections.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/crut.Po ./$(DEPDIR)/crut_util.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/crut_util_libcr.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/crut_util_pth.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/crut_wrapper.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cs_enter_leave.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cs_enter_leave2.Po ./$(DEPDIR)/cwd.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/dev_null.Po ./$(DEPDIR)/dlopen_aux.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/dpipe.Po ./$(DEPDIR)/dup.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/edeadlk.Po ./$(DEPDIR)/failed_cb.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/failed_cb2.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/filedescriptors.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/forward.Po ./$(DEPDIR)/get_info.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/hello.Po ./$(DEPDIR)/hooks.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/hugetlbfs.Po ./$(DEPDIR)/hugetlbfs2.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/lam.Po ./$(DEPDIR)/linked_fifo.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/math.Po ./$(DEPDIR)/mmaps.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/named_fifo.Po ./$(DEPDIR)/orphan.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/overlap.Po ./$(DEPDIR)/pause.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/pid_in_use.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/pid_restore.Po ./$(DEPDIR)/pipe.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/prctl.Po ./$(DEPDIR)/ptrace.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/readdir.Po ./$(DEPDIR)/reloc_aux.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/replace_cb.Po ./$(DEPDIR)/save_aux.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/seq_wrapper.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/sigaltstack.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/sigpending.Po ./$(DEPDIR)/simple.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/simple_pthread.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/stage0001.Po ./$(DEPDIR)/stage0002.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/stage0003.Po ./$(DEPDIR)/stage0004.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/stopped.Po ./$(DEPDIR)/testcxx.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libtest_a_SOURCES) atomics.c atomics_stress.c \
 	bug2003_aux.c bug2524.c cb_exit.c child.c cloexec.c \
 	cr_signal.c cr_tryenter_cs.c critical_sections.c \
@@ -388,11 +355,12 @@
 	dev_null.c dlopen_aux.c dpipe.c dup.c edeadlk.c failed_cb.c \
 	failed_cb2.c filedescriptors.c forward.c get_info.c hello.c \
 	hooks.c hugetlbfs.c hugetlbfs2.c lam.c linked_fifo.c math.c \
-	mmaps.c named_fifo.c orphan.c overlap.c pause.c pid_in_use.c \
-	pid_restore.c pipe.c prctl.c ptrace.c readdir.c reloc_aux.c \
-	replace_cb.c save_aux.c seq_wrapper.c sigaltstack.c \
-	sigpending.c simple.c simple_pthread.c stage0001.c stage0002.c \
-	stage0003.c stage0004.c stopped.c $(testcxx_SOURCES)
+	mmaps.c named_fifo.c nscd.c orphan.c overlap.c pause.c \
+	pid_in_use.c pid_restore.c pipe.c prctl.c ptrace.c readdir.c \
+	reloc_aux.c replace_cb.c save_aux.c seq_wrapper.c \
+	sigaltstack.c sigpending.c simple.c simple_pthread.c \
+	stage0001.c stage0002.c stage0003.c stage0004.c stopped.c \
+	$(testcxx_SOURCES)
 DIST_SOURCES = $(libtest_a_SOURCES) atomics.c atomics_stress.c \
 	bug2003_aux.c bug2524.c cb_exit.c child.c cloexec.c \
 	cr_signal.c cr_tryenter_cs.c critical_sections.c \
@@ -400,11 +368,12 @@
 	dev_null.c dlopen_aux.c dpipe.c dup.c edeadlk.c failed_cb.c \
 	failed_cb2.c filedescriptors.c forward.c get_info.c hello.c \
 	hooks.c hugetlbfs.c hugetlbfs2.c lam.c linked_fifo.c math.c \
-	mmaps.c named_fifo.c orphan.c overlap.c pause.c pid_in_use.c \
-	pid_restore.c pipe.c prctl.c ptrace.c readdir.c reloc_aux.c \
-	replace_cb.c save_aux.c seq_wrapper.c sigaltstack.c \
-	sigpending.c simple.c simple_pthread.c stage0001.c stage0002.c \
-	stage0003.c stage0004.c stopped.c $(am__testcxx_SOURCES_DIST)
+	mmaps.c named_fifo.c nscd.c orphan.c overlap.c pause.c \
+	pid_in_use.c pid_restore.c pipe.c prctl.c ptrace.c readdir.c \
+	reloc_aux.c replace_cb.c save_aux.c seq_wrapper.c \
+	sigaltstack.c sigpending.c simple.c simple_pthread.c \
+	stage0001.c stage0002.c stage0003.c stage0004.c stopped.c \
+	$(am__testcxx_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -471,6 +440,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -552,6 +522,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -571,6 +542,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -640,7 +613,7 @@
 	simple simple_pthread cwd dup filedescriptors pipe named_fifo \
 	cloexec get_info orphan overlap child mmaps hugetlbfs readdir dev_null \
 	cr_signal linked_fifo sigpending dpipe forward hooks math sigaltstack \
-	prctl lam
+	prctl lam nscd
 
 # hugetlbfs2 moved to "bonus" list due to leak of MAP_PRIVATE pages in some kernels
 CRUT_TESTS = $(CRUT_progs)
@@ -766,7 +739,7 @@
 check_scripts2 = $(SIMPLE_scripts2) $(SEQ_scripts2) $(helper_scripts2)
 
 # Environment variables visible to the test programs
-TESTS_ENVIRONMENT = top_srcdir="$(TOP_SRCDIR)"
+TESTS_ENVIRONMENT = top_srcdir="$(TOP_SRCDIR)" LIBCR_DISABLE_NSCD=1
 # Automake magic here...
 check_LIBRARIES = libtest.a
 check_HEADERS = crut.h crut_util.h
@@ -863,7 +836,8 @@
 	  f=`echo "$$p" | \
 	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
 	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(testsexecdir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
+	    if "$(DESTDIR)$(testsexecdir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
 		 && test -n "`cat c$${pid}_.out`" \
 		 && test -z "`cat c$${pid}_.err`"; then :; \
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
@@ -968,6 +942,9 @@
 named_fifo$(EXEEXT): $(named_fifo_OBJECTS) $(named_fifo_DEPENDENCIES) 
 	@rm -f named_fifo$(EXEEXT)
 	$(LINK) $(named_fifo_LDFLAGS) $(named_fifo_OBJECTS) $(named_fifo_LDADD) $(LIBS)
+nscd$(EXEEXT): $(nscd_OBJECTS) $(nscd_DEPENDENCIES) 
+	@rm -f nscd$(EXEEXT)
+	$(LINK) $(nscd_LDFLAGS) $(nscd_OBJECTS) $(nscd_LDADD) $(LIBS)
 orphan$(EXEEXT): $(orphan_OBJECTS) $(orphan_DEPENDENCIES) 
 	@rm -f orphan$(EXEEXT)
 	$(LINK) $(orphan_LDFLAGS) $(orphan_OBJECTS) $(orphan_LDADD) $(LIBS)
@@ -1064,7 +1041,8 @@
 	  esac; \
 	  f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
 	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(testsexecdir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
+	    if "$(DESTDIR)$(testsexecdir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
 		 && test -n "`cat c$${pid}_.out`" \
 		 && test -z "`cat c$${pid}_.err`"; then :; \
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
@@ -1114,6 +1092,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/math.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmaps.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/named_fifo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nscd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orphan.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/overlap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pause.Po@am__quote@
@@ -1142,96 +1121,70 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 atomics-atomics.o: atomics.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.o -MD -MP -MF "$(DEPDIR)/atomics-atomics.Tpo" -c -o atomics-atomics.o `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atomics-atomics.Tpo" "$(DEPDIR)/atomics-atomics.Po"; else rm -f "$(DEPDIR)/atomics-atomics.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics.c' object='atomics-atomics.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics-atomics.Po' tmpdepfile='$(DEPDIR)/atomics-atomics.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -c -o atomics-atomics.o `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c
 
 atomics-atomics.obj: atomics.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.obj -MD -MP -MF "$(DEPDIR)/atomics-atomics.Tpo" -c -o atomics-atomics.obj `if test -f 'atomics.c'; then $(CYGPATH_W) 'atomics.c'; else $(CYGPATH_W) '$(srcdir)/atomics.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atomics-atomics.Tpo" "$(DEPDIR)/atomics-atomics.Po"; else rm -f "$(DEPDIR)/atomics-atomics.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics.c' object='atomics-atomics.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics-atomics.Po' tmpdepfile='$(DEPDIR)/atomics-atomics.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -c -o atomics-atomics.obj `if test -f 'atomics.c'; then $(CYGPATH_W) 'atomics.c'; else $(CYGPATH_W) '$(srcdir)/atomics.c'; fi`
 
-atomics-atomics.lo: atomics.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.lo -MD -MP -MF "$(DEPDIR)/atomics-atomics.Tpo" -c -o atomics-atomics.lo `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atomics-atomics.Tpo" "$(DEPDIR)/atomics-atomics.Plo"; else rm -f "$(DEPDIR)/atomics-atomics.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics.c' object='atomics-atomics.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics-atomics.Plo' tmpdepfile='$(DEPDIR)/atomics-atomics.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -c -o atomics-atomics.lo `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c
-
 atomics_stress-atomics_stress.o: atomics_stress.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.o -MD -MP -MF "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" -c -o atomics_stress-atomics_stress.o `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" "$(DEPDIR)/atomics_stress-atomics_stress.Po"; else rm -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics_stress.c' object='atomics_stress-atomics_stress.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics_stress-atomics_stress.Po' tmpdepfile='$(DEPDIR)/atomics_stress-atomics_stress.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -c -o atomics_stress-atomics_stress.o `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c
 
 atomics_stress-atomics_stress.obj: atomics_stress.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.obj -MD -MP -MF "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" -c -o atomics_stress-atomics_stress.obj `if test -f 'atomics_stress.c'; then $(CYGPATH_W) 'atomics_stress.c'; else $(CYGPATH_W) '$(srcdir)/atomics_stress.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" "$(DEPDIR)/atomics_stress-atomics_stress.Po"; else rm -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics_stress.c' object='atomics_stress-atomics_stress.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics_stress-atomics_stress.Po' tmpdepfile='$(DEPDIR)/atomics_stress-atomics_stress.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -c -o atomics_stress-atomics_stress.obj `if test -f 'atomics_stress.c'; then $(CYGPATH_W) 'atomics_stress.c'; else $(CYGPATH_W) '$(srcdir)/atomics_stress.c'; fi`
 
-atomics_stress-atomics_stress.lo: atomics_stress.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.lo -MD -MP -MF "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" -c -o atomics_stress-atomics_stress.lo `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" "$(DEPDIR)/atomics_stress-atomics_stress.Plo"; else rm -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atomics_stress.c' object='atomics_stress-atomics_stress.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/atomics_stress-atomics_stress.Plo' tmpdepfile='$(DEPDIR)/atomics_stress-atomics_stress.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -c -o atomics_stress-atomics_stress.lo `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c
-
 .cc.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
 @am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -1264,9 +1217,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -1345,20 +1300,20 @@
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
 	    skipped="($$skip tests were not run)"; \
-	    test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \
 	  report=""; \
 	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
 	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$report"; \
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
-	  test -n "$$skipped" && echo "$$skipped"; \
-	  test -n "$$report" && echo "$$report"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
 	  echo "$$dashes"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
@@ -1421,11 +1376,13 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@CR_BUILD_TESTSUITE_FALSE@uninstall-local:
+@CR_BUILD_TESTSUITE_FALSE@install-exec-local:
 clean: clean-am
 
 clean-am: clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
diff -Nru blcr-0.8.2/tests/nscd.c blcr-0.8.4/tests/nscd.c
--- blcr-0.8.2/tests/nscd.c	1970-01-01 00:00:00.000000000 +0000
+++ blcr-0.8.4/tests/nscd.c	2011-08-03 20:18:18.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+ * Berkeley Lab Checkpoint/Restart (BLCR) for Linux is Copyright (c)
+ * 2009, The Regents of the University of California, through Lawrence
+ * Berkeley National Laboratory (subject to receipt of any required
+ * approvals from the U.S. Dept. of Energy).  All rights reserved.
+ *
+ * Portions may be copyrighted by others, as may be noted in specific
+ * copyright notices within specific files.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: nscd.c,v 1.3.6.2 2011/08/03 20:18:18 eroman Exp $
+ *
+ * Test to trigger NCSD problems if they exists
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <grp.h>
+#include <netdb.h>
+
+#include "crut.h"
+
+static int
+nscd_check(void *p)
+{
+    int rc = 0;
+
+    /* Series of calls to trigger use of NSCD if possible */
+
+    (void) gethostbyname("www.google.com");
+
+    if (! getpwuid(0)) {
+	CRUT_FAIL("Lookup of uid 0 failed");
+	rc = -1;
+    }
+
+    if (! getgrgid(0)) {
+	CRUT_FAIL("Lookup of gid 0 failed");
+	rc = -1;
+    }
+
+    return rc;
+}
+     
+static int
+nscd_setup(void **testdata)
+{
+    *testdata = NULL;
+    return nscd_check(NULL);
+}
+
+int
+main(int argc, char *argv[])
+{
+    struct crut_operations nscd_test_ops = {
+	test_scope:CR_SCOPE_PROC,
+	test_name:"nscd",
+        test_description:"Test to trigger nscd problems if any.",
+	test_setup:nscd_setup,
+	test_precheckpoint:nscd_check,
+	test_continue:nscd_check,
+	test_restart:nscd_check,
+	test_teardown:NULL,
+    };
+
+    /* add the basic tests */
+    crut_add_test(&nscd_test_ops);
+
+    return crut_main(argc, argv);
+
+}
diff -Nru blcr-0.8.2/tests/pipe.c blcr-0.8.4/tests/pipe.c
--- blcr-0.8.2/tests/pipe.c	2008-11-30 04:36:56.000000000 +0000
+++ blcr-0.8.4/tests/pipe.c	2011-10-03 00:36:51.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: pipe.c,v 1.15 2008/11/30 04:36:56 phargrov Exp $
+ * $Id: pipe.c,v 1.15.8.4 2011/10/03 00:36:51 phargrov Exp $
  *
  * Simple tests of pipe save and restore.
  */
@@ -38,9 +38,31 @@
 
 #include <linux/limits.h>
 
+#include "blcr_config.h"
 #include "crut.h"
 #include "crut_util.h"
 
+/* should we try to run the pipe resize test?  We only try if the kernel
+ * has the pipe_fcntl() call, and if we pulled the right definitions.  */
+#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ)
+    #define TEST_PIPE_FCNTL 1
+#elif defined(HAVE_PIPE_FCNTL) && HAVE_PIPE_FCNTL
+    #if !defined(F_SETPIPE_SZ) && defined(CR_F_SETPIPE_SZ)
+        #define F_SETPIPE_SZ CR_F_SETPIPE_SZ
+    #endif
+    #if !defined(F_GETPIPE_SZ) && defined(CR_F_GETPIPE_SZ)
+        #define F_GETPIPE_SZ CR_F_GETPIPE_SZ
+    #endif
+    #if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ) 
+        #define TEST_PIPE_FCNTL 1
+    #else
+        #warning "Found pipe_fcntl in kernel, but could not find F_SETPIPE_SZ."
+        #define TEST_PIPE_FCNTL 0
+    #endif
+#else
+    #define TEST_PIPE_FCNTL 0
+#endif
+
 #define PIPE_LARGE_MIN 1048576
 
 #define LARGE_BUF_SIZE 4*PIPE_BUF
@@ -51,6 +73,13 @@
 
 #define TEST_BLOCKING 0
 #define TEST_NONBLOCKING 1
+#define TEST_SETSIZE 2
+
+#if TEST_PIPE_FCNTL
+#define SETPIPE_SZ_SIZE 1048576L
+int have_pipe_fcntl = 1;
+long test_pipe_size;
+#endif
 
 int barrier = -1;
 
@@ -294,14 +323,35 @@
 }
 
 static int
-pipes_pre(int nonblock)
+pipes_pre(int test_to_run)
 {
     int retval;
 
-    if (nonblock == TEST_NONBLOCKING) {
+    if (test_to_run == TEST_NONBLOCKING) {
         CRUT_DEBUG("Setting nonblocking flag");
         fcntl(pipe_array[0].pipe_fd, F_SETFL, O_NONBLOCK);
     }
+
+#if TEST_PIPE_FCNTL
+    if (test_to_run == TEST_SETSIZE) {
+        long pipe_size = 0;
+
+        pipe_size = fcntl(pipe_array[0].pipe_fd, F_GETPIPE_SZ, 0);
+        CRUT_DEBUG("before: F_GETPIPE_SZ = %ld", pipe_size);
+	if (pipe_size < 0) {
+	    /* disable test if this first call failed */
+	    have_pipe_fcntl = 0;
+	    return 0;
+	}
+
+        CRUT_DEBUG("Resizing the pipe buffer");
+        fcntl(pipe_array[0].pipe_fd, F_SETPIPE_SZ, SETPIPE_SZ_SIZE);
+
+        /* Use queried size, even if the F_SETPIPE_SZ had failed */
+        test_pipe_size = fcntl(pipe_array[0].pipe_fd, F_GETPIPE_SZ, 0);
+        CRUT_DEBUG("after: F_GETPIPE_SZ = %ld", test_pipe_size);
+    }
+#endif
     
     retval = write_pipe_small(&pipe_array[1]);
 
@@ -780,6 +830,32 @@
     return pipe_test();
 }
 
+#if TEST_PIPE_FCNTL
+static int
+pipe_setsize_pre(void *p)
+{
+    return pipes_pre(TEST_SETSIZE);
+}
+
+static int
+pipe_setsize_restart(void *p)
+{
+    long pipe_size;
+
+    if (!have_pipe_fcntl) return 0; /* Nothing to test */
+
+    CRUT_DEBUG("Checking value of F_GETPIPE_SZ.");
+    pipe_size = fcntl(pipe_array[0].pipe_fd, F_GETPIPE_SZ, 0);
+
+    if (pipe_size != test_pipe_size) {
+        CRUT_FAIL("F_GETPIPE_SZ returned %ld instead of %ld", pipe_size, 
+                  test_pipe_size);
+    }
+
+    return pipe_test();
+}
+#endif
+
 
 static int
 pipe_nonblock_pre(void *p)
@@ -867,6 +943,19 @@
 	test_teardown:pipe_teardown,
     };
 
+#if TEST_PIPE_FCNTL
+    struct crut_operations pipe_setpipe_sz_ops = {
+	test_scope:CR_SCOPE_PROC,
+	test_name:"pipe_setsize",
+        test_description:"Test whether fcntl(pipe, F_SETPIPE_SZ, ...) is honored across a restart.",
+	test_setup:pipe_one_setup,
+	test_precheckpoint:pipe_setsize_pre,
+	test_continue:pipe_setsize_restart,
+	test_restart:pipe_setsize_restart,
+	test_teardown:pipe_teardown,
+    };
+#endif
+
     struct crut_operations pipe_nonblock_ops = {
 	test_scope:CR_SCOPE_PROC,
 	test_name:"pipe_nonblock",
@@ -914,6 +1003,11 @@
     /* add the basic tests */
     crut_add_test(&pipe_test_ops);
 
+#if TEST_PIPE_FCNTL
+    /* add the basic tests */
+    crut_add_test(&pipe_setpipe_sz_ops);
+#endif
+
     /* add the non-blocking pipe test */
     crut_add_test(&pipe_nonblock_ops);
 
diff -Nru blcr-0.8.2/tests/prctl.c blcr-0.8.4/tests/prctl.c
--- blcr-0.8.2/tests/prctl.c	2009-02-07 00:00:17.000000000 +0000
+++ blcr-0.8.4/tests/prctl.c	2011-10-04 21:07:21.000000000 +0000
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: prctl.c,v 1.6.8.1 2009/02/07 00:00:17 phargrov Exp $
+ * $Id: prctl.c,v 1.6.8.4 2011/10/04 21:07:21 phargrov Exp $
  *
  * Simple tests of prctl()
  */
@@ -48,6 +48,7 @@
 enum {
 	my_type_int_ptr,	// 2nd arg is int for set, but addr for get
 	my_type_int,		// 2nd arg is int for set, and get is returned
+	my_type_bool,		// like type_int except set must be 0 or 1
 	my_type_comm		// 2nd arg is buffer for string in and out
 };
 
@@ -73,13 +74,13 @@
 #endif
 #if defined(PR_GET_DUMPABLE)
 	/* Can't write anything but 1, or checkpoint will fail */
-	{"PR_GET_DUMPABLE", my_type_int, PR_GET_DUMPABLE, PR_SET_DUMPABLE, 1, 1, },
+	{"PR_GET_DUMPABLE", my_type_bool, PR_GET_DUMPABLE, PR_SET_DUMPABLE, 1, 1, },
 #endif
 #if defined(PR_GET_UNALIGN)
 	{"PR_GET_UNALIGN", my_type_int_ptr, PR_GET_UNALIGN, PR_SET_UNALIGN, 0, PR_UNALIGN_NOPRINT, },
 #endif
 #if defined(PR_GET_KEEPCAPS)
-	{"PR_GET_KEEPCAPS", my_type_int, PR_GET_KEEPCAPS, PR_SET_KEEPCAPS, 0, 1, },
+	{"PR_GET_KEEPCAPS", my_type_bool, PR_GET_KEEPCAPS, PR_SET_KEEPCAPS, 0, 1, },
 #endif
 #if defined(PR_GET_FPEMU)
 	{"PR_GET_FPEMU", my_type_int_ptr, PR_GET_FPEMU, PR_SET_FPEMU, 0, 1, },
@@ -134,17 +135,20 @@
       break;
     }
   
+    case my_type_bool:
     case my_type_int: {
       int val;
       elem->value.i = -1;
       result = prctl(elem->read, 0UL);
       if (result < 0) break;
+      if ((elem->type == my_type_bool) && (result > 0)) result = 1;
       CRUT_DEBUG("Read %s=%d", elem->name, result);
       val = (result == elem->arg2a) ? elem->arg2b : elem->arg2a;
       result = prctl(elem->write, val);
       if (result < 0) break;
       val = prctl(elem->read, 0UL); /* Read back again */
-      if (result < 0) break;
+      if (val < 0) break;
+      if ((elem->type == my_type_bool) && (val > 0)) val = 1;
       CRUT_DEBUG("Wrote %s=%d", elem->name, val);
       elem->value.i = val;
       break;
@@ -192,9 +196,11 @@
       break;
     }
 
+    case my_type_bool:
     case my_type_int: {
       if (elem->value.i == -1) break;
       result = prctl(elem->read, 0UL);
+      if ((elem->type == my_type_bool) && (result > 0)) result = 1;
       if (result != elem->value.i) {
 	  CRUT_FAIL("Param %s changed from %d to %d\n",
 		    elem->name, elem->value.i, result);
diff -Nru blcr-0.8.2/tests/RUN_ME.in blcr-0.8.4/tests/RUN_ME.in
--- blcr-0.8.2/tests/RUN_ME.in	2008-05-23 05:25:02.000000000 +0000
+++ blcr-0.8.4/tests/RUN_ME.in	2011-08-03 19:24:29.000000000 +0000
@@ -48,6 +48,7 @@
 tmp_dir=`mktemp -d "${TMPDIR:-/tmp}/blcrtests.XXXXXXXXXX"` || exit 1
 cd $tmp_dir
 #
+export LIBCR_DISABLE_NSCD=1
 top_srcdir="INVALID"; export top_srcdir
 cr_checkpoint="%bindir%/cr_checkpoint"; export cr_checkpoint
 cr_restart="%bindir%/cr_restart"; export cr_restart
diff -Nru blcr-0.8.2/util/cr_checkpoint/Makefile.in blcr-0.8.4/util/cr_checkpoint/Makefile.in
--- blcr-0.8.2/util/cr_checkpoint/Makefile.in	2009-06-17 03:56:48.000000000 +0000
+++ blcr-0.8.4/util/cr_checkpoint/Makefile.in	2011-10-11 22:58:55.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = cr_checkpoint.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -36,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = cr_checkpoint$(EXEEXT)
 @CR_INSTALLED_LIBCR_TRUE@cr_checkpoint_DEPENDENCIES =
@@ -46,7 +45,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
@@ -58,14 +57,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cr_checkpoint.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = cr_checkpoint.c
 DIST_SOURCES = cr_checkpoint.c
@@ -138,6 +136,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -219,6 +218,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -238,6 +238,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -350,7 +352,8 @@
 	  f=`echo "$$p" | \
 	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
 	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
 		 && test -n "`cat c$${pid}_.out`" \
 		 && test -z "`cat c$${pid}_.err`"; then :; \
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
@@ -372,24 +375,21 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -467,9 +467,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -547,7 +549,7 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/util/cr_info/Makefile.in blcr-0.8.4/util/cr_info/Makefile.in
--- blcr-0.8.2/util/cr_info/Makefile.in	2009-06-17 03:56:48.000000000 +0000
+++ blcr-0.8.4/util/cr_info/Makefile.in	2011-10-11 22:58:55.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = util/cr_info
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -42,7 +43,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
@@ -114,6 +115,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -195,6 +197,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -214,6 +217,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -305,7 +310,8 @@
 	  esac; \
 	  f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
 	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
 		 && test -n "`cat c$${pid}_.out`" \
 		 && test -z "`cat c$${pid}_.err`"; then :; \
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
@@ -382,7 +388,7 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -439,8 +445,8 @@
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binSCRIPTS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am \
+	install-exec-am install-exec-hook install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
 	installcheck-binSCRIPTS installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
diff -Nru blcr-0.8.2/util/cr_restart/Makefile.in blcr-0.8.4/util/cr_restart/Makefile.in
--- blcr-0.8.2/util/cr_restart/Makefile.in	2009-06-17 03:56:48.000000000 +0000
+++ blcr-0.8.4/util/cr_restart/Makefile.in	2011-10-11 22:58:55.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = cr_restart.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -36,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = cr_restart$(EXEEXT)
 @CR_INSTALLED_LIBCR_TRUE@cr_restart_DEPENDENCIES =
@@ -46,7 +45,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
@@ -58,14 +57,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cr_restart.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = cr_restart.c
 DIST_SOURCES = cr_restart.c
@@ -138,6 +136,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -219,6 +218,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -238,6 +238,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -350,7 +352,8 @@
 	  f=`echo "$$p" | \
 	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
 	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
 		 && test -n "`cat c$${pid}_.out`" \
 		 && test -z "`cat c$${pid}_.err`"; then :; \
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
@@ -372,24 +375,21 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -467,9 +467,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -547,7 +549,7 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/util/cr_run/Makefile.in blcr-0.8.4/util/cr_run/Makefile.in
--- blcr-0.8.2/util/cr_run/Makefile.in	2009-06-17 03:56:48.000000000 +0000
+++ blcr-0.8.4/util/cr_run/Makefile.in	2011-10-11 22:58:55.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = util/cr_run
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -42,7 +43,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
@@ -117,6 +118,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -198,6 +200,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -217,6 +220,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -308,7 +313,8 @@
 	  esac; \
 	  f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
 	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
 		 && test -n "`cat c$${pid}_.out`" \
 		 && test -z "`cat c$${pid}_.err`"; then :; \
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
@@ -430,7 +436,7 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -489,13 +495,13 @@
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binSCRIPTS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-man1 install-strip installcheck installcheck-am \
-	installcheck-binSCRIPTS installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-binSCRIPTS uninstall-info-am uninstall-man \
-	uninstall-man1
+	install-exec-am install-exec-hook install-info install-info-am \
+	install-man install-man1 install-strip installcheck \
+	installcheck-am installcheck-binSCRIPTS installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \
+	uninstall-man uninstall-man1
 
 cr_run: cr_run.in Makefile
 	@PERL@ -pe 's|\@top_builddir\@|@TOP_BUILDDIR@|g;\
diff -Nru blcr-0.8.2/util/Makefile.in blcr-0.8.4/util/Makefile.in
--- blcr-0.8.2/util/Makefile.in	2009-06-17 03:56:48.000000000 +0000
+++ blcr-0.8.4/util/Makefile.in	2011-10-11 22:58:55.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = util
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -41,7 +42,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -119,6 +120,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -200,6 +202,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -219,6 +222,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -303,7 +308,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -315,7 +326,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -323,7 +334,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -344,7 +361,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -369,14 +386,16 @@
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -386,9 +405,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -442,12 +463,14 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -476,7 +499,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/vmadump4/Makefile.in blcr-0.8.4/vmadump4/Makefile.in
--- blcr-0.8.2/vmadump4/Makefile.in	2009-06-17 03:56:49.000000000 +0000
+++ blcr-0.8.4/vmadump4/Makefile.in	2011-10-11 22:58:55.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +17,6 @@
 # Note: build is done via cr_module/kbuild/Makefile.in
 
 
-SOURCES = vmadcheck.c vmadlib.c vmadstress.c vmadtest.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -39,6 +37,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 libexec_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
 check_PROGRAMS = vmadtest$(EXEEXT) vmadstress$(EXEEXT)
@@ -50,7 +49,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/blcr_config.h
 CONFIG_CLEAN_FILES =
 @BUILD_CR_INFO_TRUE@am__EXEEXT_1 = vmadcheck$(EXEEXT)
@@ -73,16 +72,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/./config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/vmadcheck.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/vmadlib.Po ./$(DEPDIR)/vmadstress.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/vmadtest.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = vmadcheck.c vmadlib.c vmadstress.c vmadtest.c
 DIST_SOURCES = vmadcheck.c vmadlib.c vmadstress.c vmadtest.c
@@ -153,6 +149,7 @@
 CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@
 CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@
 CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@
+CR_KARCH = @CR_KARCH@
 CR_KERNEL = @CR_KERNEL@
 CR_KERNEL_BASE = @CR_KERNEL_BASE@
 CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@
@@ -234,6 +231,7 @@
 PWD_PROG = @PWD_PROG@
 RANLIB = @RANLIB@
 RPMBUILD = @RPMBUILD@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -253,6 +251,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -377,7 +377,8 @@
 	  f=`echo "$$p" | \
 	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
 	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(libexecdir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
+	    if "$(DESTDIR)$(libexecdir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
 		 && test -n "`cat c$${pid}_.out`" \
 		 && test -z "`cat c$${pid}_.err`"; then :; \
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
@@ -411,24 +412,21 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -461,9 +459,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -541,7 +541,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff -Nru blcr-0.8.2/vmadump4/vmadump_alpha.c blcr-0.8.4/vmadump4/vmadump_alpha.c
--- blcr-0.8.2/vmadump4/vmadump_alpha.c	2008-06-03 04:12:38.000000000 +0000
+++ blcr-0.8.4/vmadump4/vmadump_alpha.c	2010-08-12 21:58:35.000000000 +0000
@@ -17,11 +17,13 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: vmadump_alpha.c,v 1.6 2008/06/03 04:12:38 phargrov Exp $
+ * $Id: vmadump_alpha.c,v 1.6.16.1 2010/08/12 21:58:35 phargrov Exp $
  *-----------------------------------------------------------------------*/
 #define __NO_VERSION__
 
+#ifdef CR_NEED_AUTOCONF_H
 #include <linux/autoconf.h>
+#endif
 #if defined(CONFIG_SMP) && ! defined(__SMP__)
 #define __SMP__
 #endif
diff -Nru blcr-0.8.2/vmadump4/vmadump_arm.c blcr-0.8.4/vmadump4/vmadump_arm.c
--- blcr-0.8.2/vmadump4/vmadump_arm.c	2008-06-04 22:19:15.000000000 +0000
+++ blcr-0.8.4/vmadump4/vmadump_arm.c	2011-08-24 04:08:25.000000000 +0000
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: vmadump_arm.c,v 1.8 2008/06/04 22:19:15 phargrov Exp $
+ * $Id: vmadump_arm.c,v 1.8.16.1 2011/08/24 04:08:25 phargrov Exp $
  *
  *  Experimental ARM support contributed by Anton V. Uzunov
  *  <anton.uzunov@dsto.defence.gov.au> of the Australian Government
@@ -162,6 +162,60 @@
   return( r );
 }
 
+#if defined(ARCH_HAS_SETUP_ADDITIONAL_PAGES)
+
+int vmad_is_arch_map(const struct vm_area_struct *map)
+{
+	return (map->vm_start == 0xffff0000);
+}
+EXPORT_SYMBOL_GPL(vmad_is_arch_map);
+
+loff_t vmad_store_arch_map(cr_chkpt_proc_req_t *ctx, struct file *file,
+			   struct vm_area_struct *map, int flags)
+{
+    loff_t r = 0;
+
+    if (vmad_is_arch_map(map)) {
+	/* Just write out a section header */
+        struct vmadump_vma_header head;
+	head.start   = map->vm_start;
+	head.end     = map->vm_end;
+	head.flags   = map->vm_flags;
+	head.namelen = VMAD_NAMELEN_ARCH;
+	head.offset  = 0;
+
+	r = write_kern(ctx, file, &head, sizeof(head));
+	if (r < 0) return r;
+	if (r != sizeof(head)) r = -EIO;
+    }
+
+    return r;
+}
+
+int vmad_load_arch_map(cr_rstrt_proc_req_t *ctx, struct file *file,
+		       struct vmadump_vma_header *head)
+{
+    long r;
+
+  #if HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES
+    r = arch_setup_additional_pages(NULL, 0);
+  #elif HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES
+    r = arch_setup_additional_pages(NULL, 0, 0, 0);
+  #else
+    #error "Unknown calling convention to map the vectors page"
+  #endif
+    if (r < 0) {
+	CR_ERR_CTX(ctx, "arch_setup_additional_pages failed %d", (int)r);
+	goto err;
+    }
+
+    r = 0;
+err:
+    return r;
+}
+
+#endif // defined(ARCH_HAS_SETUP_ADDITIONAL_PAGES)
+
 /*
  * Local variables:
  * c-basic-offset: 2
diff -Nru blcr-0.8.2/vmadump4/vmadump_common.c blcr-0.8.4/vmadump4/vmadump_common.c
--- blcr-0.8.2/vmadump4/vmadump_common.c	2008-12-17 03:29:10.000000000 +0000
+++ blcr-0.8.4/vmadump4/vmadump_common.c	2011-10-04 21:07:22.000000000 +0000
@@ -17,13 +17,14 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: vmadump_common.c,v 1.86 2008/12/17 03:29:10 phargrov Exp $
+ * $Id: vmadump_common.c,v 1.86.4.8 2011/10/04 21:07:22 phargrov Exp $
  *
  * THIS VERSION MODIFIED FOR BLCR <http://ftg.lbl.gov/checkpoint>
  *-----------------------------------------------------------------------*/
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/version.h>
+#include "blcr_config.h"
 
 #include <linux/sched.h>
 
@@ -32,14 +33,13 @@
 #include <linux/mm.h>
 #include <linux/mman.h>
 #include <linux/binfmts.h>
-#include <linux/smp_lock.h>
+#if !HAVE_FILE_F_LOCK
+  #include <linux/smp_lock.h>
+#endif
 #include <linux/unistd.h>
 #include <linux/personality.h>
 #include <linux/highmem.h>
 #include <linux/ptrace.h>
-#ifdef HAVE_LINUX_SYSCALLS_H
-  #include <linux/syscalls.h>	/* for mprotect, etc. */
-#endif
 #include <linux/init.h>
 #include <linux/prctl.h>
 #include <asm/pgtable.h>
@@ -549,6 +549,7 @@
     /*
      * This was basically ripped out of setfl() in 2.6.22, with some #if's
      * added based on 2.6.1->2 and 2.6.7->8 changes to that function.
+     * And for 2.6.29->30 changes (file.f_lock)
      *
      * The alternative is to call sys_fcntl() directly.  This is a good idea.
      * But right now I'm not in the mood to walk the fd array to identify the
@@ -579,6 +580,11 @@
     /* OK */
   #endif
 
+  #if HAVE_FILE_F_LOCK
+    spin_lock(&filp->f_lock);
+    filp->f_flags |= O_DIRECT;
+    spin_unlock(&filp->f_lock);
+  #else
     /* The lock_kernel() does appear necessary here because both
      * setfl() and ioctl() use it when modifying f_flags.  So, to
      * prevent corruption of f_flags, we take the lock too.
@@ -588,6 +594,7 @@
     lock_kernel();
     filp->f_flags |= O_DIRECT;
     unlock_kernel();
+  #endif
 
 out:
     return saved_flags;
@@ -596,9 +603,15 @@
 static
 void directio_stop(struct file *filp, unsigned int saved_flags)
 {
+  #if HAVE_FILE_F_LOCK
+    spin_lock(&filp->f_lock);
+    filp->f_flags = saved_flags;
+    spin_unlock(&filp->f_lock);
+  #else
     lock_kernel();
     filp->f_flags = saved_flags;
     unlock_kernel();
+  #endif
 }
 
 /* sys_prctl "by value" */
@@ -628,6 +641,45 @@
 /*--------------------------------------------------------------------
  *  Process "thawing" routines.
  *------------------------------------------------------------------*/
+long vmad_remap(cr_rstrt_proc_req_t *ctx, unsigned long from_addr,
+                unsigned long to_addr, long len) {
+    long r;
+    unsigned long new_addr;
+    long diff = (from_addr > to_addr) ? (from_addr - to_addr)
+                                      : (to_addr - from_addr);
+    if (diff < len) { /* Check for overlap case */
+        unsigned long tmp_addr;
+        /*CR_WARN_CTX(ctx, "vmad_remap using temporary");*/
+
+        tmp_addr = do_mmap(NULL, 0, len, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS, 0);
+        r = (tmp_addr & (PAGE_SIZE-1));
+        if  (r) {
+            CR_ERR_CTX(ctx, "vmad_remap failed to allocate temporary %d", (int)r);
+            goto err;
+        }
+
+        new_addr = sys_mremap(from_addr, len, len, MREMAP_FIXED|MREMAP_MAYMOVE, tmp_addr);
+        if  (new_addr != tmp_addr) {
+            r = (new_addr & (PAGE_SIZE-1)) ? new_addr : -ENOMEM;
+            CR_ERR_CTX(ctx, "vmad_remap failed to use temporary %d", (int)r);
+            goto err;
+        }
+
+        from_addr = tmp_addr;
+    }
+
+    new_addr = sys_mremap(from_addr, len, len, MREMAP_FIXED|MREMAP_MAYMOVE, to_addr);
+    if (new_addr != to_addr) {
+        r = (new_addr & (PAGE_SIZE-1)) ? new_addr : -ENOMEM;
+        CR_ERR_CTX(ctx, "vmad_remap failed %d", (int)r);
+        goto err;
+    }
+
+    r = 0;
+err:
+    return r;
+}
+
 static
 int mmap_file(cr_rstrt_proc_req_t *ctx,
 	      const struct vmadump_vma_header *head, char *filename,
@@ -851,7 +903,13 @@
 	if (addr != head->start) {
 	    CR_ERR_CTX(ctx, "do_mmap(0, %08lx, %08lx, ...) = 0x%08lx (failed)",
 		   head->start, head->end - head->start, addr);
-	    return -EINVAL;
+            if ((addr != head->start) && IS_ERR((void *) addr)) {
+                r = PTR_ERR((void *) addr);
+            } else {
+                r = -EINVAL;
+            }
+
+	    return r;
 	}
     }
 
@@ -919,6 +977,7 @@
 enum vmad_prctl_type {
    vmad_prctl_int_ref,  /* integer read by reference, written by value*/
    vmad_prctl_int_val,  /* integer read and written by value */
+   vmad_prctl_bool,     /* integer read and written by value, write must be 0 or 1 */
    vmad_prctl_comm,     /* string of length TASK_COMM_LEN, set by reference */
 };
 
@@ -936,6 +995,7 @@
     if (r != sizeof(header)) goto bad_read;
     while (header.option) { /* option==0 is end of the list */
         switch (header.type) {
+        case vmad_prctl_bool:
         case vmad_prctl_int_val:
         case vmad_prctl_int_ref: {
             unsigned int value;
@@ -1089,7 +1149,7 @@
 
     r = vmadump_load_sigpending(ctx, file, &current->pending, 0);
     if (r < 0) goto bad_read;
-    if ((atomic_read(&current->signal->count) == 1) || !(flags & VMAD_DUMP_REGSONLY)) {
+    if (!(flags & VMAD_DUMP_REGSONLY)) {
 	/* Restore shared queue if not actually shared, or if we are the "leader" */
 	r = vmadump_load_sigpending(ctx, file, &current->signal->shared_pending, 1);
 	if (r < 0) goto bad_read;
@@ -1833,13 +1893,13 @@
         {vmad_prctl_int_ref, PR_GET_PDEATHSIG, PR_SET_PDEATHSIG},
     #endif
     #if defined(PR_GET_DUMPABLE)
-        {vmad_prctl_int_val, PR_GET_DUMPABLE, PR_SET_DUMPABLE},
+        {vmad_prctl_bool, PR_GET_DUMPABLE, PR_SET_DUMPABLE},
     #endif
     #if defined(PR_GET_UNALIGN) && defined(GET_UNALIGN_CTL)
         {vmad_prctl_int_ref, PR_GET_UNALIGN, PR_SET_UNALIGN},
     #endif
     #if defined(PR_GET_KEEPCAPS)
-        {vmad_prctl_int_val, PR_GET_KEEPCAPS, PR_SET_KEEPCAPS},
+        {vmad_prctl_bool, PR_GET_KEEPCAPS, PR_SET_KEEPCAPS},
     #endif
     #if defined(PR_GET_FPEMU) && defined(GET_FPEMU_CTL)
         {vmad_prctl_int_ref, PR_GET_FPEMU, PR_SET_FPEMU},
@@ -1898,7 +1958,15 @@
         const int get = vmad_prctl_tbl[i].get_option;
         const int set = vmad_prctl_tbl[i].set_option;
 
-        switch (vmad_prctl_tbl[i].type) {
+        switch (type) {
+        case vmad_prctl_bool:
+            r = vmadump_prctl_v(get, 0);
+            if (!IS_ERR((void *)r)) { /* ICK */
+                value = r ? 1 : 0;
+                r = 0;
+            }
+            break;
+
         case vmad_prctl_int_val:
             r = vmadump_prctl_v(get, 0);
             if (!IS_ERR((void *)r)) { /* ICK */
@@ -1996,7 +2064,7 @@
     r = vmadump_store_sigpending(ctx, file, &current->pending);
     if (r < 0) goto err;
     bytes += r;
-    if ((atomic_read(&current->signal->count) == 1) || !(flags & VMAD_DUMP_REGSONLY)) {
+    if (!(flags & VMAD_DUMP_REGSONLY)) {
 	/* Dump shared queue if not actually shared, or if we are the "leader" */
 	r = vmadump_store_sigpending(ctx, file, &current->signal->shared_pending);
 	if (r < 0) goto err;
diff -Nru blcr-0.8.2/vmadump4/vmadump.h blcr-0.8.4/vmadump4/vmadump.h
--- blcr-0.8.2/vmadump4/vmadump.h	2008-12-15 22:55:24.000000000 +0000
+++ blcr-0.8.4/vmadump4/vmadump.h	2011-09-16 00:26:08.000000000 +0000
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: vmadump.h,v 1.47 2008/12/15 22:55:24 phargrov Exp $
+ * $Id: vmadump.h,v 1.47.4.1 2011/09/16 00:26:08 phargrov Exp $
  *
  *  THIS VERSION MODIFIED FOR BLCR <http://ftg.lbl.gov/checkpoint>
  *-----------------------------------------------------------------------*/
@@ -194,6 +194,9 @@
 extern long vmadump_thaw_proc  (cr_rstrt_proc_req_t *, struct file *file,
 				struct pt_regs *regs, int flags);
 
+extern long vmad_remap(cr_rstrt_proc_req_t *ctx, unsigned long from_addr,
+		       unsigned long to_addr, long len);
+
 #if 0 /* Neither used nor maintened in BLCR */
 extern long do_vmadump         (long op, long arg0, long arg1, struct pt_regs *regs);
 #endif
diff -Nru blcr-0.8.2/vmadump4/vmadump_i386.c blcr-0.8.4/vmadump4/vmadump_i386.c
--- blcr-0.8.2/vmadump4/vmadump_i386.c	2008-12-06 00:50:28.000000000 +0000
+++ blcr-0.8.4/vmadump4/vmadump_i386.c	2011-09-16 00:26:08.000000000 +0000
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: vmadump_i386.c,v 1.38 2008/12/06 00:50:28 phargrov Exp $
+ * $Id: vmadump_i386.c,v 1.38.8.2 2011/09/16 00:26:08 phargrov Exp $
  *
  * THIS VERSION MODIFIED FOR BLCR <http://ftg.lbl.gov/checkpoint>
  *-----------------------------------------------------------------------*/
@@ -190,7 +190,7 @@
 
     /* XXX FIX ME: RESTORE DEBUG INFORMATION ?? */
     /* Here we read it but ignore it. */
-    r = vmadump_restore_debugreg(ctx, file, threadtmp);
+    r = vmadump_restore_debugreg(ctx, file);
     if (r < 0) goto bad_read;
 
     /* Restore TLS information */
@@ -367,20 +367,16 @@
      */
     if (vmad_vdso_base == (void *)(~0UL)) {
 	/* The call above didn't overwrite mm->context.vdso.
-	 * Since no failure was indicatated we just fill it in.
+	 * Since no failure was indicatated we just fill it in below.
 	 */
-	vmad_vdso_base = (void *)head->start;
     } else if (vmad_vdso_base != (void *)head->start) {
-	long len = head->end - head->start;
-	unsigned long old_addr = (unsigned long)vmad_vdso_base;
-	unsigned long new_addr = sys_mremap(old_addr, len, len, MREMAP_FIXED|MREMAP_MAYMOVE, head->start);
-	if (new_addr != head->start) {
-		    r = (new_addr & (PAGE_SIZE-1)) ? new_addr : -ENOMEM;
-		    CR_ERR_CTX(ctx, "vdso remap failed %d", (int)r);
-		    goto err;
+	r = vmad_remap(ctx, (unsigned long)vmad_vdso_base, head->start, head->end - head->start);
+	if (r) {
+	    CR_ERR_CTX(ctx, "vdso remap failed %d", (int)r);
+	    goto err;
 	}
-	vmad_vdso_base = (void *)new_addr;
     }
+    vmad_vdso_base = (void *)head->start;
   #else
     /* VSYSCALL_BASE is a fixed location */
   #endif
diff -Nru blcr-0.8.2/vmadump4/vmadump_ppc64.c blcr-0.8.4/vmadump4/vmadump_ppc64.c
--- blcr-0.8.2/vmadump4/vmadump_ppc64.c	2008-08-02 02:19:05.000000000 +0000
+++ blcr-0.8.4/vmadump4/vmadump_ppc64.c	2011-09-16 00:26:08.000000000 +0000
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: vmadump_ppc64.c,v 1.9 2008/08/02 02:19:05 phargrov Exp $
+ * $Id: vmadump_ppc64.c,v 1.9.14.1 2011/09/16 00:26:08 phargrov Exp $
  *
  * THIS VERSION MODIFIED FOR BLCR <http://ftg.lbl.gov/checkpoint>
  *-----------------------------------------------------------------------*/
@@ -195,15 +195,12 @@
      * Here we check this new value against against the desired location (in head->start).
      */
     if (head->start != vmad_vdso_base) {
-	long len = head->end - head->start;
-	unsigned long old_addr = vmad_vdso_base;
-	unsigned long new_addr = sys_mremap(old_addr, len, len, MREMAP_FIXED|MREMAP_MAYMOVE, head->start);
-	if (new_addr != head->start) {
-		r = (new_addr & (PAGE_SIZE-1)) ? new_addr : -ENOMEM;
-		CR_ERR_CTX(ctx, "vdso remap failed %d", (int)r);
-		goto err;
+	r = vmad_remap(ctx, (unsigned long)vmad_vdso_base, head->start, head->end - head->start);
+	if (r) {
+	    CR_ERR_CTX(ctx, "vdso remap failed %d", (int)r);
+	    goto err;
 	}
-	vmad_vdso_base = new_addr;
+	vmad_vdso_base = head->start;
     }
 
     r = 0;
diff -Nru blcr-0.8.2/vmadump4/vmadump_ppc.c blcr-0.8.4/vmadump4/vmadump_ppc.c
--- blcr-0.8.2/vmadump4/vmadump_ppc.c	2008-08-02 02:19:05.000000000 +0000
+++ blcr-0.8.4/vmadump4/vmadump_ppc.c	2011-09-16 00:26:08.000000000 +0000
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: vmadump_ppc.c,v 1.10 2008/08/02 02:19:05 phargrov Exp $
+ * $Id: vmadump_ppc.c,v 1.10.14.1 2011/09/16 00:26:08 phargrov Exp $
  *
  * THIS VERSION MODIFIED FOR BLCR <http://ftg.lbl.gov/checkpoint>
  *-----------------------------------------------------------------------*/
@@ -188,15 +188,12 @@
      * Here we check this new value against against the desired location (in head->start).
      */
     if (head->start != vmad_vdso_base) {
-	long len = head->end - head->start;
-	unsigned long old_addr = vmad_vdso_base;
-	unsigned long new_addr = sys_mremap(old_addr, len, len, MREMAP_FIXED|MREMAP_MAYMOVE, head->start);
-	if (new_addr != head->start) {
-		r = (new_addr & (PAGE_SIZE-1)) ? new_addr : -ENOMEM;
-		CR_ERR_CTX(ctx, "vdso remap failed %d", (int)r);
-		goto err;
+	r = vmad_remap(ctx, (unsigned long)vmad_vdso_base, head->start, head->end - head->start);
+	if (r) {
+	    CR_ERR_CTX(ctx, "vdso remap failed %d", (int)r);
+	    goto err;
 	}
-	vmad_vdso_base = new_addr;
+	vmad_vdso_base = head->start;
     }
 
     r = 0;
diff -Nru blcr-0.8.2/vmadump4/vmadump_x86_64.c blcr-0.8.4/vmadump4/vmadump_x86_64.c
--- blcr-0.8.2/vmadump4/vmadump_x86_64.c	2009-06-12 20:37:06.000000000 +0000
+++ blcr-0.8.4/vmadump4/vmadump_x86_64.c	2011-09-16 00:26:08.000000000 +0000
@@ -17,11 +17,13 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: vmadump_x86_64.c,v 1.50.8.1 2009/06/12 20:37:06 phargrov Exp $
+ * $Id: vmadump_x86_64.c,v 1.50.8.4 2011/09/16 00:26:08 phargrov Exp $
  *
  * THIS VERSION MODIFIED FOR BLCR <http://ftg.lbl.gov/checkpoint>
  *-----------------------------------------------------------------------*/
+#ifdef CR_NEED_AUTOCONF_H
 #include <linux/autoconf.h>
+#endif
 #if defined(CONFIG_SMP) && ! defined(__SMP__)
 #define __SMP__
 #endif
@@ -202,7 +204,7 @@
 	
     /* XXX FIX ME: RESTORE DEBUG INFORMATION ?? */
     /* Here we read it but ignore it. */
-    r = vmadump_restore_debugreg(ctx, file, threadtmp);
+    r = vmadump_restore_debugreg(ctx, file);
     if (r < 0) goto bad_read;
 
     /* user(r)sp, since we don't use the ptrace entry path in BLCR */
@@ -340,7 +342,18 @@
 
 int vmad_is_arch_map(const struct vm_area_struct *map)
 {
-	return (map->vm_start == (unsigned long)vmad_vdso_base);
+    unsigned long vdso_base = (unsigned long) vmad_vdso_base;
+
+  #if HAVE_MM_CONTEXT_VDSO && defined(VSYSCALL32_BASE)
+    /* Some RHEL5 kernels use fix the VSYSCALL32_BASE for 32-bit tasks and 
+     * current->mm->context.vdso for 64-bit tasks.  Since we need to
+     * assign to vmad_vdso_base, it isn't convenient to redefine it. */
+     	if (test_thread_flag(TIF_IA32)) { 
+		vdso_base = VSYSCALL32_BASE;
+	} 
+  #endif
+
+	return (map->vm_start == vdso_base);
 }
 EXPORT_SYMBOL_GPL(vmad_is_arch_map);
 
@@ -401,19 +414,23 @@
      */
     if (vmad_vdso_base == (void *)(~0UL)) {
 	/* The call above didn't overwrite mm->context.vdso.
-	 * Since no failure was indicatated we just fill it in.
+	 * Since no failure was indictated we just fill it in.
 	 */
 	vmad_vdso_base = (void *)head->start;
+    #if defined(VSYSCALL32_BASE)
+        /* we probably didn't want to do that. */
+        if (test_thread_flag(TIF_IA32)) {
+            /* this seems to work, is there a better way? */
+            vmad_vdso_base = (void *)(0UL);
+        }
+    #endif
     } else if (vmad_vdso_base != (void *)head->start) {
-	long len = head->end - head->start;
-	unsigned long old_addr = (unsigned long)vmad_vdso_base;
-	unsigned long new_addr = sys_mremap(old_addr, len, len, MREMAP_FIXED|MREMAP_MAYMOVE, head->start);
-	if (new_addr != head->start) {
-	    r = (new_addr & (PAGE_SIZE-1)) ? new_addr : -ENOMEM;
+	r = vmad_remap(ctx, (unsigned long)vmad_vdso_base, head->start, head->end - head->start);
+	if (r) {
 	    CR_ERR_CTX(ctx, "vdso remap failed %d", (int)r);
 	    goto err;
 	}
-	vmad_vdso_base = (void *)new_addr;
+	vmad_vdso_base = (void *)head->start;
     }
   #else
     /* VSYSCALL32_BASE is a fixed value */
diff -Nru blcr-0.8.2/vmadump4/vmadump_x86.h blcr-0.8.4/vmadump4/vmadump_x86.h
--- blcr-0.8.2/vmadump4/vmadump_x86.h	2008-12-06 00:50:28.000000000 +0000
+++ blcr-0.8.4/vmadump4/vmadump_x86.h	2011-08-23 21:41:50.000000000 +0000
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: vmadump_x86.h,v 1.9 2008/12/06 00:50:28 phargrov Exp $
+ * $Id: vmadump_x86.h,v 1.9.8.2 2011/08/23 21:41:50 phargrov Exp $
  *
  *  THIS FILE ADDED FOR BLCR <http://ftg.lbl.gov/checkpoint>
  *-----------------------------------------------------------------------*/
@@ -26,6 +26,9 @@
 
 #include <asm/desc.h>
 #include <asm/i387.h>
+#if HAVE_LINUX_PERF_EVENT_H
+  #include <linux/perf_event.h>
+#endif
 
 /* set_used_math() first appears in 2.6.11 */
 #ifndef set_used_math
@@ -41,6 +44,9 @@
 #elif HAVE_THREAD_XSTATE
   typedef union thread_xstate vmad_i387_t;
   #define vmad_task_i387(_task) ((_task)->thread.xstate)
+#elif HAVE_THREAD_FPU
+  typedef union thread_xstate vmad_i387_t;
+  #define vmad_task_i387(_task) ((_task)->thread.fpu.state)
 #else
   #error "Unknown i387 state type"
 #endif
@@ -156,14 +162,14 @@
 
     if (flag) {
         r = -ENOMEM;
-#if HAVE_THREAD_XSTATE
+#if HAVE_THREAD_XSTATE || HAVE_THREAD_FPU
         /* Lazy allocation of FP state storage */
         if (!vmad_task_i387(current)) {
             init_fpu(current);
         }
 #endif
         if (!vmad_task_i387(current)) {
-            CR_ERR_CTX(ctx, "%d: FPU restore failure.", current->pid);
+            CR_ERR_CTX(ctx, "%d: FPU initialization failure.", current->pid);
             goto bad_read;
         }
         r = read_kern(ctx, file, i387tmp, sizeof(*i387tmp));
@@ -214,42 +220,38 @@
 /* Save debugging state */
 static
 long vmadump_store_debugreg(cr_chkpt_proc_req_t *ctx, struct file *file) {
+    struct thread_struct *const thread = &current->thread;
+    unsigned long debugregs[6];
     long r, bytes = 0;
 
 #if HAVE_THREAD_DEBUGREGS
-    r = write_kern(ctx, file, &current->thread.debugreg,
-		   sizeof(current->thread.debugreg));
-    if (r != sizeof(current->thread.debugreg)) goto err;
-    bytes += r;
+    {	int i;
+	for (i=0; i<6; ++i) debugregs[i] = thread->debugreg[i];
+    }
 #elif HAVE_THREAD_DEBUGREG0
-    r = write_kern(ctx, file, &current->thread.debugreg0,
-		   sizeof(current->thread.debugreg0));
-    if (r != sizeof(current->thread.debugreg0)) goto err;
-    bytes += r;
-    r = write_kern(ctx, file, &current->thread.debugreg1,
-		   sizeof(current->thread.debugreg1));
-    if (r != sizeof(current->thread.debugreg1)) goto err;
-    bytes += r;
-    r = write_kern(ctx, file, &current->thread.debugreg2,
-		   sizeof(current->thread.debugreg2));
-    if (r != sizeof(current->thread.debugreg2)) goto err;
-    bytes += r;
-    r = write_kern(ctx, file, &current->thread.debugreg3,
-		   sizeof(current->thread.debugreg3));
-    if (r != sizeof(current->thread.debugreg3)) goto err;
-    bytes += r;
-    r = write_kern(ctx, file, &current->thread.debugreg6,
-		   sizeof(current->thread.debugreg6));
-    if (r != sizeof(current->thread.debugreg6)) goto err;
-    bytes += r;
-    r = write_kern(ctx, file, &current->thread.debugreg7,
-		   sizeof(current->thread.debugreg7));
-    if (r != sizeof(current->thread.debugreg7)) goto err;
-    bytes += r;
+    debugregs[0] = thread->debugreg0;
+    debugregs[1] = thread->debugreg1;
+    debugregs[2] = thread->debugreg2;
+    debugregs[3] = thread->debugreg3;
+    debugregs[4] = thread->debugreg6;
+    debugregs[5] = thread->debugreg7;
+#elif HAVE_THREAD_PTRACE_BPS
+    {	int i;
+	for (i=0; i<4; ++i) {
+	    struct perf_event *bp = thread->ptrace_bps[i];
+	    debugregs[i] = bp ? bp->hw.info.address : 0;
+	}
+	debugregs[4] = thread->debugreg6;
+	debugregs[5] = thread->ptrace_dr7; /* XXX: is this correct? */
+    }
 #else
     #error
 #endif
 
+    r = write_kern(ctx, file, &debugregs, sizeof(debugregs));
+    if (r != sizeof(debugregs)) goto err;
+    bytes += r;
+
     return bytes;
 
  err:
@@ -259,29 +261,12 @@
 
 /* Read (but don't restore) debugging state */
 static
-int vmadump_restore_debugreg(cr_rstrt_proc_req_t *ctx, struct file *file,
-                             struct thread_struct *threadtmp) {
+int vmadump_restore_debugreg(cr_rstrt_proc_req_t *ctx, struct file *file) {
+    unsigned long debugregs[6];
     int r;
 
-#if HAVE_THREAD_DEBUGREGS
-    r = read_kern(ctx, file, threadtmp->debugreg, sizeof(threadtmp->debugreg));
-    if (r != sizeof(threadtmp->debugreg)) goto bad_read;
-#elif HAVE_THREAD_DEBUGREG0
-    r = read_kern(ctx, file, &threadtmp->debugreg0, sizeof(threadtmp->debugreg0));
-    if (r != sizeof(threadtmp->debugreg0)) goto bad_read;
-    r = read_kern(ctx, file, &threadtmp->debugreg1, sizeof(threadtmp->debugreg1));
-    if (r != sizeof(threadtmp->debugreg1)) goto bad_read;
-    r = read_kern(ctx, file, &threadtmp->debugreg2, sizeof(threadtmp->debugreg2));
-    if (r != sizeof(threadtmp->debugreg2)) goto bad_read;
-    r = read_kern(ctx, file, &threadtmp->debugreg3, sizeof(threadtmp->debugreg3));
-    if (r != sizeof(threadtmp->debugreg3)) goto bad_read;
-    r = read_kern(ctx, file, &threadtmp->debugreg6, sizeof(threadtmp->debugreg6));
-    if (r != sizeof(threadtmp->debugreg6)) goto bad_read;
-    r = read_kern(ctx, file, &threadtmp->debugreg7, sizeof(threadtmp->debugreg7));
-    if (r != sizeof(threadtmp->debugreg7)) goto bad_read;
-#else
-    #error
-#endif
+    r = read_kern(ctx, file, &debugregs, sizeof(debugregs));
+    if (r != sizeof(debugregs)) goto bad_read;
 
     return 0;