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 /libmysqld/examples | |
| 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 'libmysqld/examples')
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index 8d76698117a..209e27c7870 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libmysqld/include ${CMAKE_SOURCE_DIR}/regex - ${READLINE_INCLUDE_DIR} + ${MY_READLINE_INCLUDE_DIR} ) @@ -27,8 +27,7 @@ MYSQL_ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc ../../client/mysql.cc ../../client/readline.cc) TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver) IF(UNIX) - ADD_DEFINITIONS(${READLINE_DEFINES}) - TARGET_LINK_LIBRARIES(mysql_embedded ${READLINE_LIBRARY}) + TARGET_LINK_LIBRARIES(mysql_embedded ${MY_READLINE_LIBRARY}) ENDIF(UNIX) MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc) |