diff options
| author | obrien <obrien@FreeBSD.org> | 2011-04-05 18:41:01 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2011-04-05 18:41:01 +0000 |
| commit | cddd21009866efd0aeb10c6a4a58b98a5c89448a (patch) | |
| tree | 03c22bc05677cdacb03efd8c11ec7bed49f3df18 /usr.sbin | |
| parent | 48e4efea84a5a2658b09e918afca1f07c10e41f1 (diff) | |
| parent | e667f087fdee4745b37bfe2d5a6ede045406d13b (diff) | |
| download | FreeBSD-src-cddd21009866efd0aeb10c6a4a58b98a5c89448a.zip FreeBSD-src-cddd21009866efd0aeb10c6a4a58b98a5c89448a.tar.gz | |
* Add the readline(3) API to libedit. The libedit versions of
{readline,history}.h are in /usr/include/edit so as to not conflict with
the GNU libreadline versions. To use the libedit readline(3) one should
add "-I/usr/include/edit" to their Makefile
(spelled "-I${DESTDIR}/${INCLUDEDIR}/edit" within the FreeBSD source tree).
* Enable its use in the BSD licensed utilities that support readline(3).
* To make it easier to sync libedit development with NetBSD, histedit.h
is moved into libedit's directory as history shows shown we keep merging
it into that location.
Obtained from: NetBSD
Sponsored by: Juniper Networks
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ntp/ntpdc/Makefile | 12 | ||||
| -rw-r--r-- | usr.sbin/ntp/ntpq/Makefile | 12 | ||||
| -rw-r--r-- | usr.sbin/wpa/wpa_cli/Makefile | 6 |
3 files changed, 13 insertions, 17 deletions
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index 75cfec0..17c5f39 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -15,16 +15,14 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} LDADD= ${LIBNTP} -lm -lmd ${LIBOPTS} -.if ${MK_GNU_SUPPORT} != "no" -DPADD+= ${LIBREADLINE} ${LIBTERMCAP} -LDADD+= -lreadline -ltermcap -CFLAGS+= -DHAVE_LIBREADLINE -DHAVE_READLINE_HISTORY_H \ - -DHAVE_READLINE_READLINE_H -.endif +DPADD+= ${LIBEDIT} ${LIBTERMCAP} +LDADD+= -ledit -ltermcap +CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ + -I${DESTDIR}/${INCLUDEDIR}/edit CLEANFILES+= .version version.c -version.c: +version.c: sh -e ${.CURDIR}/../scripts/mkver ntpdc afterinstall: diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index 42cc750..205a0be 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -17,16 +17,14 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} LDADD= ${LIBNTP} -lm -lmd ${LIBOPTS} -.if ${MK_GNU_SUPPORT} != "no" -DPADD+= ${LIBREADLINE} ${LIBTERMCAP} -LDADD+= -lreadline -ltermcap -CFLAGS+= -DHAVE_LIBREADLINE -DHAVE_READLINE_HISTORY_H \ - -DHAVE_READLINE_READLINE_H -.endif +DPADD+= ${LIBEDIT} ${LIBTERMCAP} +LDADD+= -ledit -ltermcap +CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ + -I${DESTDIR}/${INCLUDEDIR}/edit CLEANFILES+= .version version.c -version.c: +version.c: sh -e ${.CURDIR}/../scripts/mkver ntpq .include <bsd.prog.mk> diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile index 123485a..1721437 100644 --- a/usr.sbin/wpa/wpa_cli/Makefile +++ b/usr.sbin/wpa/wpa_cli/Makefile @@ -14,8 +14,8 @@ CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX # enable use of d_type to identify unix domain sockets CFLAGS+= -D_DIRENT_HAVE_D_TYPE -#CFLAGS+= -DCONFIG_READLINE -#LDADD+= -ledit -ltermcap -#DPADD+= ${LIBEDIT} ${LIBTERMCAP} +CFLAGS+= -DCONFIG_READLINE -I${DESTDIR}/${INCLUDEDIR}/edit +LDADD+= -ledit -ltermcap +DPADD+= ${LIBEDIT} ${LIBTERMCAP} .include <bsd.prog.mk> |
