diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e99ee6b5..8afb18c4 100644 --- a/configure.ac +++ b/configure.ac @@ -427,6 +427,9 @@ AS_IF([test "$ac_cv_tls" == "__thread"], AS_IF([test "x$os_is_win32" != "x1"], [AX_PTHREAD]) +AS_IF([test "x$ax_pthread_ok" == "xyes"], + AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris])) + #### Check for libs #### @@ -580,9 +583,9 @@ AC_SUBST(LIBSPEEX_LIBS) AC_MSG_CHECKING([whether we need libatomic_ops]) if test "x$need_libatomic_ops" = "xyes"; then AC_MSG_RESULT([yes]) - AC_CHECK_HEADERS([atomic_ops.h], [], [ - AC_MSG_ERROR([*** libatomic-ops headers not found]) - ]) + AC_CHECK_HEADERS([atomic_ops.h], + [CFLAGS="$CFLAGS -DAO_REQUIRE_CAS"], + [AC_MSG_ERROR([*** libatomic-ops headers not found])]) # Win32 does not need the lib and breaks horribly if we try to include it AS_IF([test "x$os_is_win32" != "x1"], [LIBS="$LIBS -latomic_ops"]) diff --git a/src/Makefile.am b/src/Makefile.am index ce8db485..d6752731 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,11 +53,10 @@ AM_CFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/modules \ -I$(top_builddir)/src/modules \ - $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \ + $(PTHREAD_CFLAGS) \ -DPA_BUILDDIR=\"$(abs_builddir)\" \ -DPA_DEFAULT_CONFIG_DIR=\"$(PA_DEFAULT_CONFIG_DIR)\" \ -DPA_BINARY=\"$(PA_BINARY)\" \ - -DAO_REQUIRE_CAS \ -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \ -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" |