diff options
| author | Gabriele Svelto <gabriele.svelto@gmail.com> | 2012-04-15 14:11:08 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2012-04-16 06:11:24 +0200 |
| commit | 35d748dfa5f846916c32142fc641eae0b5d9b88d (patch) | |
| tree | c383c6abeb65d440a991b0336de2e471117520a0 /configure.ac | |
| parent | cb89ca70646591a6cb29e81be43c442d6b5d653b (diff) | |
Improve POSIX threads detection and configuration
POSIX threads support is checked using the AX_PTHREAD macro, this
provides improved support and coverage of different platforms. The M4
macros are also moved into the M4 directory.
Signed-off-by: Gabriele Svelto <gabriele.svelto@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 9a17fe6..99fab21 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_INIT([libxs], [m4_esyscmd([./version.sh])], [crossroads-dev@groups.crossroads.io], [libxs], [http://www.crossroads.io/]) AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_MACRO_DIR([config]) +AC_CONFIG_MACRO_DIR([m4]) AM_CONFIG_HEADER([src/platform.hpp]) AM_INIT_AUTOMAKE([tar-ustar dist-zip foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -63,7 +63,13 @@ LIBXS_CHECK_ENABLE_DEBUG LIBXS_WITH_GCOV # Checks for libraries. -AC_CHECK_LIB([pthread], [pthread_create]) +AX_PTHREAD([ + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" + CC="$PTHREAD_CC" +]) + AC_CHECK_LIB([rt], [clock_gettime]) # Set pedantic @@ -78,9 +84,6 @@ libxs_dso_visibility="yes" # Whether we are on mingw or not. libxs_on_mingw32="no" -# Set some default features required by Crossroads code. -CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS" - # For host type checks AC_CANONICAL_HOST |