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 /usr.sbin | |
| 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 'usr.sbin')
| -rw-r--r-- | usr.sbin/mount_smbfs/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/usr.sbin/mount_smbfs/Makefile b/usr.sbin/mount_smbfs/Makefile index 9b73944..bbc084f 100644 --- a/usr.sbin/mount_smbfs/Makefile +++ b/usr.sbin/mount_smbfs/Makefile @@ -11,11 +11,6 @@ CFLAGS+= -DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include LDADD= -lsmb -lkiconv DPADD= ${LIBSMB} ${LIBKICONV} -# Needs to be dynamically linked for optional dlopen() access to -# userland libiconv (see the -E option). -# -NO_SHARED?= NO - .PATH: ${CONTRIBDIR}/mount_smbfs .PATH: ${MOUNTDIR} |
