- (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@

diff --git a/ChangeLog b/ChangeLog
index e30ab164be032f0661f40b6342bb83f3f2ac5b84..e39f2b4201dbafc5ddb47b6bf69fd24ee77c0922 100644 (file)
--- 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.

diff --git a/configure.ac b/configure.ac
index 1a1f55458e8810d2d9ee542eec7a7434d23501e8..b578c28d03fb96697cce3bdfc9d196610067776a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 ]
 )