diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2013-08-11 02:47:21 +0400 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2013-08-11 02:47:21 +0400 |
| commit | fbd77bdc37ae73a53f47a559b526fe47195ba691 (patch) | |
| tree | c2fb42a502fe5bbe0efbd9f2c0207e53db391a49 | |
| parent | fba175e1f902681b279b8a6895a787cd1a015e07 (diff) | |
| parent | 8abbad9d610d835062a120b9667d9e56df63e905 (diff) | |
| download | tdelibs-fbd77bdc37ae73a53f47a559b526fe47195ba691.tar.gz tdelibs-fbd77bdc37ae73a53f47a559b526fe47195ba691.zip | |
Merge branch 'master' into tdehardwaredevices-splited
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | config.h.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 11c6149bb..15a829404 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,6 +266,7 @@ check_symbol_exists( gethostbyname2_r "netdb.h" HAVE_GETHOSTBYNAME2_R ) check_symbol_exists( gethostbyname_r "netdb.h" HAVE_GETHOSTBYNAME_R ) check_symbol_exists( gai_strerror "sys/types.h;sys/socket.h;netdb.h" HAVE_GAI_STRERROR ) check_symbol_exists( getaddrinfo "sys/types.h;sys/socket.h;netdb.h" HAVE_GETADDRINFO ) +check_symbol_exists( backtrace "execinfo.h" HAVE_BACKTRACE ) check_function_exists( usleep HAVE_USLEEP ) check_symbol_exists( usleep "unistd.h" HAVE_USLEEP_PROTO ) diff --git a/config.h.cmake b/config.h.cmake index 471a83974..f420d042f 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -48,7 +48,7 @@ #cmakedefine HAVE_AWE_VOICE_H 1 /* Define if execinfo.h exists and defines backtrace (GLIBC >= 2.1) */ -#undef HAVE_BACKTRACE +#cmakedefine HAVE_BACKTRACE 1 /* Define to 1 if you have the `bcopy' function. */ #cmakedefine HAVE_BCOPY 1 |