Regenerate configure and Makefile.in. Signed-off-by: Jonathan Yong <10walls@gmail.com>
diff --git a/Makefile.in b/Makefile.in index 2eca4ed..3905aa6 100644 --- a/Makefile.in +++ b/Makefile.in
@@ -158,7 +158,8 @@ CSCOPE = cscope DIST_SUBDIRS = mingw-w64-headers mingw-w64-crt \ mingw-w64-libraries/libmangle mingw-w64-libraries/pseh \ - mingw-w64-tools/gendef mingw-w64-tools/genidl + mingw-w64-libraries/winpthreads mingw-w64-tools/gendef \ + mingw-w64-tools/genidl am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/build-aux/config.guess \ $(top_srcdir)/build-aux/config.sub \ @@ -295,9 +296,10 @@ @CRT_TRUE@MAYBE_CRT = mingw-w64-crt @LIBRARIES_MANGLE_TRUE@MAYBE_LIBRARIES_MANGLE = mingw-w64-libraries/libmangle @LIBRARIES_PSEH_TRUE@MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh +@LIBRARIES_WINPTHREADS_TRUE@MAYBE_LIBRARIES_WINPTHREADS = mingw-w64-libraries/winpthreads @TOOLS_GENDEF_TRUE@MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef @TOOLS_GENIDL_TRUE@MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl -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 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/configure b/configure index d5ce60b..c88e4b8 100755 --- a/configure +++ b/configure
@@ -592,6 +592,8 @@ TOOLS_GENIDL_TRUE TOOLS_GENDEF_FALSE TOOLS_GENDEF_TRUE +LIBRARIES_WINPTHREADS_FALSE +LIBRARIES_WINPTHREADS_TRUE LIBRARIES_PSEH_FALSE LIBRARIES_PSEH_TRUE LIBRARIES_MANGLE_FALSE @@ -694,6 +696,7 @@ mingw-w64-crt mingw-w64-libraries/libmangle mingw-w64-libraries/pseh +mingw-w64-libraries/winpthreads mingw-w64-tools/gendef mingw-w64-tools/genidl' @@ -1325,7 +1328,7 @@ --without-headers Skip building the mingw-w64 headers --without-crt Skip building the mingw-w64 crt --with-libraries=ARG Build the extra mingw-w64 libs, where ARG is one of - libmangle, pseh, or all + libmangle, pseh, winpthreads, or all --with-tools=ARG Build the extra mingw-w64 tools, where ARG is one of gendef, genidl, or all @@ -2552,21 +2555,31 @@ case $with_libraries in #( yes|all) : - with_libraries="libmangle,pseh" + with_libraries="libmangle,pseh,winpthreads" + with_libraries_winpthreads=yes with_libraries_mangle=yes with_libraries_pseh=yes ;; #( libmangle) : with_libraries="libmangle" + with_libraries_winpthreads=no with_libraries_mangle=yes with_libraries_pseh=no ;; #( pseh) : with_libraries="pseh" + with_libraries_winpthreads=no with_libraries_mangle=no with_libraries_pseh=yes ;; #( + winpthreads) : + + with_libraries="winpthreads" + with_libraries_winpthreads=yes + with_libraries_mangle=no + with_libraries_pseh=no ;; #( no) : + with_libraries_winpthreads=no with_libraries_mangle=no with_libraries_pseh=no ;; #( *) : @@ -2588,6 +2601,14 @@ LIBRARIES_PSEH_FALSE= fi + if test "x$with_libraries_winpthreads" = xyes; then + LIBRARIES_WINPTHREADS_TRUE= + LIBRARIES_WINPTHREADS_FALSE='#' +else + LIBRARIES_WINPTHREADS_TRUE='#' + LIBRARIES_WINPTHREADS_FALSE= +fi + if test -z "$LIBRARIES_MANGLE_TRUE"; then : subdirs="$subdirs mingw-w64-libraries/libmangle" @@ -2596,6 +2617,10 @@ subdirs="$subdirs mingw-w64-libraries/pseh" fi +if test -z "$LIBRARIES_WINPTHREADS_TRUE"; then : + subdirs="$subdirs mingw-w64-libraries/winpthreads" + +fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libraries" >&5 $as_echo "$with_libraries" >&6; } @@ -2799,6 +2824,10 @@ as_fn_error $? "conditional \"LIBRARIES_PSEH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${LIBRARIES_WINPTHREADS_TRUE}" && test -z "${LIBRARIES_WINPTHREADS_FALSE}"; then + as_fn_error $? "conditional \"LIBRARIES_WINPTHREADS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${TOOLS_GENDEF_TRUE}" && test -z "${TOOLS_GENDEF_FALSE}"; then as_fn_error $? "conditional \"TOOLS_GENDEF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5