From d2e43158ae65863df2d5310381ed316f8e6871ce Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 18 May 2009 11:06:03 -0500 Subject: [PATCH] xfsprogs: fix readline/editline for xfs_io and xfs_quota It looks like libxcmd wasn't ever being built with -DENABLE_READLINE even when it was asked for by configure --enable-readline=yes so xfs_io & xfs_quota didn't get the functionality. This seems to fix it up for me (fixes editline too while we're at it). Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig --- growfs/Makefile | 8 ++++++++ libxcmd/Makefile | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/growfs/Makefile b/growfs/Makefile index 82f38d822..8a30ea738 100644 --- a/growfs/Makefile +++ b/growfs/Makefile @@ -10,6 +10,14 @@ LTCOMMAND = xfs_growfs CFILES = xfs_growfs.c LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) +ifeq ($(ENABLE_READLINE),yes) +LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP) +endif + +ifeq ($(ENABLE_EDITLINE),yes) +LLDLIBS += $(LIBEDITLINE) $(LIBTERMCAP) +endif + LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD) LLDFLAGS = -static LSRCFILES = xfs_info.sh diff --git a/libxcmd/Makefile b/libxcmd/Makefile index c03849d05..53922b727 100644 --- a/libxcmd/Makefile +++ b/libxcmd/Makefile @@ -20,6 +20,14 @@ ifeq ($(HAVE_GETMNTINFO),yes) LCFLAGS += -DHAVE_GETMNTINFO endif +ifeq ($(ENABLE_READLINE),yes) +LCFLAGS += -DENABLE_READLINE +endif + +ifeq ($(ENABLE_EDITLINE),yes) +LCFLAGS += -DENABLE_EDITLINE +endif + default: $(LTLIBRARY) include $(BUILDRULES) -- 2.47.2