diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-14 10:53:32 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-14 10:53:32 +0100 |
| commit | db8f698c8a03bcc920b9453f8822fbbd8ec7ea66 (patch) | |
| tree | 3c12c81dfdf1ea5d2af805fb5f93daa0b45e408a /configure.cmake | |
| parent | 44d335b828440603353d8f1f4dfc6db2cf72ca8c (diff) | |
| download | mariadb-git-db8f698c8a03bcc920b9453f8822fbbd8ec7ea66.tar.gz | |
new configure option: NOT_FOR_DISTRIBUTION
fix safemalloc to compile w/o libbfd.
CMakeLists.txt:
NOT_FOR_DISTRIBUTION option
cmake/readline.cmake:
simplify libedit/readline detection.
never use bundled libedit.
use system readline v6 only if NOT_FOR_DISTRIBUTION=1
configure.cmake:
use libbfd only if NOT_FOR_DISTRIBUTION=1
include/my_stacktrace.h:
link with libbfd even w/o safemalloc.
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index 2356d64336b..35c2027b4e0 100644 --- a/configure.cmake +++ b/configure.cmake @@ -187,7 +187,7 @@ CHECK_INCLUDE_FILES (aio.h HAVE_AIO_H) CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H) CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H) CHECK_INCLUDE_FILE_CXX (cxxabi.h HAVE_CXXABI_H) -CHECK_INCLUDE_FILES (bfd.h HAVE_BFD_H) +CHECK_INCLUDE_FILES (bfd.h BFD_H_EXISTS) CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H) CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H) CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H) @@ -261,6 +261,13 @@ CHECK_INCLUDE_FILES (wchar.h HAVE_WCHAR_H) CHECK_INCLUDE_FILES (wctype.h HAVE_WCTYPE_H) CHECK_INCLUDE_FILES (sys/sockio.h HAVE_SYS_SOCKIO_H) +IF(BFD_H_EXISTS) + IF(NOT_FOR_DISTRIBUTION) + SET(NON_DISTRIBUTABLE_WARNING 1) + SET(HAVE_BFD_H 1) + ENDIF() +ENDIF() + IF(HAVE_SYS_STREAM_H) # Needs sys/stream.h on Solaris CHECK_INCLUDE_FILES ("sys/stream.h;sys/ptem.h" HAVE_SYS_PTEM_H) |