Commit Diff

Commit:
fa5821e5868e0ff1eb544315ddde788b89770e8b
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
fix readline on !OpenBSD I talked too fast. There's a typo that disabled readline even if found with pkg-config, and also the way I hooked it in kamiftp was wrong...
Actions:
Patch | Tree
commit - 91cfa92a0d58379f882eb01ce3e78b5f3fc6cfa5
commit + fa5821e5868e0ff1eb544315ddde788b89770e8b
blob - aa78d8efcc2c684d5bec7c145bda3449743d1355
blob + 73b6ec0802743faf1454621f8ce94e8c26f92b74
--- configure.ac
+++ configure.ac
@@ -139,7 +139,7 @@ AS_CASE([$host_os],
 		READLINE_LIBS='-lreadline'
 	], [
 		PKG_CHECK_MODULES([READLINE], [readline], [
-			AC_DEFINE([HAVE_READLINE], 0, [])
+			AC_DEFINE([HAVE_READLINE], 1, [])
 		], [
 			AC_DEFINE([HAVE_READLINE], 0, [])
 		])
blob - 170543df04000f49c5b768a7fb112363f48baab1
blob + 0f3f26e222993e77b2010443a931f3a7681daee8
--- kamiftp/Makefile.am
+++ kamiftp/Makefile.am
@@ -11,11 +11,9 @@ kamiftp_SOURCES=ftp.c				\
 
 man1_MANS =	kamiftp.1
 
-LDADD =		$(LIBOBJS)
+kamiftp_CFLAGS=	@READLINE_CFLAGS@
+kamiftp_LDADD=	@READLINE_LIBS@ $(LIBOBJS)
 
-kamiftp_CFLAGS = @READLINE_CFLAGS@
-kamiftp_LDFLAGS= @READLINE_LIBS@
-
 AM_CPPFLAGS =	-DKAMID_VERSION='"@VERSION@"'	\
 		-I$(top_srcdir)/		\
 		-I$(top_srcdir)/compat		\