From 1df61452ea479323b22bd6f522e7d1f09fca5fe6 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 21 Mar 2005 09:58:07 +1100
Subject: [PATCH]  - (dtucker) [configure.ac] Make configure error out if the
 user specifies    --with-libedit but the required libs can't be found, rather
 than silently    ignoring and continuing.  ok tim@

---
 ChangeLog    | 5 ++++-
 configure.ac | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8008bede9..f115e5ecb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
  - (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes
    and -Lyes to CFLAGS and LIBS.  Pointed out by peter at slagheap.net,
    with & ok tim@
+ - (dtucker) [configure.ac] Make configure error out if the user specifies
+   --with-libedit but the required libs can't be found, rather than silently
+   ignoring and continuing.  ok tim@
 
 20050317
  - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional.
@@ -2377,4 +2380,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3725 2005/03/20 22:55:17 dtucker Exp $
+$Id: ChangeLog,v 1.3726 2005/03/20 22:58:07 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index d77138505..f105e20da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.255 2005/03/20 22:55:17 dtucker Exp $
+# $Id: configure.ac,v 1.256 2005/03/20 22:58:08 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -850,13 +850,18 @@ LIBEDIT_MSG="no"
 AC_ARG_WITH(libedit,
 	[  --with-libedit[[=PATH]]   Enable libedit support for sftp],
 	[ if test "x$withval" != "xno" ; then
+		if test "x$withval" != "xyes"; then
+			CPPFLAGS="$CPPFLAGS -I$withval/include"
+			LDFLAGS="$LDFLAGS -L$withval/lib"
+		fi
 		AC_CHECK_LIB(edit, el_init,
 			[ AC_DEFINE(USE_LIBEDIT, [], [Use libedit for sftp])
 			  LIBEDIT="-ledit -lcurses"
 			  LIBEDIT_MSG="yes"
 			  AC_SUBST(LIBEDIT)
 			],
-			[], [-lcurses]
+			[ AC_MSG_ERROR(libedit not found) ],
+			[ -lcurses ]
 		)
 	fi ]
 )