Page MenuHomeFreeBSD
Files F109640414

D41504.diff
No OneTemporary
Actions

D41504.diff
View Options

diff --git a/contrib/unbound/freebsd-configure.sh b/contrib/unbound/freebsd-configure.sh
--- a/contrib/unbound/freebsd-configure.sh
+++ b/contrib/unbound/freebsd-configure.sh
@@ -39,3 +39,4 @@
--with-conf-file=/var/unbound/unbound.conf \
--with-run-dir=/var/unbound \
--with-username=unbound
+mv config.h ../../lib/libunbound
diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile
--- a/lib/libunbound/Makefile
+++ b/lib/libunbound/Makefile
@@ -11,8 +11,7 @@
PRIVATELIB=
PACKAGE= unbound
-CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR}
-CFLAGS+= -I${SRCTOP}/usr.sbin/unbound
+CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} -I${.CURDIR}
CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L
SRCS= alloc.c as112.c authzone.c autotrust.c cachedb.c config_file.c \
diff --git a/usr.sbin/unbound/config.h b/lib/libunbound/config.h
rename from usr.sbin/unbound/config.h
rename to lib/libunbound/config.h
diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile
--- a/usr.sbin/unbound/anchor/Makefile
+++ b/usr.sbin/unbound/anchor/Makefile
@@ -2,6 +2,7 @@
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
UNBOUNDDIR= ${SRCTOP}/contrib/unbound
+LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound
EXPATDIR= ${SRCTOP}/contrib/expat
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc
@@ -9,7 +10,7 @@
PROG= local-unbound-anchor
SRCS= unbound-anchor.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib
-CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
+CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR}
LIBADD= unbound bsdxml ssl crypto pthread
MAN= local-unbound-anchor.8
diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile
--- a/usr.sbin/unbound/checkconf/Makefile
+++ b/usr.sbin/unbound/checkconf/Makefile
@@ -2,13 +2,14 @@
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
UNBOUNDDIR= ${SRCTOP}/contrib/unbound
+LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc
PROG= local-unbound-checkconf
SRCS= ub_event.c unbound-checkconf.c worker_cb.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
-CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
+CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR}
LIBADD= unbound pthread
MAN= local-unbound-checkconf.8
diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile
--- a/usr.sbin/unbound/control/Makefile
+++ b/usr.sbin/unbound/control/Makefile
@@ -2,13 +2,14 @@
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
UNBOUNDDIR= ${SRCTOP}/contrib/unbound
+LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc
PROG= local-unbound-control
SRCS= ub_event.c unbound-control.c worker_cb.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
-CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
+CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR}
LIBADD= unbound crypto ssl pthread
MAN= local-unbound-control.8
diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile
--- a/usr.sbin/unbound/daemon/Makefile
+++ b/usr.sbin/unbound/daemon/Makefile
@@ -2,6 +2,7 @@
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
UNBOUNDDIR= ${SRCTOP}/contrib/unbound
+LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/shm_side ${UNBOUNDDIR}/doc
@@ -9,7 +10,7 @@
SRCS= acl_list.c cachedump.c daemon.c remote.c shm_main.c stats.c \
ub_event.c unbound.c worker.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
-CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
+CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR}
LIBADD= unbound util ssl crypto pthread
MAN= local-unbound.8 local-unbound.conf.5

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 8, 8:55 PM (20 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16531990
Default Alt Text
D41504.diff (3 KB)

Event Timeline