--- configure.orig	2003-04-11 05:09:04.000000000 +0400
+++ configure	2009-11-04 07:09:50.000000000 +0300
@@ -11830,100 +11830,27 @@
 echo $ECHO_N "checking whether to enable IPv6 support... $ECHO_C" >&6
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then
-  enableval="$enable_ipv6"
-   case "$enableval" in
+  enableval=$enable_ipv6;  case "$enableval" in
     yes)
-      case "$(uname -s)" in
-        Linux)
-          if test -d "/usr/inet6/include"; then
-            CFLAGS="$CFLAGS -I/usr/inet6/include"
-            LIBS="-L/usr/inet6/lib -linet6 $LIBS"
-            echo "$as_me:$LINENO: result: yes (libinet6)" >&5
-echo "${ECHO_T}yes (libinet6)" >&6
+       { $as_echo "$as_me:$LINENO: result: yes (notchecked)" >&5
+$as_echo "yes (notchecked)" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define IPV6 1
 _ACEOF
 
-          else
-            if test -d "/usr/local/v6/lib"; then
-              LIBS="-L/usr/local/v6/lib -linet6 $LIBS"
-              echo "$as_me:$LINENO: result: yes (freebsd+kame)" >&5
-echo "${ECHO_T}yes (freebsd+kame)" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define IPV6 1
-_ACEOF
-
-            else
-              if test "$cross_compiling" = yes; then
-  { echo "$as_me:$LINENO: WARNING: cross-compiling: assuming no ipv6" >&5
-echo "$as_me: WARNING: cross-compiling: assuming no ipv6" >&2;}
+       ;;
+    *)
+       { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+       ;;
+    esac
 else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-              int main()
-              {
-                 #if !defined(__GLIBC__) || (__GLIBC__ < 2)
-                 #define NO_GLIBC_2 1
-                 #endif
-
-                 if (NO_GLIBC_2)
-                   exit(0);
-                 else
-                   exit(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
-   echo "$as_me:$LINENO: result: yes (glibc2)" >&5
-echo "${ECHO_T}yes (glibc2)" >&6
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define IPV6 1
-_ACEOF
-
-
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-            fi
-          fi
-          ;;
-        *)
-          echo "$as_me:$LINENO: result: no (ipv6 support can currently be enabled on Linux only)" >&5
-echo "${ECHO_T}no (ipv6 support can currently be enabled on Linux only)" >&6
-          ;;
-      esac
-      ;;
-    no)
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-      ;;
-  esac
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
 
-fi;
 
 echo "$as_me:$LINENO: checking whether to enable SOCKS support" >&5
 echo $ECHO_N "checking whether to enable SOCKS support... $ECHO_C" >&6
@@ -12609,7 +12536,7 @@
             system="unknown"
         else
           if test -r "/etc/.relid" -a x"`uname -n`" = x"`uname -s`"; then
-            system="MP-RAS-`$AWK '{print }' /etc/.relid'`"
+            system="MP-RAS-`$AWK '{print $3}' /etc/.relid`"
           fi
         fi
       fi
@@ -13877,7 +13804,7 @@
             system="unknown"
         else
           if test -r "/etc/.relid" -a x"`uname -n`" = x"`uname -s`"; then
-            system="MP-RAS-`$AWK '{print }' /etc/.relid'`"
+            system="MP-RAS-`$AWK '{print $3}' /etc/.relid`"
           fi
         fi
       fi
