summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-10-16 23:26:45 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-10-16 23:26:45 +0000
commit325c7118ba99137e9a2338b723300967e14b9b4c (patch)
tree97c45e58a38f4ccd00ace387fc2bace633ada7de /sbin
parentae74697bb8d0b765a51d5d55865c785627cdf643 (diff)
Merge with EOM 1.16
author: niklas conditionalize getnaminfo and add weak keynote syms author: niklas Add weak aliases for keynote symbols that have not always been there
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/sysdep/openbsd/Makefile.sysdep7
1 files changed, 5 insertions, 2 deletions
diff --git a/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep b/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
index b6abb458160..dc430d944ef 100644
--- a/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
+++ b/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile.sysdep,v 1.9 2000/10/07 06:59:32 niklas Exp $
-# $EOM: Makefile.sysdep,v 1.14 2000/09/12 16:31:22 ho Exp $
+# $OpenBSD: Makefile.sysdep,v 1.10 2000/10/16 23:26:44 niklas Exp $
+# $EOM: Makefile.sysdep,v 1.16 2000/10/15 19:58:40 niklas Exp $
#
# Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -37,6 +37,8 @@
IPSEC_SRCS= pf_key_v2.c
IPSEC_CFLAGS= -DUSE_PF_KEY_V2
+CFLAGS+= -DHAVE_GETNAMEINFO
+
# Some OpenBSD systems do not provide dlopen(3).
.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips" && ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "vax"
HAVE_DLOPEN= defined
@@ -47,6 +49,7 @@ USE_LIBCRYPTO= defined
.ifdef FEATURES
.if ${FEATURES:Mpolicy} == "policy"
+SRCS+= keynote_compat.c
USE_KEYNOTE= defined
.endif
.endif