From 1f96ba31a29d46e724eac80afecf808916b27906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 29 Jan 2020 16:14:42 +0100 Subject: Fix FTBFS when bfd.h is considered internal and requires PACKAGE definitions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 9eb61c6ed554697aaf38513cb12aea12e46392c5) --- CMakeLists.txt | 2 ++ src/config.h.cmake | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95c8119..e3d0fb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,12 +51,14 @@ option( WITH_BACKEND_READONLY "Build with read-only backend" "OFF" ) #### configure checks ########################### if( WITH_BACKEND_LIBBFD ) + tde_save_and_set( CMAKE_REQUIRED_DEFINITIONS "-DPACKAGE" "-DPACKAGE_VERSION" ) check_include_file( bfd.h HAVE_BFD_H ) if( NOT HAVE_BFD_H ) tde_message_fatal( "Could not find libbfd header file (bfd.h)!\nThis file is usually included in the package binutils-dev." ) endif( NOT HAVE_BFD_H ) tde_save_and_set( CMAKE_REQUIRED_LIBRARIES "bfd" ) check_symbol_exists( bfd_asymbol_section bfd.h HAVE_BFD_2_34 ) + tde_restore( CMAKE_REQUIRED_DEFINITIONS ) tde_restore( CMAKE_REQUIRED_LIBRARIES ) set( BACKEND_LIBRARIES "-lbfd" ) set( LIBR_BACKEND "bfd" ) diff --git a/src/config.h.cmake b/src/config.h.cmake index 5b0870f..34fe955 100644 --- a/src/config.h.cmake +++ b/src/config.h.cmake @@ -1,3 +1,8 @@ +/* Define name of package. */ +#define PACKAGE "@PACKAGE@" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "@PACKAGE_VERSION@" /* Define to 1 if translation of program messages to the user's native language is requested. */ -- cgit v1.2.1