Get rid of overriding default --sysconfdir and --localstatedir autoconf options
Previously the autoconf script set sysconfdir to /etc and localstatedir to /var if they were not explicitly set in the ./configure invocation. This MR reverts the override and make it more in line with default and generally expected autoconf behavior.
This commit is contained in:
33
configure
vendored
33
configure
vendored
@@ -12669,39 +12669,10 @@ fi
|
||||
|
||||
|
||||
#
|
||||
# Special processing of paths depending on whether --prefix,
|
||||
# --sysconfdir or --localstatedir arguments were given. What's
|
||||
# desired is some compatibility with the way previous versions
|
||||
# of BIND built; they defaulted to /usr/local for most parts of
|
||||
# the installation, but named.boot/named.conf was in /etc
|
||||
# and named.pid was in /var/run.
|
||||
# expanded_sysconfdir is needed for replacement in the python utilities
|
||||
#
|
||||
# So ... if none of --prefix, --sysconfdir or --localstatedir are
|
||||
# specified, set things up that way. If --prefix is given, use
|
||||
# it for sysconfdir and localstatedir the way configure normally
|
||||
# would. To change the prefix for everything but leave named.conf
|
||||
# in /etc or named.pid in /var/run, then do this the usual configure way:
|
||||
# ./configure --prefix=/somewhere --sysconfdir=/etc
|
||||
# ./configure --prefix=/somewhere --localstatedir=/var
|
||||
# TODO: use sed in the Makefile instead of autoconf to do the replacement
|
||||
#
|
||||
# To put named.conf and named.pid in /usr/local with everything else,
|
||||
# set the prefix explicitly to /usr/local even though that's the default:
|
||||
# ./configure --prefix=/usr/local
|
||||
#
|
||||
case "$prefix" in
|
||||
NONE)
|
||||
case "$sysconfdir" in
|
||||
'${prefix}/etc')
|
||||
sysconfdir=/etc
|
||||
;;
|
||||
esac
|
||||
case "$localstatedir" in
|
||||
'${prefix}/var')
|
||||
localstatedir=/var
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
expanded_sysconfdir=`eval echo $sysconfdir`
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user