Cleanup: remove leftover manual pthread detection
authorMichael Jeanson <mjeanson@efficios.com>
Wed, 22 Jun 2016 21:23:30 +0000 (17:23 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 27 Jun 2016 20:18:55 +0000 (16:18 -0400)
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Makefile.am
configure.ac
tests/benchmark/Makefile.am
tests/regression/Makefile.am
tests/unit/Makefile.am

index 8e25fd9..7b21321 100644 (file)
@@ -5,9 +5,6 @@ AM_CPPFLAGS = -I$(top_builddir)/urcu
 #Add the -version-info directly here since we are only building
 # library that use the version-info
 AM_LDFLAGS=-version-info $(URCU_LIBRARY_VERSION)
-if !LIBC_INCLUDES_PTHREAD
-AM_LDFLAGS+=-lpthread
-endif
 if USE_CYGWIN
 AM_LDFLAGS+=-no-undefined
 endif
index a999ced..ea57e7e 100644 (file)
@@ -140,11 +140,6 @@ AS_CASE([$host_cpu],
        [ARCHTYPE="unknown"]
 )
 
-AS_CASE([$host],[*-*-linux-androideabi],
-       [AM_CONDITIONAL(TARGET_IS_ANDROID, true)],
-       [AM_CONDITIONAL(TARGET_IS_ANDROID, false)]
-)
-
 AS_CASE([$host],[*-cygwin*],
        [AM_CONDITIONAL(USE_CYGWIN, true)],
        [AM_CONDITIONAL(USE_CYGWIN, false)]
@@ -236,15 +231,6 @@ AC_SEARCH_LIBS([clock_gettime], [rt], [
        AC_DEFINE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [1])
 ], [])
 
-# Check for pthread
-AC_CHECK_LIB([pthread], [pthread_create],
-       [AM_CONDITIONAL(LIBC_INCLUDES_PTHREAD, false)],
-       [AC_CHECK_LIB([c], [pthread_create],
-               [AM_CONDITIONAL(LIBC_INCLUDES_PTHREAD, true)],
-               [AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]
-       )]
-)
-
 AM_CONDITIONAL([COMPAT_FUTEX], [test "x$compat_futex_test" = "x1"])
 AM_CONDITIONAL([COMPAT_ARCH], [test "x$SUBARCHTYPE" = "xx86compat"])
 AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"])
index 2326721..f513ed4 100644 (file)
@@ -1,6 +1,3 @@
-if !LIBC_INCLUDES_PTHREAD
-AM_LDFLAGS=-lpthread
-endif
 AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/common -g
 
 SCRIPT_LIST = common.sh \
index 2376edc..9556e3c 100644 (file)
@@ -1,6 +1,3 @@
-if !LIBC_INCLUDES_PTHREAD
-AM_LDFLAGS=-lpthread
-endif
 AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g
 
 SCRIPT_LIST = run.sh
index 08a3cba..d97e43f 100644 (file)
@@ -1,6 +1,3 @@
-if !LIBC_INCLUDES_PTHREAD
-AM_LDFLAGS=-lpthread
-endif
 AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g
 
 SCRIPT_LIST = test_loop run.sh unit_tests
This page took 0.057453 seconds and 4 git commands to generate.