Bugzilla – Attachment 1824 Details for
Bug 1744
libedit support shouldn't assume -lcurses
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Use pkg-config to determine linker options for libedit
openssh-libedit-dependency.diff (text/plain), 911 bytes, created by
Iain Morgan
on 2010-03-27 08:47:46 AEDT
(
hide
)
Description:
Use pkg-config to determine linker options for libedit
Filename:
MIME Type:
Creator:
Iain Morgan
Created:
2010-03-27 08:47:46 AEDT
Size:
911 bytes
patch
obsolete
>Index: configure.ac >=================================================================== >RCS file: /cvs/openssh/configure.ac,v >retrieving revision 1.446 >diff -u -b -r1.446 configure.ac >--- configure.ac 25 Mar 2010 23:27:33 -0000 1.446 >+++ configure.ac 26 Mar 2010 20:59:22 -0000 >@@ -1262,14 +1262,20 @@ > LDFLAGS="-L${withval}/lib ${LDFLAGS}" > fi > fi >+ AC_PATH_PROG(PKGCONFIG, pkg-config, no) >+ if test "x$PKGCONFIG" != "xno"; then >+ LIBEDIT=`$PKGCONFIG --libs-only-l libedit` >+ else >+ LIBEDIT="-ledit -lcurses" >+ fi >+ OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` > AC_CHECK_LIB(edit, el_init, > [ AC_DEFINE(USE_LIBEDIT, 1, [Use libedit for sftp]) >- LIBEDIT="-ledit -lcurses" > LIBEDIT_MSG="yes" > AC_SUBST(LIBEDIT) > ], > [ AC_MSG_ERROR(libedit not found) ], >- [ -lcurses ] >+ [ $OTHERLIBS ] > ) > AC_MSG_CHECKING(if libedit version is compatible) > AC_COMPILE_IFELSE(
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=1824">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1744
:
1824
|
1832
|
1833
|
1834