diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-03-21 09:58:07 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-03-21 09:58:07 +1100 |
commit | 1df61452ea479323b22bd6f522e7d1f09fca5fe6 (patch) | |
tree | a92fa121b1183947008ad59887379c379cbc0c58 /configure.ac | |
parent | 86a5f8dd0afd10c8b844c81b04b436dd2bb852a3 (diff) |
- (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@
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index d77138505..f105e20da 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.255 2005/03/20 22:55:17 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.256 2005/03/20 22:58:08 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -850,13 +850,18 @@ LIBEDIT_MSG="no" | |||
850 | AC_ARG_WITH(libedit, | 850 | AC_ARG_WITH(libedit, |
851 | [ --with-libedit[[=PATH]] Enable libedit support for sftp], | 851 | [ --with-libedit[[=PATH]] Enable libedit support for sftp], |
852 | [ if test "x$withval" != "xno" ; then | 852 | [ if test "x$withval" != "xno" ; then |
853 | if test "x$withval" != "xyes"; then | ||
854 | CPPFLAGS="$CPPFLAGS -I$withval/include" | ||
855 | LDFLAGS="$LDFLAGS -L$withval/lib" | ||
856 | fi | ||
853 | AC_CHECK_LIB(edit, el_init, | 857 | AC_CHECK_LIB(edit, el_init, |
854 | [ AC_DEFINE(USE_LIBEDIT, [], [Use libedit for sftp]) | 858 | [ AC_DEFINE(USE_LIBEDIT, [], [Use libedit for sftp]) |
855 | LIBEDIT="-ledit -lcurses" | 859 | LIBEDIT="-ledit -lcurses" |
856 | LIBEDIT_MSG="yes" | 860 | LIBEDIT_MSG="yes" |
857 | AC_SUBST(LIBEDIT) | 861 | AC_SUBST(LIBEDIT) |
858 | ], | 862 | ], |
859 | [], [-lcurses] | 863 | [ AC_MSG_ERROR(libedit not found) ], |
864 | [ -lcurses ] | ||
860 | ) | 865 | ) |
861 | fi ] | 866 | fi ] |
862 | ) | 867 | ) |