From: Francis Dupont <fdupont@isc.org>
Date: Thu, 11 Jan 2018 14:02:35 +0000 (+0100)
Subject: Finishing merge of rt46933 (Kyua)
X-Git-Tag: v4_4_0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=662483908c023cce58066d2b8169a5c20ce25eb4;p=thirdparty%2Fdhcp.git

Finishing merge of rt46933 (Kyua)
---

662483908c023cce58066d2b8169a5c20ce25eb4
diff --cc configure
index a93fb7caa,8a1c435fa..e9b864941
--- a/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 bb7b54bf6,9507d48d7..203cf57c9
--- a/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 340e59bff,aad11c48a..26b2383c4
--- a/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 a64224f8a,219d60501..7a512f842
--- a/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 bb7b54bf6,9507d48d7..203cf57c9
--- a/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)