mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 14:25:41 +00:00
Code Issues Releases Wiki Activity

[#227] Removed bunch of configure options

Browse Source 
--with-cli-lease-file, --with-cli6-lease-file
 --with-cli-pid-file, --with-cli6-pid-file
 --with-relay-pid-file, --with-relay6-pid-file
This commit is contained in:
Tomek Mrugalski
2022-03-30 16:26:33 +02:00
parent eb1ba1340e
commit 9cd5f3a69c
3 changed files with 17 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Makefile.in
View File

@@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.16.5 from Makefile.am.
# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -349,6 +349,7 @@ pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -367,31 +368,26 @@ ACLOCAL_AMFLAGS = -I m4
# We have a lot of files that we want shipped with the distribution.
#
EXTRA_DIST = RELNOTES LICENSE configure.ac+lt config+lt \
contrib/3.0b1-lease-convert contrib/dhclient-tz-exithook.sh \
contrib/dhcp.spec contrib/sethostname.sh contrib/solaris.init \
contrib/ms2isc/Registry.pm contrib/ms2isc/ms2isc.pl \
contrib/ms2isc/readme.txt contrib/ldap/dhcpd-conf-to-ldap \
contrib/ldap/dhcp.schema contrib/ldap/README.ldap \
contrib/dhcp-lease-list.pl doc/BIND-libraries \
doc/DHCPv4-over-DHCPv6 doc/IANA-arp-parameters doc/Makefile \
doc/References.html doc/References.txt doc/References.xml \
doc/api+protocol doc/ja_JP.eucJP/dhclient-script.8 \
doc/ja_JP.eucJP/dhclient.8 doc/ja_JP.eucJP/dhclient.conf.5 \
doc/ja_JP.eucJP/dhclient.leases.5 doc/ja_JP.eucJP/dhcp-eval.5 \
doc/ja_JP.eucJP/dhcp-options.5 \
doc/examples/dhclient-dhcpv6.conf \
contrib/3.0b1-lease-convert contrib/dhcp.spec \
contrib/solaris.init contrib/ms2isc/Registry.pm \
contrib/ms2isc/ms2isc.pl contrib/ms2isc/readme.txt \
contrib/ldap/dhcpd-conf-to-ldap contrib/ldap/dhcp.schema \
contrib/ldap/README.ldap contrib/dhcp-lease-list.pl \
doc/BIND-libraries doc/DHCPv4-over-DHCPv6 \
doc/IANA-arp-parameters doc/Makefile doc/References.html \
doc/References.txt doc/References.xml doc/api+protocol \
doc/ja_JP.eucJP/dhcp-eval.5 doc/ja_JP.eucJP/dhcp-options.5 \
doc/examples/dhcpd-dhcpv6.conf doc/devel/arch.dox \
doc/devel/atf.dox doc/devel/contrib.dox 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 \
client/tests/Kyuafile common/tests/Kyuafile \
server/tests/Kyuafile m4/README CONTRIBUTING.md \
$(am__append_1)
common/tests/Atffile server/tests/Atffile \
common/tests/Kyuafile server/tests/Kyuafile m4/README \
CONTRIBUTING.md $(am__append_1)
# Use an autoconf substitution vs an automake conditional here
# to fool automake when the bind directory does not exist.
SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server
SUBDIRS = @BINDSUBDIR@ includes tests common omapip dhcpctl server
DIST_SUBDIRS = $(SUBDIRS) keama
nobase_include_HEADERS = dhcpctl/dhcpctl.h

140
configure vendored
View File

@@ -784,14 +784,8 @@ with_atf
with_srv_conf_file
with_srv_lease_file
with_srv6_lease_file
with_cli_lease_file
with_cli6_lease_file
with_srv_pid_file
with_srv6_pid_file
with_cli_pid_file
with_cli6_pid_file
with_relay_pid_file
with_relay6_pid_file
with_randomdev
enable_kqueue
enable_epoll
@@ -1493,30 +1487,12 @@ Optional Packages:
--with-srv6-lease-file=PATH
File for dhcpd6 leases (default is
LOCALSTATEDIR/db/dhcpd6.leases)
--with-cli-lease-file=PATH
File for dhclient leases (default is
LOCALSTATEDIR/db/dhclient.leases)
--with-cli6-lease-file=PATH
File for dhclient6 leases (default is
LOCALSTATEDIR/db/dhclient6.leases)
--with-srv-pid-file=PATH
File for dhcpd process information (default is
LOCALSTATEDIR/run/dhcpd.pid)
--with-srv6-pid-file=PATH
File for dhcpd6 process information (default is
LOCALSTATEDIR/run/dhcpd6.pid)
--with-cli-pid-file=PATH
File for dhclient process information (default is
LOCALSTATEDIR/run/dhclient.pid)
--with-cli6-pid-file=PATH
File for dhclient6 process information (default is
LOCALSTATEDIR/run/dhclient6.pid)
--with-relay-pid-file=PATH
File for dhcrelay process information (default is
LOCALSTATEDIR/run/dhcrelay.pid)
--with-relay6-pid-file=PATH
File for dhcrelay6 process information (default is
LOCALSTATEDIR/run/dhcrelay6.pid)
--with-randomdev=PATH Path for random device (default is /dev/random)
--with-bind-extra-config
configure bind librairies with some extra options
@@ -5514,7 +5490,7 @@ else
enable_dhcpv4o6="no"
fi
# Relay port (draft-ietf-dhc-relay-port-10.txt) optional compile-time feature.
# Relay port (RFC8357) optional compile-time feature.
# Check whether --enable-relay-port was given.
if test "${enable_relay_port+set}" = set; then :
enableval=$enable_relay_port;
@@ -5931,80 +5907,6 @@ fi
$as_echo "$with_srv6_lease_file" >&6; }
# Check whether --with-cli-lease-file was given.
if test "${with_cli_lease_file+set}" = set; then :
withval=$with_cli_lease_file;
cat >>confdefs.h <<_ACEOF
#define _PATH_DHCLIENT_DB "$withval"
_ACEOF
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dhclient.leases location" >&5
$as_echo_n "checking for dhclient.leases location... " >&6; }
if [ "x$with_cli_lease_file" = "x" ] ; then
if [ -d "${localstatedir}/db" ] ; then
with_cli_lease_file="${localstatedir}/db/dhclient.leases"
elif [ -d "${localstatedir}/state" ] ; then
if [ -d "${localstatedir}/state/dhcp" ] ; then
with_cli_lease_file="${localstatedir}/state/dhcp/dhclient.leases"
else
with_cli_lease_file="${localstatedir}/state/dhclient.leases"
fi
elif [ -d "${localstatedir}/lib" ] ; then
if [ -d "${localstatedir}/lib/dhcp" ] ; then
with_cli_lease_file="${localstatedir}/lib/dhcp/dhclient.leases"
else
with_cli_lease_file="${localstatedir}/lib/dhclient.leases"
fi
elif [ -d "${localstatedir}/etc" ] ; then
with_cli_lease_file="${localstatedir}/etc/dhclient.leases"
else
with_cli_lease_file="/etc/dhclient.leases"
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cli_lease_file" >&5
$as_echo "$with_cli_lease_file" >&6; }
# Check whether --with-cli6-lease-file was given.
if test "${with_cli6_lease_file+set}" = set; then :
withval=$with_cli6_lease_file;
cat >>confdefs.h <<_ACEOF
#define _PATH_DHCLIENT6_DB "$withval"
_ACEOF
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dhclient6.leases location" >&5
$as_echo_n "checking for dhclient6.leases location... " >&6; }
if [ "x$with_cli6_lease_file" = "x" ] ; then
if [ -d "${localstatedir}/db" ] ; then
with_cli6_lease_file="${localstatedir}/db/dhclient6.leases"
elif [ -d "${localstatedir}/state" ] ; then
if [ -d "${localstatedir}/state/dhcp" ] ; then
with_cli6_lease_file="${localstatedir}/state/dhcp/dhclient6.leases"
else
with_cli6_lease_file="${localstatedir}/state/dhclient6.leases"
fi
elif [ -d "${localstatedir}/lib" ] ; then
if [ -d "${localstatedir}/lib/dhcp" ] ; then
with_cli6_lease_file="${localstatedir}/lib/dhcp/dhclient6.leases"
else
with_cli6_lease_file="${localstatedir}/lib/dhclient6.leases"
fi
elif [ -d "${localstatedir}/etc" ] ; then
with_cli6_lease_file="${localstatedir}/etc/dhclient6.leases"
else
with_cli6_lease_file="/etc/dhclient6.leases"
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cli6_lease_file" >&5
$as_echo "$with_cli6_lease_file" >&6; }
# Check whether --with-srv-pid-file was given.
if test "${with_srv_pid_file+set}" = set; then :
withval=$with_srv_pid_file;
@@ -6025,46 +5927,6 @@ _ACEOF
fi
# Check whether --with-cli-pid-file was given.
if test "${with_cli_pid_file+set}" = set; then :
withval=$with_cli_pid_file;
cat >>confdefs.h <<_ACEOF
#define _PATH_DHCLIENT_PID "$withval"
_ACEOF
fi
# Check whether --with-cli6-pid-file was given.
if test "${with_cli6_pid_file+set}" = set; then :
withval=$with_cli6_pid_file;
cat >>confdefs.h <<_ACEOF
#define _PATH_DHCLIENT6_PID "$withval"
_ACEOF
fi
# Check whether --with-relay-pid-file was given.
if test "${with_relay_pid_file+set}" = set; then :
withval=$with_relay_pid_file;
cat >>confdefs.h <<_ACEOF
#define _PATH_DHCRELAY_PID "$withval"
_ACEOF
fi
# Check whether --with-relay6-pid-file was given.
if test "${with_relay6_pid_file+set}" = set; then :
withval=$with_relay6_pid_file;
cat >>confdefs.h <<_ACEOF
#define _PATH_DHCRELAY6_PID "$withval"
_ACEOF
fi
# Check basic types.
ac_fn_c_find_intX_t "$LINENO" "8" "ac_cv_c_int8_t"
case $ac_cv_c_int8_t in #(

