Resolve build issue with using libtermcap/libreadline via configure option.

Merge of master-melb:xfs-cmds:21777a by kenmcd.

diff --git a/configure.in b/configure.in
index c3a2a4a2ebfaa55f4506944f3d32b1a08c43e890..c39e5bdd1866ed5e15ef9c997e3b4a13d73aea29 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,18 +13,23 @@ AC_SUBST(enable_gettext)
 
 AC_ARG_ENABLE(readline,
 [ --enable-readline=[yes/no] Enable readline command editing [default=no]],
-       test $enable_readline = yes && libreadline="-lreadline -ltermcap",
+       test $enable_readline = yes && libreadline="-lreadline",
        enable_readline=no)
 AC_SUBST(libreadline)
 AC_SUBST(enable_readline)
 
 AC_ARG_ENABLE(editline,
 [ --enable-editline=[yes/no] Enable editline command editing [default=no]],
-       test $enable_editline = yes && libeditline="-ledit -ltermcap",
+       test $enable_editline = yes && libeditline="-ledit",
        enable_editline=no)
 AC_SUBST(libeditline)
 AC_SUBST(enable_editline)
 
+AC_ARG_ENABLE(termcap,
+[ --enable-termcap=[yes/no] Enable terminal capabilities library [default=no]],
+       test $enable_termcap = yes && libtermcap="-ltermcap",)
+AC_SUBST(libtermcap)
+
 AC_PACKAGE_GLOBALS(xfsprogs)
 AC_PACKAGE_UTILITIES(xfsprogs)
 

diff --git a/db/Makefile b/db/Makefile
index 1e5b815e4e8f8808f2f8bbf2b18e64f20ce3af09..698b5489aa60a12e8881e248268e5c14f663a107 100644 (file)
--- a/db/Makefile
+++ b/db/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.  All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of version 2 of the GNU General Public License as
@@ -48,12 +48,12 @@ LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
 LLDFLAGS += -static
 
 ifeq ($(ENABLE_READLINE),yes)
-LLDLIBS += $(LIBREADLINE)
+LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
 CFLAGS += -DENABLE_READLINE
 endif
 
 ifeq ($(ENABLE_EDITLINE),yes)
-LLDLIBS += $(LIBEDITLINE)
+LLDLIBS += $(LIBEDITLINE) $(LIBTERMCAP)
 CFLAGS += -DENABLE_EDITLINE
 endif
 

diff --git a/include/builddefs.in b/include/builddefs.in
index f850d5901326dbc98e31c1214d9ed3a91c69402f..7db6438e6ea1c1717a6069733b1ca57b27f6801e 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -41,6 +41,7 @@ MALLOCLIB = @malloc_lib@
 
 LIBUUID = @libuuid@
 LIBPTHREAD = @libpthread@
+LIBTERMCAP = @libtermcap@
 LIBEDITLINE = @libeditline@
 LIBREADLINE = @libreadline@
 LIBXFS = $(TOPDIR)/libxfs/libxfs.la

diff --git a/io/Makefile b/io/Makefile
index 32782c14fce9a47da15ae8a16fbe17fe92dfb6ec..4b0838483dc0bf45b2598505b5bbb48af258983d 100644 (file)
--- a/io/Makefile
+++ b/io/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of version 2 of the GNU General Public License as
@@ -77,12 +77,12 @@ LSRCFILES += inject.c resblks.c shutdown.c
 endif
 
 ifeq ($(ENABLE_READLINE),yes)
-LLDLIBS += $(LIBREADLINE)
+LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
 CFLAGS += -DENABLE_READLINE
 endif
 
 ifeq ($(ENABLE_EDITLINE),yes)
-LLDLIBS += $(LIBEDITLINE)
+LLDLIBS += $(LIBEDITLINE) $(LIBTERMCAP)
 CFLAGS += -DENABLE_EDITLINE
 endif