Commit c33f3506 authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Assume that pthread.h is present.

parent 3e498080
...@@ -4382,7 +4382,7 @@ fi ...@@ -4382,7 +4382,7 @@ fi
# Check whether --with-pthread was given. # Check whether --with-pthread was given.
if test ${with_pthread+y} if test ${with_pthread+y}
then : then :
withval=$with_pthread; if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi withval=$with_pthread;
fi fi
...@@ -8083,12 +8083,6 @@ then : ...@@ -8083,12 +8083,6 @@ then :
printf "%s\n" "#define HAVE_PORT_H 1" >>confdefs.h printf "%s\n" "#define HAVE_PORT_H 1" >>confdefs.h
fi fi
ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
if test "x$ac_cv_header_pthread_h" = xyes
then :
printf "%s\n" "#define HAVE_PTHREAD_H 1" >>confdefs.h
fi
ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default" ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default"
if test "x$ac_cv_header_pwd_h" = xyes if test "x$ac_cv_header_pwd_h" = xyes
then : then :
...@@ -9059,9 +9053,7 @@ then : ...@@ -9059,9 +9053,7 @@ then :
fi fi
ac_fn_c_check_header_compile "$LINENO" "pthread_np.h" "ac_cv_header_pthread_np_h" "#ifdef HAVE_PTHREAD_H ac_fn_c_check_header_compile "$LINENO" "pthread_np.h" "ac_cv_header_pthread_np_h" "#include <pthread.h>
#include <pthread.h>
#endif
" "
if test "x$ac_cv_header_pthread_np_h" = xyes if test "x$ac_cv_header_pthread_np_h" = xyes
then : then :
...@@ -13437,9 +13429,11 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: zydis libs: $ZYDIS_PE_LIBS" >&5 ...@@ -13437,9 +13429,11 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: zydis libs: $ZYDIS_PE_LIBS" >&5
if test "$ac_cv_header_pthread_h" = "yes" if test "x$with_pthread" = xno
then then :
ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create"
else $as_nop
ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create"
if test "x$ac_cv_func_pthread_create" = xyes if test "x$ac_cv_func_pthread_create" = xyes
then : then :
......
...@@ -51,8 +51,7 @@ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound ...@@ -51,8 +51,7 @@ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound
AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]),
[if test "x$withval" = "xno"; then ac_cv_header_pcap_pcap_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_pcap_pcap_h=no; fi])
AC_ARG_WITH(pcsclite, AS_HELP_STRING([--without-pcsclite],[do not use PCSC lite])) AC_ARG_WITH(pcsclite, AS_HELP_STRING([--without-pcsclite],[do not use PCSC lite]))
AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]))
[if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL]))
...@@ -438,7 +437,6 @@ AC_CHECK_HEADERS(\ ...@@ -438,7 +437,6 @@ AC_CHECK_HEADERS(\
netinet/tcp_fsm.h \ netinet/tcp_fsm.h \
pcap/pcap.h \ pcap/pcap.h \
port.h \ port.h \
pthread.h \
pwd.h \ pwd.h \
sched.h \ sched.h \
scsi/scsi.h \ scsi/scsi.h \
...@@ -597,10 +595,7 @@ AC_CHECK_HEADERS([sys/thr.h],,, ...@@ -597,10 +595,7 @@ AC_CHECK_HEADERS([sys/thr.h],,,
#include <sys/ucontext.h> #include <sys/ucontext.h>
#endif]) #endif])
AC_CHECK_HEADERS([pthread_np.h],,, AC_CHECK_HEADERS([pthread_np.h],,,[#include <pthread.h>])
[#ifdef HAVE_PTHREAD_H
#include <pthread.h>
#endif])
AC_CHECK_HEADERS([linux/videodev2.h],,, AC_CHECK_HEADERS([linux/videodev2.h],,,
[#include <sys/time.h> [#include <sys/time.h>
...@@ -1175,10 +1170,8 @@ WINE_EXTLIB_FLAGS(ZYDIS, zydis, zydis, "-I\$(top_srcdir)/libs/zydis/include") ...@@ -1175,10 +1170,8 @@ WINE_EXTLIB_FLAGS(ZYDIS, zydis, zydis, "-I\$(top_srcdir)/libs/zydis/include")
dnl **** Check for pthread **** dnl **** Check for pthread ****
if test "$ac_cv_header_pthread_h" = "yes" AS_VAR_IF([with_pthread],[no],[],
then [AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(PTHREAD_LIBS,"-lpthread")])])])
AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(PTHREAD_LIBS,"-lpthread")])])
fi
WINE_ERROR_WITH(pthread,[test "x$ac_cv_func_pthread_create" != xyes -a "x$PTHREAD_LIBS" = x], WINE_ERROR_WITH(pthread,[test "x$ac_cv_func_pthread_create" != xyes -a "x$PTHREAD_LIBS" = x],
[pthread ${notice_platform}development files not found. [pthread ${notice_platform}development files not found.
Wine cannot support threads without libpthread.]) Wine cannot support threads without libpthread.])
......
...@@ -318,9 +318,6 @@ ...@@ -318,9 +318,6 @@
/* Define to 1 if you have the `pthread_getthreadid_np' function. */ /* Define to 1 if you have the `pthread_getthreadid_np' function. */
#undef HAVE_PTHREAD_GETTHREADID_NP #undef HAVE_PTHREAD_GETTHREADID_NP
/* Define to 1 if you have the <pthread.h> header file. */
#undef HAVE_PTHREAD_H
/* Define to 1 if you have the <pthread_np.h> header file. */ /* Define to 1 if you have the <pthread_np.h> header file. */
#undef HAVE_PTHREAD_NP_H #undef HAVE_PTHREAD_NP_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment