makefile: remove dependency on libedit

turns out we are not using it anymore Signed-off-by: Kefu Chai <[email protected]>
slamj1 · Jan 19, 2016 · f5da159 · f5da159
1 parent 3286106
commit f5da159
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 54 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,8 +196,6 @@ find_package(libuuid REQUIRED)
 
 find_package(libcurl REQUIRED)
 
-find_package(libedit REQUIRED)
-
 option(USE_CRYPTOPP "Cryptopp is ON" ON)
 find_package(cryptopp)
 if(CRYPTOPP_FOUND)

diff --git a/ceph.spec.in b/ceph.spec.in
@@ -117,7 +117,6 @@ BuildRequires:	hdparm
 BuildRequires:	leveldb-devel > 1.2
 BuildRequires:	libaio-devel
 BuildRequires:	libcurl-devel
-BuildRequires:	libedit-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libblkid-devel >= 2.17
 BuildRequires:	libudev-devel

diff --git a/cmake/modules/Findlibedit.cmake b/cmake/modules/Findlibedit.cmake
diff --git a/configure.ac b/configure.ac
@@ -716,16 +716,6 @@ if test "x$enable_xio" = x"yes"; then
    AC_SUBST(XIO_LIBS)
 fi
 
-#
-# FreeBSD has it in base.
-#
-if test x"$freebsd" != x"yes" -a x"$with_radosgw" = x"yes"; then
-PKG_CHECK_MODULES([LIBEDIT], [libedit >= 2.11],
-                [], AC_MSG_FAILURE([No usable version of libedit found.]))
-else
-	LIBEDIT_LIBS="-ledit"
-fi
-
 #libatomic-ops? You want it!
 AC_ARG_WITH([libatomic-ops],
             [AS_HELP_STRING([--without-libatomic-ops],

diff --git a/debian/control b/debian/control
@@ -31,7 +31,6 @@ Build-Depends: autoconf,
 	       libboost-regex-dev,
 	       libboost-random-dev,
                libcurl4-gnutls-dev,
-               libedit-dev,
                libexpat1-dev,
                libfcgi-dev,
                libfuse-dev,

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -144,8 +144,6 @@ endif()
 set(heap_profiler_files ${TCMALLOC_srcs})
 add_library(heap_profiler_objs OBJECT ${heap_profiler_files})
 
-set(LIBEDIT_LIBS edit)
-
 # Common infrastructure
 configure_file(
   ${CMAKE_SOURCE_DIR}/src/ceph_ver.h.in.cmake
@@ -813,10 +811,6 @@ add_executable(ceph-kvstore-tool tools/ceph_kvstore_tool.cc)
 target_link_libraries(ceph-kvstore-tool os global ${UNITTEST_CXX_FLAGS})
 install(TARGETS ceph-kvstore-tool DESTINATION bin)
 
-#set(ceph_srcs tools/ceph.cc tools/common.cc)
-#add_executable(ceph ${ceph_srcs})
-#target_link_libraries(ceph global ${LIBEDIT_LIBS})
-
 set(ceph_conf_srcs
   tools/ceph_conf.cc)
 add_executable(ceph-conf ${ceph_conf_srcs})
@@ -901,7 +895,7 @@ if(WITH_LIBCEPHFS)
     client/Trace.cc
     client/posix_acl.cc)
   add_library(client ${libclient_srcs})
-  target_link_libraries(client osdc mds ${LIBEDIT_LIBS})
+  target_link_libraries(client osdc mds)
   set(libcephfs_srcs libcephfs.cc)
   add_library(cephfs SHARED ${libcephfs_srcs})
 if(${ENABLE_SHARED})

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
@@ -8,7 +8,7 @@ libclient_la_SOURCES = \
 	client/MetaSession.cc \
 	client/Trace.cc \
 	client/posix_acl.cc
-libclient_la_LIBADD = $(LIBOSDC) $(LIBEDIT_LIBS)
+libclient_la_LIBADD = $(LIBOSDC)
 noinst_LTLIBRARIES += libclient.la
 
 noinst_HEADERS += \