upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix #1224: Fix that defaults should not fall back to "Program Files

Browse source 
(x86) if Unbound is 64bit by default on windows.


git-svn-id: file:///svn/unbound/trunk@4018 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-02-22 07:31:32 +00:00
parent 44cfd1d49b
commit 5b34bde1a4
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure vendored
View file

@ -4105,7 +4105,7 @@ fi
if test $on_mingw = "no"; then if test $on_mingw = "no"; then
ub_conf_file=`eval echo "${sysconfdir}/unbound/unbound.conf"` ub_conf_file=`eval echo "${sysconfdir}/unbound/unbound.conf"`
else else
ub_conf_file="C:\\Program Files (x86)\\Unbound\\service.conf" ub_conf_file="C:\\Program Files\\Unbound\\service.conf"
fi fi
# Check whether --with-conf_file was given. # Check whether --with-conf_file was given.
@ -4236,7 +4236,7 @@ else
if test $on_mingw = no; then if test $on_mingw = no; then
UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key" UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key"
else else
UNBOUND_ROOTKEY_FILE="C:\\Program Files (x86)\\Unbound\\root.key" UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key"
fi fi
fi fi
@ -4258,7 +4258,7 @@ else
if test $on_mingw = no; then if test $on_mingw = no; then
UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem" UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem"
else else
UNBOUND_ROOTCERT_FILE="C:\\Program Files (x86)\\Unbound\\icannbundle.pem" UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem"
fi fi
fi fi

6
configure.ac
View file

@ -121,7 +121,7 @@ fi
if test $on_mingw = "no"; then if test $on_mingw = "no"; then
ub_conf_file=`eval echo "${sysconfdir}/unbound/unbound.conf"` ub_conf_file=`eval echo "${sysconfdir}/unbound/unbound.conf"`
else else
ub_conf_file="C:\\Program Files (x86)\\Unbound\\service.conf" ub_conf_file="C:\\Program Files\\Unbound\\service.conf"
fi fi
AC_ARG_WITH([conf_file], AC_ARG_WITH([conf_file],
AC_HELP_STRING([--with-conf-file=path], AC_HELP_STRING([--with-conf-file=path],
@ -191,7 +191,7 @@ AC_ARG_WITH(rootkey-file,
if test $on_mingw = no; then if test $on_mingw = no; then
UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key" UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key"
else else
UNBOUND_ROOTKEY_FILE="C:\\Program Files (x86)\\Unbound\\root.key" UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key"
fi fi
) )
AC_SUBST(UNBOUND_ROOTKEY_FILE) AC_SUBST(UNBOUND_ROOTKEY_FILE)
@ -205,7 +205,7 @@ AC_ARG_WITH(rootcert-file,
if test $on_mingw = no; then if test $on_mingw = no; then
UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem" UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem"
else else
UNBOUND_ROOTCERT_FILE="C:\\Program Files (x86)\\Unbound\\icannbundle.pem" UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem"
fi fi
) )
AC_SUBST(UNBOUND_ROOTCERT_FILE) AC_SUBST(UNBOUND_ROOTCERT_FILE)

4
doc/Changelog
View file

@ -1,3 +1,7 @@
22 February 2017: Wouter
- Fix #1224: Fix that defaults should not fall back to "Program Files
(x86) if Unbound is 64bit by default on windows.
21 February 2017: Wouter 21 February 2017: Wouter
- iana portlist update - iana portlist update

2
winrc/unbound-control-setup.cmd
View file

@ -37,7 +37,7 @@ rem SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
rem settings: rem settings:
rem directory for files rem directory for files
set prefix="C:\Program Files (x86)" set prefix="C:\Program Files"
set DESTDIR=%prefix%\Unbound set DESTDIR=%prefix%\Unbound
rem issuer and subject name for certificates rem issuer and subject name for certificates