Module Name: othersrc
Committed By: lukem
Date: Sat Jul 4 04:40:00 UTC 2020
Modified Files:
othersrc/libexec/tnftpd: configure.ac
Log Message:
configure: rename to --with-blocklist
Change --with-blacklist to --with-blocklist and search for
libblocklist first, falling back to the legacy libblacklist.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 othersrc/libexec/tnftpd/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/libexec/tnftpd/configure.ac
diff -u othersrc/libexec/tnftpd/configure.ac:1.44 othersrc/libexec/tnftpd/configure.ac:1.45
--- othersrc/libexec/tnftpd/configure.ac:1.44 Sun Jun 2 06:54:55 2019
+++ othersrc/libexec/tnftpd/configure.ac Sat Jul 4 04:39:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.44 2019/06/02 06:54:55 lukem Exp $
+# $NetBSD: configure.ac,v 1.45 2020/07/04 04:39:59 lukem Exp $
#
# Process this file with autoconf to produce a configure script.
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
Copyright (c) 2001-2019 The NetBSD Foundation, Inc.
All rights reserved.
])
-AC_REVISION([$Revision: 1.44 $])
+AC_REVISION([$Revision: 1.45 $])
AS_SHELL_SANITIZE()
@@ -44,12 +44,12 @@ AC_ARG_ENABLE([builtinls],
[opt_builtinls=$enableval],
[opt_builtinls=yes])
-AC_ARG_WITH([blacklist],
- [AS_HELP_STRING([--with-blacklist],
- [enable support for NetBSD blacklist daemon
+AC_ARG_WITH([blocklist],
+ [AS_HELP_STRING([--with-blocklist],
+ [enable support for NetBSD blocklist daemon
[default=auto]])],
[],
- [with_blacklist=auto])
+ [with_blocklist=auto])
AC_ARG_WITH([pam],
[AS_HELP_STRING([--with-pam],
@@ -90,6 +90,8 @@ AH_TEMPLATE([HAVE_PRINTF_LONG_LONG],
*printf() supports %lld or %qd to print them.])
AH_TEMPLATE([NO_INTERNAL_LS],
[Define if not using in-built /bin/ls code.])
+AH_TEMPLATE([USE_BLOCKLIST],
+ [Define if using blocklist.])
AH_TEMPLATE([USE_BLACKLIST],
[Define if using blacklist.])
AH_TEMPLATE([USE_INET6],
@@ -385,21 +387,27 @@ AS_IF([test "$ac_cv_have_decl_AI_NUMERIC
AC_MSG_RESULT([no - using local version])],
[AC_MSG_RESULT([using local version])])])
-# Check for blacklist.
+# Check for blocklist, falling back to legacy blacklist name
#
-AS_IF([test "$with_blacklist" != no],
- [AC_MSG_NOTICE([--with-blacklist=$with_blacklist; checking for required blacklist features])
- AC_CHECK_LIB([blacklist],
- [blacklist_open],
- [LIBS="-lblacklist $LIBS"
- AC_DEFINE([USE_BLACKLIST], [1])
- AC_MSG_NOTICE([enabling blacklist support])
- with_blacklist=yes],
- [AS_IF([test "$with_blacklist" != auto],
- [AC_MSG_FAILURE(
- [--with-blacklist was given, but blacklist_open() was not found])])
- AC_MSG_NOTICE([disabling --with-blacklist])
- with_blacklist=no])])
+AS_IF([test "$with_blocklist" != no],
+ [AC_MSG_NOTICE([--with-blocklist=$with_blocklist; checking for required blocklist features])
+ AC_CHECK_LIB([blocklist],
+ [blocklist_open],
+ [LIBS="-lblocklist $LIBS"
+ AC_DEFINE([USE_BLOCKLIST], [1])
+ AC_MSG_NOTICE([enabling blocklist support])
+ with_blocklist=yes],
+ [AC_CHECK_LIB([blacklist],
+ [blacklist_open],
+ [LIBS="-lblacklist $LIBS"
+ AC_DEFINE([USE_BLACKLIST], [1])
+ AC_MSG_NOTICE([enabling blocklist legacy support])
+ with_blocklist=yes],
+ [AS_IF([test "$with_blocklist" != auto],
+ [AC_MSG_FAILURE(
+ [--with-blocklist was given, but blocklist_open() was not found])])
+ AC_MSG_NOTICE([disabling --with-blocklist])
+ with_blocklist=no])])])
# Check for PAM.
#
@@ -490,7 +498,7 @@ AC_MSG_NOTICE([Package: $P
AC_MSG_NOTICE([Prefix: $prefix])
AC_MSG_NOTICE([IPv6 support: $opt_ipv6])
AC_MSG_NOTICE([Built-in /bin/ls: $opt_builtinls])
-AC_MSG_NOTICE([blacklist support: $with_blacklist])
+AC_MSG_NOTICE([blocklist support: $with_blocklist])
AC_MSG_NOTICE([PAM authentication: $with_pam])
AC_MSG_NOTICE([SIA authentication: $with_sia])
AC_MSG_NOTICE([S/Key authentication: $with_skey])
