summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2005-08-06 16:53:55 +0000
committerphk <phk@FreeBSD.org>2005-08-06 16:53:55 +0000
commit5a523760659dee07f955efb61a4021045eddd231 (patch)
treefa34f9b44f1829407f52de3d636b3504b99bc02b
parentce947d44964b100c7f8084329b66b8a1a539452d (diff)
downloadFreeBSD-src-5a523760659dee07f955efb61a4021045eddd231.zip
FreeBSD-src-5a523760659dee07f955efb61a4021045eddd231.tar.gz
Respect the YES_HESIOD build variable.
-rw-r--r--include/Makefile6
-rw-r--r--lib/libc/Makefile2
-rw-r--r--lib/libc/net/Makefile.inc10
-rw-r--r--rescue/librescue/Makefile2
4 files changed, 16 insertions, 4 deletions
diff --git a/include/Makefile b/include/Makefile
index d336eaa..59856c1 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -9,7 +9,7 @@ INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
db.h \
dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
fts.h ftw.h getopt.h glob.h grp.h \
- hesiod.h histedit.h ieeefp.h ifaddrs.h \
+ histedit.h ieeefp.h ifaddrs.h \
inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \
netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \
@@ -55,6 +55,10 @@ LSUBDIRS= cam/scsi \
_dev_ieee488= dev/ieee488
.endif
+.if defined(YES_HESIOD)
+INCS+= hesiod.h
+.endif
+
.if !defined(NO_BLUETOOTH)
LSUBSUBDIRS= netgraph/bluetooth/include
.endif
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index d86c16f..8f8084e 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -58,7 +58,7 @@ NOASM=
CFLAGS+= -DYP
.include "${.CURDIR}/yp/Makefile.inc"
.endif
-.if !defined(NO_HESIOD_LIBC)
+.if defined(YES_HESIOD)
CFLAGS+= -DHESIOD
.endif
.if defined(NO_FP_LIBC)
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 552de00..6d8f0f6 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -10,7 +10,7 @@ SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c eui64.c \
getifaddrs.c getifmaddrs.c getnameinfo.c \
getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \
getproto.c getprotoent.c getprotoname.c getservbyname.c \
- getservbyport.c getservent.c herror.c hesiod.c inet_addr.c \
+ getservbyport.c getservent.c herror.c inet_addr.c \
if_indextoname.c if_nameindex.c if_nametoindex.c inet_lnaof.c \
inet_makeaddr.c inet_net_ntop.c inet_net_pton.c inet_neta.c \
inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \
@@ -43,7 +43,7 @@ nslexer.c: nslexer.l nsparser.h
MAN+= addr2ascii.3 byteorder.3 ethers.3 eui64.3 \
getaddrinfo.3 gai_strerror.3 gethostbyname.3 \
getifaddrs.3 getifmaddrs.3 getipnodebyname.3 \
- getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 hesiod.3 \
+ getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 \
if_indextoname.3 \
inet.3 inet_net.3 \
inet6_opt_init.3 inet6_option_space.3 inet6_rth_space.3 \
@@ -112,3 +112,9 @@ MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \
resolver.3 ns_get16.3 resolver.3 ns_get32.3 \
resolver.3 ns_put16.3 resolver.3 ns_put32.3
+
+.if defined(YES_HESIOD)
+SRCS+= hesiod.c
+MAN+= hesiod.3
+.endif
+
diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile
index f73984c..0cc5bfa 100644
--- a/rescue/librescue/Makefile
+++ b/rescue/librescue/Makefile
@@ -33,7 +33,9 @@ CFLAGS+= -DBROKEN_DES -DPORTMAP -DDES_BUILTIN
.if !defined(NO_NIS)
CFLAGS+= -DYP
.endif
+.if defined(YES_HESIOD)
CFLAGS+= -DHESIOD
+.endif
CFLAGS+= -I${.CURDIR}/../../lib/libc/include
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud