tree d9a593084d9c
parent 747e2ac35db6
author Edward Rudd <urkle@outoforder.cc> 1351359657 14400
committer Edward Rudd <urkle@outoforder.cc> 1351359657 14400
revision 6610
branch default

added --enable-pthread-naming option to allow disabling the detection and use of pthread_setname_np / pthread_set_name_np
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -835,6 +835,7 @@
 enable_input_tslib
 enable_pthreads
 enable_pthread_sem
+enable_pthread_naming
 enable_directx
 enable_sdl_dlopen
 enable_clock_gettime
@@ -1559,6 +1560,7 @@
   --enable-pthreads       use POSIX threads for multi-threading
                           [[default=yes]]
   --enable-pthread-sem    use pthread semaphores [[default=yes]]
+  --enable-pthread-naming use pthread setname/set_name [[default=yes]]
   --enable-directx        use DirectX for Windows audio/video [[default=yes]]
   --enable-sdl-dlopen     use dlopen for shared object loading [[default=yes]]
   --enable-clock_gettime  use clock_gettime() instead of gettimeofday() on
@@ -20802,6 +20804,13 @@
   enable_pthread_sem=yes
 fi
 
+        # Check whether --enable-pthread-naming was given.
+if test "${enable_pthread_naming+set}" = set; then :
+  enableval=$enable_pthread_naming;
+else
+  enable_pthread_naming=yes
+fi
+
     case "$host" in
         *-*-linux*|*-*-uclinux*)
             pthread_cflags="-D_REENTRANT"
@@ -21076,10 +21085,11 @@
 
             fi
 
-            # Check to see if pthread naming is available
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setname_np" >&5
+            if test x$have_pthread_naming = xyes; then
+                # Check to see if pthread naming is available
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setname_np" >&5
 $as_echo_n "checking for pthread_setname_np... " >&6; }
-            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -21099,24 +21109,26 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-              has_pthread_setname_np=yes
+                  has_pthread_setname_np=yes
 
 $as_echo "#define HAVE_PTHREAD_SETNAME_NP 1" >>confdefs.h
 
 
 else
 
-              has_pthread_setname_np=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_pthread_setname_np" >&5
+                  has_pthread_setname_np=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_pthread_setname_np" >&5
 $as_echo "$has_pthread_setname_np" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_set_name_np" >&5
+            fi
+
+            if test x$have_pthread_naming = xyes; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_set_name_np" >&5
 $as_echo_n "checking for pthread_set_name_np... " >&6; }
-            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -21136,20 +21148,21 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-              has_pthread_set_name_np=yes
+                  has_pthread_set_name_np=yes
 
 $as_echo "#define HAVE_PTHREAD_SET_NAME_NP 1" >>confdefs.h
 
 
 else
 
-              has_pthread_set_name_np=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_pthread_set_name_np" >&5
+                  has_pthread_set_name_np=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_pthread_set_name_np" >&5
 $as_echo "$has_pthread_set_name_np" >&6; }
+            fi
 
             # Restore the compiler flags and libraries
             CFLAGS="$ac_save_cflags"; LIBS="$ac_save_libs"
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -1706,6 +1706,10 @@
     AC_ARG_ENABLE(pthread-sem,
 AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]]),
                   , enable_pthread_sem=yes)
+    dnl This also is used on Linux for glibc binary compatibility (Doh!)
+    AC_ARG_ENABLE(pthread-naming,
+AC_HELP_STRING([--enable-pthread-naming], [use pthread setname/set_name [[default=yes]]]),
+                  , enable_pthread_naming=yes)
     case "$host" in
         *-*-linux*|*-*-uclinux*)
             pthread_cflags="-D_REENTRANT"
@@ -1855,24 +1859,28 @@
                 AC_DEFINE(HAVE_PTHREAD_NP_H, 1, [ ])
             fi
 
-            # Check to see if pthread naming is available
-            AC_MSG_CHECKING(for pthread_setname_np)
-            AC_TRY_LINK_FUNC(pthread_setname_np, [
-              has_pthread_setname_np=yes
-              AC_DEFINE(HAVE_PTHREAD_SETNAME_NP, 1, [ ])
-            ],[
-              has_pthread_setname_np=no
-            ])
-            AC_MSG_RESULT($has_pthread_setname_np)
+            if test x$have_pthread_naming = xyes; then
+                # Check to see if pthread naming is available
+                AC_MSG_CHECKING(for pthread_setname_np)
+                AC_TRY_LINK_FUNC(pthread_setname_np, [
+                  has_pthread_setname_np=yes
+                  AC_DEFINE(HAVE_PTHREAD_SETNAME_NP, 1, [ ])
+                ],[
+                  has_pthread_setname_np=no
+                ])
+                AC_MSG_RESULT($has_pthread_setname_np)
+            fi
 
-            AC_MSG_CHECKING(for pthread_set_name_np)
-            AC_TRY_LINK_FUNC(pthread_set_name_np, [
-              has_pthread_set_name_np=yes
-              AC_DEFINE(HAVE_PTHREAD_SET_NAME_NP, 1, [ ])
-            ],[
-              has_pthread_set_name_np=no
-            ])
-            AC_MSG_RESULT($has_pthread_set_name_np)
+            if test x$have_pthread_naming = xyes; then
+                AC_MSG_CHECKING(for pthread_set_name_np)
+                AC_TRY_LINK_FUNC(pthread_set_name_np, [
+                  has_pthread_set_name_np=yes
+                  AC_DEFINE(HAVE_PTHREAD_SET_NAME_NP, 1, [ ])
+                ],[
+                  has_pthread_set_name_np=no
+                ])
+                AC_MSG_RESULT($has_pthread_set_name_np)
+            fi
 
             # Restore the compiler flags and libraries
             CFLAGS="$ac_save_cflags"; LIBS="$ac_save_libs"