From 4efe08193cd957291d106ee5578732d0c7c6085b Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adam@chlipala.net>
Date: Sat, 16 Jan 2016 10:05:12 -0500
Subject: More debugging autoconf by pushing a change for Travis to look at:
 try removing Darwin special case

---
 m4/m4_ax_pthread.m4 | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'm4')

diff --git a/m4/m4_ax_pthread.m4 b/m4/m4_ax_pthread.m4
index 935634db..0b2718f3 100644
--- a/m4/m4_ax_pthread.m4
+++ b/m4/m4_ax_pthread.m4
@@ -158,10 +158,6 @@ case ${host_os} in
 
         ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
         ;;
-
-        darwin*)
-        ax_pthread_flags="-pthread $ax_pthread_flags"
-        ;;
 esac
 
 # Clang doesn't consider unrecognized options an error unless we specify
@@ -204,24 +200,11 @@ for flag in $ax_pthread_flags; do
                 ;;
         esac
 
-        save_LDFLAGS="$LDFLAGS"
         save_LIBS="$LIBS"
         save_CFLAGS="$CFLAGS"
         LIBS="$PTHREAD_LIBS $LIBS"
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
 
-        # This check added by Adam Chlipala on January 16, 2016.
-        # The documentation at the top of this file said that PTHREAD_CFLAGS needs to
-        # be used at link-time, too, but this test didn't seem to do so.
-        # For now, I'm patching just for the common case of '-pthread'.
-        case $flag in
-             -pthread)
-             LDFLAGS="$LDFLAGS -pthread"
-             ;;
-        esac
-
-        AC_MSG_NOTICE([LDFLAGS = $LDFLAGS])
-
         # Check for various functions.  We must include pthread.h,
         # since some functions may be macros.  (On the Sequent, we
         # need a special flag -Kthread to make this header compile.)
@@ -243,7 +226,6 @@ for flag in $ax_pthread_flags; do
                 [ax_pthread_ok=yes],
                 [])
 
-        LDFLAGS="$save_LDFLAGS"
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
 
-- 
cgit v1.2.3