diff --git a/README b/README index 7db8650..3fb68b4 100644 --- a/README +++ b/README @@ -28,7 +28,6 @@ You need the following libraries: There are also some optional dependencies: - CppUnit (for unit tests) - libbfd (for backtrace) -- binutils (for libiberty, required for compilation in OpenSUSE & ubuntu) Grive uses cmake to build, see the instructions in: diff --git a/cmake/Modules/FindGDBM.cmake b/cmake/Modules/FindGDBM.cmake deleted file mode 100644 index e1ba00a..0000000 --- a/cmake/Modules/FindGDBM.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - Find gdbm -# Find the native GDBM includes and library -# -# GDBM_INCLUDE_DIR - where to find gdbm.h, etc. -# GDBM_LIBRARIES - List of libraries when using gdbm. -# GDBM_FOUND - True if gdbm found. - - -IF (GDBM_INCLUDE_DIR) - # Already in cache, be silent - SET(GDBM_FIND_QUIETLY TRUE) -ENDIF (GDBM_INCLUDE_DIR) - -FIND_PATH(GDBM_INCLUDE_DIR gdbm.h - /usr/local/include - /usr/include - /opt/local/include -) - -SET(GDBM_NAMES gdbm) -FIND_LIBRARY(GDBM_LIBRARY - NAMES ${GDBM_NAMES} - PATHS /usr/lib /usr/local/lib /opt/local/lib -) - -IF (GDBM_INCLUDE_DIR AND GDBM_LIBRARY) - SET(GDBM_FOUND TRUE) - SET( GDBM_LIBRARIES ${GDBM_LIBRARY} ) -ELSE (GDBM_INCLUDE_DIR AND GDBM_LIBRARY) - SET(GDBM_FOUND FALSE) - SET( GDBM_LIBRARIES ) -ENDIF (GDBM_INCLUDE_DIR AND GDBM_LIBRARY) - -IF (GDBM_FOUND) - IF (NOT GDBM_FIND_QUIETLY) - MESSAGE(STATUS "Found GDBM: ${GDBM_LIBRARY}") - ENDIF (NOT GDBM_FIND_QUIETLY) -ELSE (GDBM_FOUND) - IF (GDBM_FIND_REQUIRED) - MESSAGE(STATUS "Looked for gdbm libraries named ${GDBMS_NAMES}.") - MESSAGE(FATAL_ERROR "Could NOT find gdbm library") - ENDIF (GDBM_FIND_REQUIRED) -ENDIF (GDBM_FOUND) - -MARK_AS_ADVANCED( - GDBM_LIBRARY - GDBM_INCLUDE_DIR -) diff --git a/cmake/Modules/FindIberty.cmake b/cmake/Modules/FindIberty.cmake deleted file mode 100644 index a14ba45..0000000 --- a/cmake/Modules/FindIberty.cmake +++ /dev/null @@ -1,22 +0,0 @@ -# - Find Iberty -# This module finds libiberty. -# -# It sets the following variables: -# IBERTY_LIBRARY - The JSON-C library to link against. - -FIND_LIBRARY( IBERTY_LIBRARY NAMES iberty ) - -IF (IBERTY_LIBRARY) - - # show which JSON-C was found only if not quiet - MESSAGE( STATUS "Found libiberty: ${IBERTY_LIBRARY}") - - SET(IBERTY_FOUND TRUE) - -ELSE (IBERTY_LIBRARY) - - IF ( IBERTY_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find libiberty. try to install binutil-devel?") - ENDIF (IBERTY_FIND_REQUIRED) - -ENDIF (IBERTY_LIBRARY) diff --git a/libgrive/CMakeLists.txt b/libgrive/CMakeLists.txt index 5a6558e..95c1e55 100644 --- a/libgrive/CMakeLists.txt +++ b/libgrive/CMakeLists.txt @@ -8,7 +8,6 @@ find_package(EXPAT REQUIRED) find_package(Boost 1.40.0 COMPONENTS program_options filesystem unit_test_framework system REQUIRED) find_package(BFD) find_package(CppUnit) -find_package(Iberty) find_package(ZLIB) find_package(PkgConfig) @@ -29,12 +28,6 @@ if ( BFD_FOUND ) endif ( BFD_FOUND ) -if ( IBERTY_FOUND ) - set( OPT_LIBS ${OPT_LIBS} ${IBERTY_LIBRARY} ) -else ( IBERTY_FOUND ) - set( IBERTY_LIBRARY "" ) -endif ( IBERTY_FOUND ) - if ( ZLIB_FOUND ) set( OPT_LIBS ${OPT_LIBS} ${ZLIB_LIBRARIES} ) endif ( ZLIB_FOUND ) @@ -42,7 +35,6 @@ endif ( ZLIB_FOUND ) include_directories( ${libgrive_SOURCE_DIR}/src ${libgrive_SOURCE_DIR}/test - ${GDBM_INCLUDE_DIR} ${OPT_INCS} ${YAJL_INCLUDE_DIRS} ) @@ -87,9 +79,7 @@ target_link_libraries( grive ${YAJL_LIBRARIES} ${CURL_LIBRARIES} ${LIBGCRYPT_LIBRARIES} - ${GDBM_LIBRARIES} ${Boost_LIBRARIES} - ${IBERTY_LIBRARY} ${EXPAT_LIBRARY} ${OPT_LIBS} )