Permalink
Browse files

Revert "Support readline on FreeBSD 8.3"

This reverts commit 43fe87b.
Not supported on 8.2 and 8.1, (where libedit isn't built with readline
compatibility)

Remove for now, will reactivate after July 31, 2012 when both 8.1 and 8.2 will
be EOLed
  • Loading branch information...
1 parent 9fa52fa commit 26dc6e66b509db09e3d5991afb89e479e1db0619 @bapt bapt committed Apr 23, 2012
Showing with 2 additions and 4 deletions.
  1. +0 −2 external/sqlite/Makefile
  2. +1 −1 libpkg/Makefile
  3. +1 −1 pkg-static/Makefile
View
@@ -10,8 +10,6 @@ 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 \
View
@@ -52,7 +52,7 @@ LDADD+= -L${.OBJDIR}/../external/sqlite \
-lutil \
-lpthread
-.if exists(/usr/include/edit/readline/readline.h) || exists(/usr/include/readline/readline.h)
+.if exists(/usr/include/edit/readline/readline.h)
LDADD+= -ledit
.endif
View
@@ -18,7 +18,7 @@ LDADD_STATIC= -L${.OBJDIR}/../external/sqlite \
-lbz2 \
-llzma
-.if exists(/usr/include/edit/readline/readline.h) || exists(/usr/include/readline/readline.h)
+.if exists(/usr/include/edit/readline/readline.h)
LDADD_STATIC+= -ledit \
-lncursesw
.endif

0 comments on commit 26dc6e6

Please sign in to comment.