82
configure.ac
View File

@@ -177,7 +177,7 @@ else
enable_dhcpv4o6="no"
fi
# Relay port (draft-ietf-dhc-relay-port-10.txt) optional compile-time feature.
# Relay port (RFC8357) optional compile-time feature.
AC_ARG_ENABLE(relay-port,
AS_HELP_STRING([--enable-relay-port],[enable support for relay port (default is no)]))
# Relay port is off by default (for now)
@@ -398,66 +398,6 @@ if [[ "x$with_srv6_lease_file" = "x" ]] ; then
fi
AC_MSG_RESULT($with_srv6_lease_file)
AC_ARG_WITH(cli-lease-file,
AS_HELP_STRING([--with-cli-lease-file=PATH],[File for dhclient leases
(default is LOCALSTATEDIR/db/dhclient.leases)]),
AC_DEFINE_UNQUOTED([_PATH_DHCLIENT_DB], ["$withval"],
[File for dhclient leases.]))
AC_MSG_CHECKING([for dhclient.leases location])
if [[ "x$with_cli_lease_file" = "x" ]] ; then
if [[ -d "${localstatedir}/db" ]] ; then
with_cli_lease_file="${localstatedir}/db/dhclient.leases"
elif [[ -d "${localstatedir}/state" ]] ; then
if [[ -d "${localstatedir}/state/dhcp" ]] ; then
with_cli_lease_file="${localstatedir}/state/dhcp/dhclient.leases"
else
with_cli_lease_file="${localstatedir}/state/dhclient.leases"
fi
elif [[ -d "${localstatedir}/lib" ]] ; then
if [[ -d "${localstatedir}/lib/dhcp" ]] ; then
with_cli_lease_file="${localstatedir}/lib/dhcp/dhclient.leases"
else
with_cli_lease_file="${localstatedir}/lib/dhclient.leases"
fi
elif [[ -d "${localstatedir}/etc" ]] ; then
with_cli_lease_file="${localstatedir}/etc/dhclient.leases"
else
with_cli_lease_file="/etc/dhclient.leases"
fi
fi
AC_MSG_RESULT($with_cli_lease_file)
AC_ARG_WITH(cli6-lease-file,
AS_HELP_STRING([--with-cli6-lease-file=PATH],[File for dhclient6 leases
(default is LOCALSTATEDIR/db/dhclient6.leases)]),
AC_DEFINE_UNQUOTED([_PATH_DHCLIENT6_DB], ["$withval"],
[File for dhclient6 leases.]))
AC_MSG_CHECKING([for dhclient6.leases location])
if [[ "x$with_cli6_lease_file" = "x" ]] ; then
if [[ -d "${localstatedir}/db" ]] ; then
with_cli6_lease_file="${localstatedir}/db/dhclient6.leases"
elif [[ -d "${localstatedir}/state" ]] ; then
if [[ -d "${localstatedir}/state/dhcp" ]] ; then
with_cli6_lease_file="${localstatedir}/state/dhcp/dhclient6.leases"
else
with_cli6_lease_file="${localstatedir}/state/dhclient6.leases"
fi
elif [[ -d "${localstatedir}/lib" ]] ; then
if [[ -d "${localstatedir}/lib/dhcp" ]] ; then
with_cli6_lease_file="${localstatedir}/lib/dhcp/dhclient6.leases"
else
with_cli6_lease_file="${localstatedir}/lib/dhclient6.leases"
fi
elif [[ -d "${localstatedir}/etc" ]] ; then
with_cli6_lease_file="${localstatedir}/etc/dhclient6.leases"
else
with_cli6_lease_file="/etc/dhclient6.leases"
fi
fi
AC_MSG_RESULT($with_cli6_lease_file)
AC_ARG_WITH(srv-pid-file,
AS_HELP_STRING([--with-srv-pid-file=PATH],[File for dhcpd process information
(default is LOCALSTATEDIR/run/dhcpd.pid)]),
@@ -468,26 +408,6 @@ AC_ARG_WITH(srv6-pid-file,
(default is LOCALSTATEDIR/run/dhcpd6.pid)]),
AC_DEFINE_UNQUOTED([_PATH_DHCPD6_PID], ["$withval"],
[File for dhcpd6 process information.]))
AC_ARG_WITH(cli-pid-file,
AS_HELP_STRING([--with-cli-pid-file=PATH],[File for dhclient process information
(default is LOCALSTATEDIR/run/dhclient.pid)]),
AC_DEFINE_UNQUOTED([_PATH_DHCLIENT_PID], ["$withval"],
[File for dhclient process information.]))
AC_ARG_WITH(cli6-pid-file,
AS_HELP_STRING([--with-cli6-pid-file=PATH],[File for dhclient6 process information
(default is LOCALSTATEDIR/run/dhclient6.pid)]),
AC_DEFINE_UNQUOTED([_PATH_DHCLIENT6_PID], ["$withval"],
[File for dhclient6 process information.]))
AC_ARG_WITH(relay-pid-file,
AS_HELP_STRING([--with-relay-pid-file=PATH],[File for dhcrelay process information
(default is LOCALSTATEDIR/run/dhcrelay.pid)]),
AC_DEFINE_UNQUOTED([_PATH_DHCRELAY_PID], ["$withval"],
[File for dhcrelay process information.]))
AC_ARG_WITH(relay6-pid-file,
AS_HELP_STRING([--with-relay6-pid-file=PATH],[File for dhcrelay6 process information
(default is LOCALSTATEDIR/run/dhcrelay6.pid)]),
AC_DEFINE_UNQUOTED([_PATH_DHCRELAY6_PID], ["$withval"],
[File for dhcrelay6 process information.]))
# Check basic types.
AC_TYPE_INT8_T