mirrors/mingw-w64
1
0
Fork 0
mirror of https://git.code.sf.net/p/mingw-w64/mingw-w64 synced 2024-11-26 19:33:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: autoconf: support winpthreads library

Browse Source 
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Signed-off-by: Jonathan Yong <10walls@gmail.com>
This commit is contained in:
Alon Bar-Lev 2015-05-04 20:39:52 +03:00 committed by Jonathan Yong
parent cd3e710c71
commit 95be065e42
No known key found for this signature in database
GPG Key ID: 713B5FE29C145D45
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -14,6 +14,10 @@ if LIBRARIES_PSEH
MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh
endif endif
if LIBRARIES_WINPTHREADS
MAYBE_LIBRARIES_WINPTHREADS = mingw-w64-libraries/winpthreads
endif
if TOOLS_GENDEF if TOOLS_GENDEF
MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef
endif endif
@ -22,7 +26,7 @@ if TOOLS_GENIDL
MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl
endif endif
SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL) SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_LIBRARIES_WINPTHREADS) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all

15
configure.ac
View File

@ -53,30 +53,41 @@ AC_MSG_RESULT([$with_crt])
AC_MSG_CHECKING([whether to build the optional libraries]) AC_MSG_CHECKING([whether to build the optional libraries])
AC_ARG_WITH([libraries], AC_ARG_WITH([libraries],
[AS_HELP_STRING([--with-libraries=ARG], [AS_HELP_STRING([--with-libraries=ARG],
[Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, or all])], [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
[], [],
[with_libraries=no]) [with_libraries=no])
AS_CASE([$with_libraries], AS_CASE([$with_libraries],
[yes|all],[ [yes|all],[
with_libraries="libmangle,pseh" with_libraries="libmangle,pseh,winpthreads"
with_libraries_winpthreads=yes
with_libraries_mangle=yes with_libraries_mangle=yes
with_libraries_pseh=yes], with_libraries_pseh=yes],
[libmangle],[ [libmangle],[
with_libraries="libmangle" with_libraries="libmangle"
with_libraries_winpthreads=no
with_libraries_mangle=yes with_libraries_mangle=yes
with_libraries_pseh=no], with_libraries_pseh=no],
[pseh],[ [pseh],[
with_libraries="pseh" with_libraries="pseh"
with_libraries_winpthreads=no
with_libraries_mangle=no with_libraries_mangle=no
with_libraries_pseh=yes], with_libraries_pseh=yes],
[winpthreads],[
with_libraries="winpthreads"
with_libraries_winpthreads=yes
with_libraries_mangle=no
with_libraries_pseh=no],
[no],[ [no],[
with_libraries_winpthreads=no
with_libraries_mangle=no with_libraries_mangle=no
with_libraries_pseh=no], with_libraries_pseh=no],
[MW64_OPTION_ERROR([with-libraries])]) [MW64_OPTION_ERROR([with-libraries])])
AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes]) AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes]) AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])]) AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])])
AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])]) AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])])
AM_COND_IF([LIBRARIES_WINPTHREADS],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/winpthreads])])
AC_MSG_RESULT([$with_libraries]) AC_MSG_RESULT([$with_libraries])
AC_MSG_CHECKING([whether to build the optional tools]) AC_MSG_CHECKING([whether to build the optional tools])