View | Details | Raw Unified | Return to bug 1744 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac (-2 / +8 lines)
Lines 1262-1275 Link Here
1262
				LDFLAGS="-L${withval}/lib ${LDFLAGS}"
1262
				LDFLAGS="-L${withval}/lib ${LDFLAGS}"
1263
			fi
1263
			fi
1264
		fi
1264
		fi
1265
		AC_PATH_PROG(PKGCONFIG, pkg-config, no)
1266
		if test "x$PKGCONFIG" != "xno"; then
1267
			LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
1268
		else
1269
			LIBEDIT="-ledit -lcurses"
1270
		fi
1271
		OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'`
1265
		AC_CHECK_LIB(edit, el_init,
1272
		AC_CHECK_LIB(edit, el_init,
1266
			[ AC_DEFINE(USE_LIBEDIT, 1, [Use libedit for sftp])
1273
			[ AC_DEFINE(USE_LIBEDIT, 1, [Use libedit for sftp])
1267
			  LIBEDIT="-ledit -lcurses"
1268
			  LIBEDIT_MSG="yes"
1274
			  LIBEDIT_MSG="yes"
1269
			  AC_SUBST(LIBEDIT)
1275
			  AC_SUBST(LIBEDIT)
1270
			],
1276
			],
1271
			[ AC_MSG_ERROR(libedit not found) ],
1277
			[ AC_MSG_ERROR(libedit not found) ],
1272
			[ -lcurses ]
1278
			[ $OTHERLIBS ]
1273
		)
1279
		)
1274
		AC_MSG_CHECKING(if libedit version is compatible)
1280
		AC_MSG_CHECKING(if libedit version is compatible)
1275
		AC_COMPILE_IFELSE(
1281
		AC_COMPILE_IFELSE(

Return to bug 1744