Finishing merge of rt46933 (Kyua)

diff --cc configure
index a93fb7caa961c465529033599fc7fcac7b945976,8a1c435fa38a209f5c4de14bfcfd996a055a4171..e9b8649410c93a482253bd4dddb35da3c2061149
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -5501,8 -5502,7 +5502,8 @@@ if test "$enable_relay_port" = "yes"; t
  $as_echo "#define RELAY_PORT 1" >>confdefs.h
  
  else
-     # so we can report below
-     enable_relay_port="no"
++      # so we can report below
+       enable_relay_port="no"
  fi
  
  # PARANOIA is off by default (until we can test it with all features)

diff --cc configure.ac
index bb7b54bf68298b0cc4ab6e776565fa44398d38f5,9507d48d79e1d28b5950a35f9ced8f4ef19d4a65..203cf57c94ef73c9524d79baf1ecc35a193e5f35
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -185,8 -185,7 +185,8 @@@ if test "$enable_relay_port" = "yes"; t
        AC_DEFINE([RELAY_PORT], [1],
                  [Define to 1 to include relay port support.])
  else
-     # so we can report below
-     enable_relay_port="no"
++      # so we can report below
+       enable_relay_port="no"
  fi
  
  # PARANOIA is off by default (until we can test it with all features)

diff --cc configure.ac+lt
index 340e59bffc171a1207750dba682c180129a32c7e,aad11c48a4ba1bf5fdb053ffab2e7323fb09cd6d..26b2383c437bdf6168d12bb9c44adc1e221fa808
--- 1/configure.ac+lt
--- 2/configure.ac+lt
+++ b/configure.ac+lt
@@@ -186,8 -186,7 +186,8 @@@ if test "$enable_relay_port" = "yes"; t
        AC_DEFINE([RELAY_PORT], [1],
                  [Define to 1 to include relay port support.])
  else
-     # so we can report below
-     enable_relay_port="no"
++      # so we can report below
+       enable_relay_port="no"
  fi
  
  # PARANOIA is off by default (until we can test it with all features)

diff --cc configure.ac-base
index a64224f8ad60cd121406d9bf95d8d35286981f77,219d60501694c8f1238200a55e18a79c59969e9a..7a512f84261407aaa77b0661d9e31070c378002c
--- 1/configure.ac-base
--- 2/configure.ac-base
+++ b/configure.ac-base
@@@ -191,8 -191,7 +191,8 @@@ if test "$enable_relay_port" = "yes"; t
        AC_DEFINE([RELAY_PORT], [1],
                  [Define to 1 to include relay port support.])
  else
-     # so we can report below
-     enable_relay_port="no"
++      # so we can report below
+       enable_relay_port="no"
  fi
  
  # PARANOIA is off by default (until we can test it with all features)

diff --cc configure.ac-lt
index bb7b54bf68298b0cc4ab6e776565fa44398d38f5,9507d48d79e1d28b5950a35f9ced8f4ef19d4a65..203cf57c94ef73c9524d79baf1ecc35a193e5f35
--- 1/configure.ac-lt
--- 2/configure.ac-lt
+++ b/configure.ac-lt
@@@ -185,8 -185,7 +185,8 @@@ if test "$enable_relay_port" = "yes"; t
        AC_DEFINE([RELAY_PORT], [1],
                  [Define to 1 to include relay port support.])
  else
-     # so we can report below
-     enable_relay_port="no"
++      # so we can report below
+       enable_relay_port="no"
  fi
  
  # PARANOIA is off by default (until we can test it with all features)