Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › be8fd2a
Merge pull request #216 from bdrewery/8.3-readline
Baptiste Daroussin committed 14 years ago
commit be8fd2ac2dc4bed005a8afbb9e9ff4a319abfc9c
parent 36ce9fe
3 files changed +4 -2
modified external/sqlite/Makefile
@@ -10,6 +10,8 @@ WFORMAT= 1
.if exists(/usr/include/edit/readline/readline.h)

CFLAGS+=	-DHAVE_READLINE=1 \

		-I/usr/include/edit
+ 
.elif exists(/usr/include/readline/readline.h)
+ 
CFLAGS+=	-DHAVE_READLINE=1

.endif

# http://www.sqlite.org/compile.html

CFLAGS+=	-DSQLITE_OMIT_AUTOVACUUM \
modified libpkg/Makefile
@@ -52,7 +52,7 @@ LDADD+= -L${.OBJDIR}/../external/sqlite \
		-lutil \

		-lpthread
- 
.if exists(/usr/include/edit/readline/readline.h)
+ 
.if exists(/usr/include/edit/readline/readline.h) || exists(/usr/include/readline/readline.h)

LDADD+=		-ledit

.endif
modified pkg-static/Makefile
@@ -18,7 +18,7 @@ LDADD_STATIC= -L${.OBJDIR}/../external/sqlite \
		-lbz2 \

		-llzma
- 
.if exists(/usr/include/edit/readline/readline.h)
+ 
.if exists(/usr/include/edit/readline/readline.h) || exists(/usr/include/readline/readline.h)

LDADD_STATIC+=	-ledit \

		-lncursesw

.endif