From e985472adfc7ee3034e29eebdea0d4daf2afad66 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sat, 30 Dec 2017 18:03:30 +0100 Subject: [PATCH] Finished: ready for review --- Makefile.am | 1 - Makefile.in | 1 - configure | 2 ++ configure.ac | 2 ++ configure.ac+lt | 2 ++ configure.ac-base | 2 ++ configure.ac-lt | 2 ++ 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 66d4b1609..c5211e014 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,6 @@ EXTRA_DIST = RELNOTES LICENSE configure.ac+lt config+lt \ doc/devel/debug.dox doc/devel/isc-logo.jpg doc/devel/libtool.dox \ doc/devel/mainpage.dox doc/devel/omapi.dox doc/devel/qa.dox \ client/tests/Atffile common/tests/Atffile server/tests/Atffile \ - Kyuafile client/Kyuafile common/Kyuafile server/Kyuafile \ client/tests/Kyuafile common/tests/Kyuafile server/tests/Kyuafile if HAVE_BINDDIR diff --git a/Makefile.in b/Makefile.in index 037360fce..e53896c3f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -384,7 +384,6 @@ EXTRA_DIST = RELNOTES LICENSE configure.ac+lt config+lt \ doc/devel/isc-logo.jpg doc/devel/libtool.dox \ doc/devel/mainpage.dox doc/devel/omapi.dox doc/devel/qa.dox \ client/tests/Atffile common/tests/Atffile server/tests/Atffile \ - Kyuafile client/Kyuafile common/Kyuafile server/Kyuafile \ client/tests/Kyuafile common/tests/Kyuafile \ server/tests/Kyuafile $(am__append_1) diff --git a/configure b/configure index 012f89695..8a1c435fa 100755 --- a/configure +++ b/configure @@ -5501,6 +5501,8 @@ if test "$enable_relay_port" = "yes"; then $as_echo "#define RELAY_PORT 1" >>confdefs.h +else + enable_relay_port="no" fi # PARANOIA is off by default (until we can test it with all features) diff --git a/configure.ac b/configure.ac index e3a29922a..9507d48d7 100644 --- a/configure.ac +++ b/configure.ac @@ -184,6 +184,8 @@ AC_ARG_ENABLE(relay-port, if test "$enable_relay_port" = "yes"; then AC_DEFINE([RELAY_PORT], [1], [Define to 1 to include relay port support.]) +else + enable_relay_port="no" fi # PARANOIA is off by default (until we can test it with all features) diff --git a/configure.ac+lt b/configure.ac+lt index 5bf6a13f3..aad11c48a 100644 --- a/configure.ac+lt +++ b/configure.ac+lt @@ -185,6 +185,8 @@ AC_ARG_ENABLE(relay-port, if test "$enable_relay_port" = "yes"; then AC_DEFINE([RELAY_PORT], [1], [Define to 1 to include relay port support.]) +else + enable_relay_port="no" fi # PARANOIA is off by default (until we can test it with all features) diff --git a/configure.ac-base b/configure.ac-base index 0208a0487..219d60501 100644 --- a/configure.ac-base +++ b/configure.ac-base @@ -190,6 +190,8 @@ AC_ARG_ENABLE(relay-port, if test "$enable_relay_port" = "yes"; then AC_DEFINE([RELAY_PORT], [1], [Define to 1 to include relay port support.]) +else + enable_relay_port="no" fi # PARANOIA is off by default (until we can test it with all features) diff --git a/configure.ac-lt b/configure.ac-lt index e3a29922a..9507d48d7 100644 --- a/configure.ac-lt +++ b/configure.ac-lt @@ -184,6 +184,8 @@ AC_ARG_ENABLE(relay-port, if test "$enable_relay_port" = "yes"; then AC_DEFINE([RELAY_PORT], [1], [Define to 1 to include relay port support.]) +else + enable_relay_port="no" fi # PARANOIA is off by default (until we can test it with all features) -- 2.39.5