mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-24 17:51:25 +08:00
[svn-r20651] Description:
Switch from using 'pthread_create' to 'pthread_self' when trying to detect the pthread library, so that the Intel C compiler is happier with the prototype. Tested on: Linux/64 2.6 (koala) w/Intel C (h5committested on duty, jam & linew)
This commit is contained in:
Quincey Koziol
parent
14f7bcf8c9
commit
b6edc2873a
64
configure
vendored
64
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 20520 2011-04-15 20:10:47Z acheng .
|
||||
# From configure.in Id: configure.in 20640 2011-04-26 18:41:01Z lrknox .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.68 for HDF5 1.9.81.
|
||||
#
|
||||
@ -25266,9 +25266,9 @@ fi
|
||||
|
||||
done
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
||||
$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
||||
if ${ac_cv_lib_pthread_pthread_create+:} false; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
|
||||
$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
|
||||
if ${ac_cv_lib_pthread_pthread_join+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@ -25282,7 +25282,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char pthread_create ();
|
||||
char pthread_join ();
|
||||
#ifdef FC_DUMMY_MAIN
|
||||
#ifndef FC_DUMMY_MAIN_EQ_F77
|
||||
# ifdef __cplusplus
|
||||
@ -25294,23 +25294,23 @@ char pthread_create ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return pthread_create ();
|
||||
return pthread_join ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_pthread_pthread_create=yes
|
||||
ac_cv_lib_pthread_pthread_join=yes
|
||||
else
|
||||
ac_cv_lib_pthread_pthread_create=no
|
||||
ac_cv_lib_pthread_pthread_join=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_join" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBPTHREAD 1
|
||||
_ACEOF
|
||||
@ -25391,9 +25391,9 @@ done
|
||||
saved_AM_LDFLAGS="$AM_LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS -L$pthread_lib"
|
||||
AM_LDFLAGS="$AM_LDFLAGS -L$pthread_lib"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
||||
$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
||||
if ${ac_cv_lib_pthread_pthread_create+:} false; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
|
||||
$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
|
||||
if ${ac_cv_lib_pthread_pthread_join+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@ -25407,7 +25407,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char pthread_create ();
|
||||
char pthread_join ();
|
||||
#ifdef FC_DUMMY_MAIN
|
||||
#ifndef FC_DUMMY_MAIN_EQ_F77
|
||||
# ifdef __cplusplus
|
||||
@ -25419,23 +25419,23 @@ char pthread_create ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return pthread_create ();
|
||||
return pthread_join ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_pthread_pthread_create=yes
|
||||
ac_cv_lib_pthread_pthread_join=yes
|
||||
else
|
||||
ac_cv_lib_pthread_pthread_create=no
|
||||
ac_cv_lib_pthread_pthread_join=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_join" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBPTHREAD 1
|
||||
_ACEOF
|
||||
@ -25448,9 +25448,9 @@ fi
|
||||
|
||||
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
||||
$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
||||
if ${ac_cv_lib_pthread_pthread_create+:} false; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
|
||||
$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
|
||||
if ${ac_cv_lib_pthread_pthread_join+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@ -25464,7 +25464,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char pthread_create ();
|
||||
char pthread_join ();
|
||||
#ifdef FC_DUMMY_MAIN
|
||||
#ifndef FC_DUMMY_MAIN_EQ_F77
|
||||
# ifdef __cplusplus
|
||||
@ -25476,23 +25476,23 @@ char pthread_create ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return pthread_create ();
|
||||
return pthread_join ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_pthread_pthread_create=yes
|
||||
ac_cv_lib_pthread_pthread_join=yes
|
||||
else
|
||||
ac_cv_lib_pthread_pthread_create=no
|
||||
ac_cv_lib_pthread_pthread_join=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_join" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBPTHREAD 1
|
||||
_ACEOF
|
||||
@ -25535,7 +25535,7 @@ $as_echo "no" >&6; }
|
||||
int
|
||||
main ()
|
||||
{
|
||||
pthread_create()
|
||||
pthread_join()
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1839,7 +1839,7 @@ AC_ARG_WITH([pthread],
|
||||
case "$withval" in
|
||||
yes)
|
||||
AC_CHECK_HEADERS([pthread.h])
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, [unset PTHREAD])
|
||||
AC_CHECK_LIB([pthread], [pthread_join],, [unset PTHREAD])
|
||||
;;
|
||||
no)
|
||||
AC_MSG_CHECKING([for pthread])
|
||||
@ -1884,11 +1884,11 @@ case "$withval" in
|
||||
saved_AM_LDFLAGS="$AM_LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS -L$pthread_lib"
|
||||
AM_LDFLAGS="$AM_LDFLAGS -L$pthread_lib"
|
||||
AC_CHECK_LIB([pthread], [pthread_create],,
|
||||
AC_CHECK_LIB([pthread], [pthread_join],,
|
||||
[LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset PTHREAD])
|
||||
|
||||
else
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, [unset PTHREAD])
|
||||
AC_CHECK_LIB([pthread], [pthread_join],, [unset PTHREAD])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
@ -1908,7 +1908,7 @@ case "X-$THREADSAFE" in
|
||||
;;
|
||||
X-yes)
|
||||
dnl Check that we can link a simple Pthread program.
|
||||
AC_TRY_LINK(, [pthread_create()],
|
||||
AC_TRY_LINK(, [pthread_join()],
|
||||
[AC_MSG_RESULT([yes]); THREADSAFE=yes],
|
||||
[AC_MSG_ERROR([needed pthread library not available])])
|
||||
;;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user