Browse Source

ensure that the default value gets substituted for config variables

Remove unneeded AC_SUBST's, call AC_DEFINE for default and user-specified
cases.
Thanks to naddy@ for reporting and suggesting the fixes.
OPENBSD_5_7
Brent Cook 9 years ago
parent
commit
8fedfe3985
1 changed files with 19 additions and 21 deletions
  1. +19
    -21
      configure.ac

+ 19
- 21
configure.ac View File

@ -212,33 +212,31 @@ AC_CHECK_MEMBERS([struct sockaddr_in.sin_len], , ,
#include <sys/socket.h> ] #include <sys/socket.h> ]
) )
AC_ARG_WITH(privsep-user,
[ --with-privsep-user=user Specify privilege separation user],
[ AC_DEFINE_UNQUOTED(NTPD_USER, "$withval",
[Unprivileged userid])
PRIVSEP_USER=$withval ],
[ PRIVSEP_USER=_ntp ]
AC_ARG_WITH([privsep-user],
AS_HELP_STRING([--with-privsep-user=user],
[Privilege separation user for ntpd to use]),
PRIVSEP_USER="$withval",
PRIVSEP_USER="_ntp"
) )
AC_DEFINE_UNQUOTED(NTPD_USER, "$PRIVSEP_USER", [Unprivileged user])
AC_SUBST(PRIVSEP_USER) AC_SUBST(PRIVSEP_USER)
AC_ARG_WITH(cacert,
[ --with-cacert=path CA certificate location for HTTPS constraint validation],
[ AC_DEFINE_UNQUOTED(CONSTRAINT_CA, "$withval",
[CA certificate path])
CONSTRAINT_CA=$withval ],
[ CONSTRAINT_CA=/etc/ssl/certs/ca-certificates.crt ]
)
AC_SUBST(CONSTRAINT_CA)
AC_ARG_WITH(privsep-path,
[ --with-privsep-path=path Specify privilege separation chroot path],
[ AC_DEFINE_UNQUOTED(NTPD_CHROOT_DIR, "$withval",
[Privilege separation chroot path])
PRIVSEP_PATH=$withval ],
[ PRIVSEP_PATH=/var/empty ]
AC_ARG_WITH([privsep-path],
AS_HELP_STRING([--with-privsep-path=path],
[Privilege separation chroot path to check on install]),
PRIVSEP_PATH="$withval",
PRIVSEP_PATH="/var/empty"
) )
AC_SUBST(PRIVSEP_PATH) AC_SUBST(PRIVSEP_PATH)
AC_ARG_WITH([cacert],
AS_HELP_STRING([--with-cacert=path],
[CA certificate location for HTTPS constraint validation]),
CONSTRAINT_CA="$withval",
CONSTRAINT_CA="/etc/ssl/cert.pem"
)
AC_DEFINE_UNQUOTED(CONSTRAINT_CA, "$CONSTRAINT_CA", [CA certificate path])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
include/Makefile include/Makefile


Loading…
Cancel
Save