diff options
| author | glebius <glebius@FreeBSD.org> | 2013-11-14 09:25:29 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2013-11-14 09:25:29 +0000 |
| commit | bb108535bab90d3218195361ff0ccf6791178573 (patch) | |
| tree | 4eaf730fbe25cd1ee1015352a6d6155c595ba2a6 /lib | |
| parent | 6e9011bd59a20b07230bd4fe50f79a2f20e23116 (diff) | |
| download | FreeBSD-src-bb108535bab90d3218195361ff0ccf6791178573.zip FreeBSD-src-bb108535bab90d3218195361ff0ccf6791178573.tar.gz | |
Merge r257888, r258049 from head:
- Use system libiconv, instead of trying to dlopen() it.
- Just disable recoding support in libsmb if built WITHOUT_ICONV.
PR: 183153
Approved by: re (kib)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libsmb/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile index 3a9a64d..e464a8f 100644 --- a/lib/libsmb/Makefile +++ b/lib/libsmb/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs .PATH: ${CONTRIBDIR}/lib/smb @@ -16,4 +18,8 @@ SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ WARNS?= 1 CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include +.if ${MK_ICONV} != "no" +CFLAGS+= -DHAVE_ICONV=1 +.endif + .include <bsd.lib.mk> |
