Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
c33f3506
Commit
c33f3506
authored
Nov 10, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Assume that pthread.h is present.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3e498080
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
27 deletions
+11
-27
configure
configure
+7
-13
configure.ac
configure.ac
+4
-11
config.h.in
include/config.h.in
+0
-3
No files found.
configure
View file @
c33f3506
...
...
@@ -4382,7 +4382,7 @@ fi
# Check whether --with-pthread was given.
if
test
${
with_pthread
+y
}
then
:
withval
=
$with_pthread
;
if
test
"x
$withval
"
=
"xno"
;
then
ac_cv_header_pthread_h
=
no
;
fi
withval
=
$with_pthread
;
fi
...
...
@@ -8083,12 +8083,6 @@ then :
printf
"%s
\n
"
"#define HAVE_PORT_H 1"
>>
confdefs.h
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
"
if
test
"x
$ac_cv_header_pwd_h
"
=
xyes
then
:
...
...
@@ -9059,9 +9053,7 @@ then :
fi
ac_fn_c_check_header_compile
"
$LINENO
"
"pthread_np.h"
"ac_cv_header_pthread_np_h"
"#ifdef HAVE_PTHREAD_H
#include <pthread.h>
#endif
ac_fn_c_check_header_compile
"
$LINENO
"
"pthread_np.h"
"ac_cv_header_pthread_np_h"
"#include <pthread.h>
"
if
test
"x
$ac_cv_header_pthread_np_h
"
=
xyes
then
:
...
...
@@ -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"
then
ac_fn_c_check_func
"
$LINENO
"
"pthread_create"
"ac_cv_func_pthread_create"
if
test
"x
$with_pthread
"
=
xno
then
:
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
then
:
...
...
configure.ac
View file @
c33f3506
...
...
@@ -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]),
[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(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(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]))
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(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL]))
...
...
@@ -438,7 +437,6 @@ AC_CHECK_HEADERS(\
netinet/tcp_fsm.h \
pcap/pcap.h \
port.h \
pthread.h \
pwd.h \
sched.h \
scsi/scsi.h \
...
...
@@ -597,10 +595,7 @@ AC_CHECK_HEADERS([sys/thr.h],,,
#include <sys/ucontext.h>
#endif])
AC_CHECK_HEADERS([pthread_np.h],,,
[#ifdef HAVE_PTHREAD_H
#include <pthread.h>
#endif])
AC_CHECK_HEADERS([pthread_np.h],,,[#include <pthread.h>])
AC_CHECK_HEADERS([linux/videodev2.h],,,
[#include <sys/time.h>
...
...
@@ -1175,10 +1170,8 @@ WINE_EXTLIB_FLAGS(ZYDIS, zydis, zydis, "-I\$(top_srcdir)/libs/zydis/include")
dnl **** Check for pthread ****
if test "$ac_cv_header_pthread_h" = "yes"
then
AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(PTHREAD_LIBS,"-lpthread")])])
fi
AS_VAR_IF([with_pthread],[no],[],
[AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(PTHREAD_LIBS,"-lpthread")])])])
WINE_ERROR_WITH(pthread,[test "x$ac_cv_func_pthread_create" != xyes -a "x$PTHREAD_LIBS" = x],
[pthread ${notice_platform}development files not found.
Wine cannot support threads without libpthread.])
...
...
include/config.h.in
View file @
c33f3506
...
...
@@ -318,9 +318,6 @@
/* Define to 1 if you have the `pthread_getthreadid_np' function. */
#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. */
#undef HAVE_PTHREAD_NP_H
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment