Attachment 1833 Details for Bug 1744 – Also uses pkg-config for cflags if we decide to use pkg-config.

[patch] Also uses pkg-config for cflags if we decide to use pkg-config.

openssh-libedit-pkgconfig.patch (text/plain), 1.61 KB, created by Darren Tucker on 2010-04-09 11:47:12 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2010-04-09 11:47:12 AEST

Size: 1.61 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /var/cvs/openssh/configure.ac,v
>retrieving revision 1.446
>diff -u -p -r1.446 configure.ac
>--- configure.ac	25 Mar 2010 23:27:33 -0000	1.446
>+++ configure.ac	9 Apr 2010 01:46:03 -0000
>@@ -1254,7 +1254,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
>+		if test "x$withval" = "xyes" ; then
>+			AC_PATH_PROG(PKGCONFIG, pkg-config, no)
>+			if test "x$PKGCONFIG" != "xno"; then
>+				AC_MSG_CHECKING(if $PKGCONFIG knows about libedit)
>+			 	if "$PKGCONFIG" libedit; then
>+					AC_MSG_RESULT(yes)
>+					use_pkgconfig_for_libedit=yes
>+				else
>+					AC_MSG_RESULT(no)
>+				fi
>+			fi
>+		else
> 			CPPFLAGS="$CPPFLAGS -I${withval}/include"
> 			if test -n "${need_dash_r}"; then
> 				LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
>@@ -1262,14 +1273,20 @@ AC_ARG_WITH(libedit,
> 				LDFLAGS="-L${withval}/lib ${LDFLAGS}"
> 			fi
> 		fi
>+		if test "x$use_pkgconfig_for_libedit" == "xyes"; then
>+			LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
>+			CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags 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(

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 1744: 1824 | 1832 | 1833 | 1834